975 files changed, 0 insertions, 117588 deletions

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/.classpath b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/.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/org.eclipse.papyrus.infra.table.efacet.menu/.project b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/.project
deleted file mode 100644
index 6ca4b401b01..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.table.efacet.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/org.eclipse.papyrus.infra.table.efacet.menu/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.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/org.eclipse.papyrus.infra.table.efacet.menu/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/META-INF/MANIFEST.MF
deleted file mode 100644
index e2d68056628..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Menu for EFacet Table (Incubation)
-Bundle-SymbolicName: org.eclipse.papyrus.infra.table.efacet.menu;singleton:=true
-Bundle-Version: 0.9.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.infra.table.efacet.menu.Activator
-Bundle-Vendor: Eclispe Modeling Project
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core;bundle-version="0.9.1",
- org.eclipse.emf.facet.widgets.table.metamodel;bundle-version="0.2.1",
- org.eclipse.emf.facet.widgets.table.ui;bundle-version="0.2.1",
- org.eclipse.papyrus.infra.emf;bundle-version="0.9.1",
- org.eclipse.papyrus.infra.table.efacet.common;bundle-version="0.9.1",
- org.eclipse.papyrus.infra.table.efacet.metamodel;bundle-version="0.9.1",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
- org.eclipse.emf.facet.widgets.celleditors.ecore;bundle-version="0.2.1",
- org.eclipse.emf.facet.efacet.core,
- org.eclipse.papyrus.uml.tools;bundle-version="0.9.1",
- org.eclipse.papyrus.uml.tools.utils,
- org.eclipse.papyrus.uml.umlefacet.metamodel;bundle-version="0.9.2"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/build.properties b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/build.properties
deleted file mode 100644
index 6f20375d6c7..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/plugin.xml b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/plugin.xml
deleted file mode 100644
index c363cecf8ee..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/plugin.xml
+++ /dev/null
@@ -1,28 +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"

-            defaultHandler="org.eclipse.papyrus.infra.table.efacet.menu.handler.SelectColumnsHandler"

-            description="Select the Columns to display in the table"

-            id="org.eclipse.papyrus.infra.table.efacet.menu.command.select.columns"

-            name="Select Columns">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.ui.popup.any">

-         <command

-               commandId="org.eclipse.papyrus.infra.table.efacet.menu.command.select.columns"

-               label="Select Columns To Show"

-               style="push"

-               tooltip="Select the columns to display">

-         </command>

-      </menuContribution>

-   </extension>

-

-</plugin>

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/Activator.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/Activator.java
deleted file mode 100644
index 34769f21524..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/Activator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.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.infra.table.efacet.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);

-		log = new LogHelper(this);

-		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/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/CustomizationUtils.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/CustomizationUtils.java
deleted file mode 100644
index 16dafbfee7b..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/CustomizationUtils.java
+++ /dev/null
@@ -1,83 +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.table.efacet.menu.factory;

-

-import java.util.Collection;

-

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

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

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

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

-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization;

-import org.eclipse.emf.facet.efacet.core.FacetUtils;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

-

-//TODO duplicated and adapted code from EMF-Facet

-//EMF-Facet should provides a best way to hide columns

-public final class CustomizationUtils {

-

-	private CustomizationUtils() {

-		// Must not be used.

-	}

-

-	/** @return the {@link Facet}s customized by the given customizations. */

-	public static Set<FacetSet> findFacetsCustomizedBy(final List<Customization> customizations) {

-		final Set<FacetSet> referencedFS = new HashSet<FacetSet>();

-		for(Customization customization : customizations) {

-			for(EClassifier eClassifier : customization.getEClassifiers()) {

-				if(eClassifier instanceof FacetCustomization) {

-					final FacetCustomization facetCustom = (FacetCustomization)eClassifier;

-					for(Facet extFacet : facetCustom.getExtendedFacets()) {

-						referencedFS.add((FacetSet)extFacet.getEPackage());

-					}

-				}

-			}

-		}

-		return referencedFS;

-	}

-

-	/** Returns the first customization among the given list of customizations that extends the given EPackage. */

-	public static Customization findCustomizationExtendingEPackage(final List<Customization> customizations, final EPackage ePackage) {

-		if(ePackage == null) {

-			throw new IllegalArgumentException("ePackage must not be null"); //$NON-NLS-1$

-		}

-		Customization result = null;

-		for(Customization customization : customizations) {

-			if(customization != null && ePackage.equals(FacetUtils.getExtendedEPackage(customization))) {

-				result = customization;

-				break;

-			}

-		}

-		return result;

-	}

-

-	/** Returns the first {@link Facet} among the given list of facets that extends the given EClass. */

-	public static Facet findFacetByExtendedMetaclass(final Collection<Facet> facets, final EClass extendedMetaClass) {

-		Facet result = null;

-		for(Facet facet : facets) {

-			Facet candidate = facet;

-			if(candidate.getExtendedMetaclass() == extendedMetaClass) {

-				result = candidate;

-				break;

-			}

-		}

-		return result;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/ITableCommandFactory.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/ITableCommandFactory.java
deleted file mode 100644
index 1faa783424b..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/ITableCommandFactory.java
+++ /dev/null
@@ -1,48 +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:

- *     Gregoire Dupe (Mia-Software) - Bug 374903 - [Table] ITableWidget.setLoadedFacetSets

- *     Gregoire Dupe (Mia-Software) - Bug 375087 - [Table] ITableWidget.addColumn(List<ETypedElement>, List<FacetSet>)

- *     Gregoire Dupe (Mia-Software) - Bug 376158 - [Table] Unexpected columns when customizations are loaded

- *     Gregoire Dupe (Mia-Software) - Bug 378701 - [Unit Test Failure] org.eclipse.emf.facet.widgets.table.tests.internal.v0_2.notuithread.Bug354224Test*

- *     Gregoire Dupe (Mia-Software) - Bug 380126 - [Table] Row sort too long

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

-package org.eclipse.papyrus.infra.table.efacet.menu.factory;

-

-import java.util.List;

-

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

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

-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Column;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.FeatureColumn;

-import org.eclipse.emf.facet.widgets.table.ui.internal.exported.ColumnSortDirection;

-

-/***

- * 

- * @noextend This interface is not intended to be extended by clients.

- * @noimplement This interface is not intended to be implemented by clients.

- */

-public interface ITableCommandFactory {

-

-	Command createSetLoadedFacetSetsCommand(List<FacetSet> facetSets);

-	

-	Command createRemoveColumnCommand(Column column);

-

-	Command createAddColumnCommand(List<ETypedElement> eTypedElements,

-			List<FacetSet> facetSets);

-	

-	Command createSetCustomizationCommand(List<Customization> customizations);

-

-	Command createRemoveColumnsCommand(List<ETypedElement> elements);

-

-//	Command createSortRowCommand(FeatureColumn featureColumn,

-//			ColumnSortDirection direction);

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/TableCommandFactory.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/TableCommandFactory.java
deleted file mode 100644
index 37f6d7b451e..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/TableCommandFactory.java
+++ /dev/null
@@ -1,528 +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:

- *		Gregoire Dupe (Mia-Software) - Bug 374903 - [Table] ITableWidget.setLoadedFacetSets

- *		Gregoire Dupe (Mia-Software) - Bug 375087 - [Table] ITableWidget.addColumn(List<ETypedElement>, List<FacetSet>)

- *		Gregoire Dupe (Mia-Software) - Bug 372626 - Aggregates

- *		Gregoire Dupe (Mia-Software) - Bug 376158 - [Table] Unexpected columns when customizations are loaded

- *		Gregoire Dupe (Mia-Software) - Bug 378701 - [Unit Test Failure] org.eclipse.emf.facet.widgets.table.tests.internal.v0_2.notuithread.Bug354224Test*

- *		Gregoire Dupe (Mia-Software) - Bug 380126 - [Table] Row sort too long

- * Contributors imported from org.eclipse.emf.facet.widgets.table.ui.internal.TableInstanceCommandFactory (Bug 387008):

- *			Nicolas Bros (Mia-Software) - Bug 331203 - table model editor - initial API and implementation

- *			Nicolas Bros (Mia-Software) - Bug 332437 - NatTable : pluggable cell editors

- *			Nicolas Guyomar (Mia-Software) - Bug 331442 - To be able to add and remove lines (model elements) from the table

- *			Nicolas Bros (Mia-Software) - Bug 332226 - To be able to create or delete model element from the table

- *			Nicolas Guyomar (Mia-Software) - Bug 332226 - To be able to create or delete model element from the table

- *			Nicolas Bros (Mia-Software) - Bug 332438 - NatTable : table type

- *			Nicolas Bros (Mia-Software) - Bug 332440 - NatTable : force cell editors

- *			Nicolas Bros (Mia-Software) - Bug 331675 - NatTable : copy cells as text 

- *			Nicolas Bros (Mia-Software) - Bug 331900 - customizable NatTable

- *			Nicolas Bros (Mia-Software) - Bug 332010 - view Facet customizations on NatTable

- *			Nicolas Bros (Mia-Software) - Bug 332215 - customizable NatTable column headers

- *			Nicolas Guyomar (Mia-Software) - Bug 332215 - customizable NatTable column headers

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

- *			Nicolas Guyomar (Mia-Software) - Bug 332998 - To be able to add a column and fill it with the result of a query

- *			Gregoire Dupe (Mia-Software) - Bug 332998 - To be able to add a column and fill it with the result of a query

- *			Gregoire Dupe (Mia-Software) - Bug 333015 - To be able to hide columns

- *			Nicolas Guyomar (Mia-Software) - Bug 333015 - To be able to hide columns

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

- *			Nicolas Guyomar (Mia-Software) - Bug 333414 - The user must be able to save the column order

- *			Nicolas Guyomar (Mia-Software) - Bug 335154 - Sort Column By Type : Cannot modify resource set without a write transaction

- *			Nicolas Guyomar (Mia-Software) - Bug 335155 - Hide Empty Column : Cannot modify resource set without a write transaction

- *			Nicolas Guyomar (Mia-Software) - Bug 335156 - Only Show Common column : Cannot modify resource set without a write transaction

- *			Nicolas Guyomar (Mia-Software) - Bug 335020 - Nattable widget should use the Eclipse framework

- *			Nicolas Guyomar (Mia-Software) - Bug 337322 - [TableConfiguration] Customization declared in the file tableconfiguration is not loaded

- *			Nicolas Guyomar (Mia-Software) - Bug 338536 - Problem with the refresh of the table : the scrollbar returns to this initial position

- *			Nicolas Bros (Mia-Software) - Bug 338536 - Problem with the refresh of the table : the scrollbar returns to this initial position

- *			Nicolas Guyomar (Mia-Software) - Bug 337454 - We can't delete a query Column

- *			Nicolas Guyomar (Mia-Software) - Bug 337395 - Unused columns should be destroyed

- *			Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

- *			Nicolas Guyomar (Mia-Software) - Bug 339922 - INatTableWidget method isCellSelected should use the plural

- *			Nicolas Guyomar (Mia-Software) - Bug 340681 - Facet column implementation

- *			Vincent Lorenzo (CEA-LIST) - Bug 337326 - Show/Hide Column : Sort the columns by name 

- *			Nicolas Guyomar (Mia-Software) - Bug 340940 - To be able to view facet attributes and facet references in a table

- *			Vincent Lorenzo (CEA-LIST) - Bug 337408 - Add an action to sort columns by name 

- *			Nicolas Guyomar (Mia-Software) - Bug 336482 - KeyBinding to edit element in Table : F2 

- *			Vincent Lorenzo (CEA-LIST) - Bug 341238 - We need to be able to specify which column have to be hidden/visible using the customization mechanism

- *			Gregoire Dupe (Mia-Software) - Bug 341238 - We need to be able to specify which column have to be hidden/visible using the customization mechanism

- *			Nicolas Guyomar (Mia-Software) - Bug 342451 - To be able to edit derived facet attributes and derived facet references in a table

- *			Vincent Lorenzo (CEA-LIST) - Bug 341238 - We need to be able to specify which column have to be hidden/visible using the customization mechanism

- *			Nicolas Guyomar (Mia-Software) - Bug 343411 - [Table] Create new elements does not support IJavaModelQuery anymore

- *			Gregoire Dupe (Mia-Software) - Bug 343811 - EMF Facet Regression : Created elements in a table are not serialized

- *			Vincent Lorenzo (CEA-LIST) - Bug 344125 - The API should provide a method selectRows(List<EObject> elementsToSelect)

- *			Nicolas Guyomar (Mia-Software) - Bug 344274 - SWT BOT fail on Hudson

- *			Nicolas Guyomar (Mia-Software) - Bug 344475 - To be able to select a cell by EStructuralFeature in the table

- *			Nicolas Guyomar (Mia-Software) - Bug 342028 - Field can be edited even if they are marked as N/A

- *			Nicolas Guyomar (Mia-Software) - Bug 344413 - Facet Columns are never created when we begin with an empty table

- *			Gregoire Dupe (Mia-Software) - Bug 343859 - The local customizations are not applied when we reopen a table

- *			Nicolas Guyomar (Mia-Software) - Bug 344670 - Problems with the columns creation : very slow + scrollbar blinked

- *			Vincent Lorenzo (CEA LIST) - Bug 341238 - We need to be able to specify which column have to be hidden/visible using the customization mechanism

- *			Nicolas Guyomar (Mia-Software) - Bug 344925 - Undo/Redo after the action Show Columns

- *			Gregoire Dupe (Mia-Software) - Bug 344925 - Undo/Redo after the action Show Columns - Regression fix

- *			Nicolas Guyomar (Mia-Software) - Bug 345665 - Columns are duplicated when you drop many elements in the same time

- *			Nicolas Guyomar (Mia-Software) - Bug 346465 - [EMF Facet Table] Remove line does not remove obsolete column

- *			Gregoire Dupe (Mia-Software) - Bug 345730 - Deleting an element in the model breaks the table

- *			Gregoire Dupe (Mia-Software) - Bug 354224 - mutually exclusive Facets

- *			Grégoire Dupé (Mia-Software) - Bug 356795 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.emf.facet.widgets.nattable.tests.Bug344413Test.testBug344413

- *			Gregoire Dupe (Mia-Software) - Bug 366804 - [Restructuring] Table widget upgrade

- *			Gregoire Dupe (Mia-Software) - Bug 367613 - Table widget refactoring

- *			Gregoire Dupe (Mia-Software) - Bug 367700 - [Unit Test Failure][0.2/3.8] org.eclipse.emf.facet.widgets.table.tests.internal.v0_2.swtbot.NatTableUITests.testOpenLoadCustomizationDialog

- *			Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

- *			Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning

- *			Gregoire Dupe (Mia-Software) - Bug 375087 - [Table] ITableWidget.addColumn(List<ETypedElement>, List<FacetSet>)

- *			Gregoire Dupe (Mia-Software) - Bug 372626 - Aggregates

- *			Gregoire Dupe (Mia-Software) - Bug 376158 - [Table] Unexpected columns when customizations are loaded

- *			Nicolas Bros (Mia-Software) - Bug 378475 - unit test failures after table refactoring

- *			Olivier Remaud (Soft-Maint) - Bug 378499 - optimizing table opening

- *			Gregoire Dupe (Mia-Software) - Bug 387008 - [Table] Papyrus needs methods provided by TableInstanceCommandFactory

- * Contributors:

- *		Gregoire Dupe (Mia-Software) - Bug 387008 - [Table] Papyrus needs methods provided by TableInstanceCommandFactory 		

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

-package org.eclipse.papyrus.infra.table.efacet.menu.factory;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.LinkedHashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import javax.management.RuntimeErrorException;

-

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

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

-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.ecore.ETypedElement;

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

-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

-import org.eclipse.emf.facet.custom.ui.internal.exported.ICustomizationCommandFactory;

-import org.eclipse.emf.facet.custom.ui.internal.exported.ICustomizationCommandFactoryFactory;

-import org.eclipse.emf.facet.efacet.core.FacetUtils;

-import org.eclipse.emf.facet.efacet.core.IFacetManager;

-import org.eclipse.emf.facet.efacet.core.exception.FacetManagerException;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

-import org.eclipse.emf.facet.util.emf.core.command.ICommandFactoryResult;

-import org.eclipse.emf.facet.util.emf.core.command.ICommandFactoryResultFactory;

-import org.eclipse.emf.facet.widgets.celleditors.ICommandFactory;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Column;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.FeatureColumn;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Row;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Table;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.TableFactory;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.TablePackage;

-import org.eclipse.emf.facet.widgets.table.ui.command.ITableCommandFactory;

-import org.eclipse.emf.facet.widgets.table.ui.internal.exported.TableWidgetUtils;

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

-

-//TODO Remove implementation of org.eclipse.emf.facet.widgets.table.ui.internal.ITableCommandFactory

-public class TableCommandFactory implements org.eclipse.papyrus.infra.table.efacet.menu.factory.ITableCommandFactory, ITableCommandFactory {

-

-	//	private static final boolean DEBUG = DebugUtils.getDebugStatus(Activator.getDefault()); 

-

-	private final Table table;

-

-	private final EditingDomain editingDomain;

-

-	private final ICommandFactory commandFactory;

-

-	private final IFacetManager facetManager;

-

-	public TableCommandFactory(final Table table, final EditingDomain editingDomain, final ICommandFactory commandFactory, final IFacetManager facetManager) {

-		this.table = table;

-		this.editingDomain = editingDomain;

-		this.commandFactory = commandFactory;

-		this.facetManager = facetManager;

-	}

-

-	/**

-	 * @param facetSets

-	 *        must not contains more than one reference to a same FacetSet

-	 */

-	public Command createSetLoadedFacetSetsCommand(final List<FacetSet> facetSets) {

-		return this.createSetFacetSetsCommand(facetSets);

-	}

-

-	/**

-	 * @param facetSets

-	 *        must not contains more than one reference to a same FacetSet

-	 * @param manageCustoms

-	 */

-	private Command createSetLoadedFacetSetsCommand(final List<? extends FacetSet> facetSets, final boolean manageCustoms) {

-		// It is expected that the column points to the override feature (the

-		// signature)

-		final List<Command> commandList = new CommandList();

-		final List<FeatureColumn> columnsToRemove = TableInstanceUtils.columnsToRemove(this.table, facetSets, this.table.getRows());

-		for(Column columnToRemove : columnsToRemove) {

-			final Command removeColumnCmd = createRemoveColumnCommand(columnToRemove);

-			commandList.add(removeColumnCmd);

-		}

-		if(!this.table.getFacetSets().equals(facetSets)) {

-			final Command setCommand = this.commandFactory.createSetCommand(this.editingDomain, this.table, TablePackage.eINSTANCE.getTable_FacetSets(), facetSets);

-			commandList.add(setCommand);

-		}

-		// If some added facetSet are also customizations they have to be

-		// loaded. This

-		// is required by this aggregate.

-		final List<Customization> addedCustoms = new LinkedList<Customization>();

-		for(FacetSet facetSet : facetSets) {

-			if(facetSet instanceof Customization) {

-				final Customization custom = (Customization)facetSet;

-				addedCustoms.add(custom);

-			}

-		}

-		if(manageCustoms) {

-			// If some removed facetSet are also customizations they have to be

-			// unloaded. This

-			// is required by this aggregate.

-

-			final List<FacetSet> removedFacetSet = new ArrayList<FacetSet>();

-			removedFacetSet.addAll(this.table.getFacetSets());

-			removedFacetSet.removeAll(facetSets);

-			final List<Customization> removedCustoms = new LinkedList<Customization>();

-			for(FacetSet facetSet : removedFacetSet) {

-				if(facetSet instanceof Customization) {

-					final Customization custom = (Customization)facetSet;

-					removedCustoms.add(custom);

-				}

-			}

-			if(!(addedCustoms.isEmpty() && removedCustoms.isEmpty())) {

-				final List<Customization> customizations = new ArrayList<Customization>();

-				customizations.addAll(this.table.getCustomizations());

-				customizations.removeAll(removedCustoms);

-				customizations.addAll(addedCustoms);

-				final Command loadCustom = createCoreSetCustomizationsCommand(customizations);

-				commandList.add(loadCustom);

-			}

-		}

-		return createResult(commandList, "Set loaded facetSets"); //$NON-NLS-1$

-	}

-

-	private static Command createResult(final List<Command> commandList, final String label) {

-		Command result = null;

-		while(commandList.contains(null)) {

-			commandList.remove(null);

-		}

-		if(!commandList.isEmpty()) {

-			result = new CompoundCommand(label, commandList);

-		}

-		return result;

-	}

-

-	public Command createRemoveColumnCommand(final Column column) {

-		final List<Command> commandList = new ArrayList<Command>();

-		if(this.table.getColumns().contains(column)) {

-			final Command command = this.commandFactory.createRemoveCommand(this.editingDomain, this.table, TablePackage.eINSTANCE.getTable_Columns(), column);

-			// This compoundCommand is only used to hold debug informations.

-			commandList.add(command);

-		}

-		return createResult(commandList, "Remove column"); //$NON-NLS-1$

-	}

-

-	public Command createAddColumnCommand(final List<ETypedElement> eTypedElements, final List<FacetSet> facetSets) {

-		final List<Command> commandList = new CommandList();

-		final Set<FacetSet> newFacetSets = new LinkedHashSet<FacetSet>();

-		newFacetSets.addAll(facetSets);

-		newFacetSets.addAll(this.table.getFacetSets());

-		for(ETypedElement eTypedElement : eTypedElements) {

-			final FacetSet signatureFS = getSignatureFacetSet(eTypedElement);

-			if(signatureFS != null) {

-				newFacetSets.add(signatureFS);

-			}

-		}

-		final Command addFacetCommand = createSetLoadedFacetSetsCommand(new ArrayList<FacetSet>(newFacetSets));

-		commandList.add(addFacetCommand);

-		final Command addColumn = createAddColumn(eTypedElements);

-		commandList.add(addColumn);

-		return createResult(commandList, "Add columns and facetSets"); //$NON-NLS-1$

-	}

-

-	private static FacetSet getSignatureFacetSet(final ETypedElement eTypedElement) {

-		FacetSet result = null;

-		if(eTypedElement instanceof DerivedTypedElement) {

-			final DerivedTypedElement derivedTE = (DerivedTypedElement)eTypedElement;

-			DerivedTypedElement signatureTE = null;

-			try {

-				signatureTE = FacetUtils.getTopOverrideFeature(derivedTE);

-			} catch (FacetManagerException e) {

-				//FIXME

-				throw new RuntimeException(e);

-//				throw new TableWidgetRuntimeException(e);

-			}

-			if(derivedTE.getOverride() != null && signatureTE != null) {

-				final FacetSet signatureFS = FacetUtils.getFacetSet(signatureTE);

-				result = signatureFS;

-			}

-		}

-		return result;

-	}

-

-	private Command createAddColumn(final List<ETypedElement> eTypedElements) {

-		final List<Command> commandList = new CommandList();

-		for(ETypedElement eTypedElement : eTypedElements) {

-			final Command addColumn = createAddColumn(eTypedElement);

-			commandList.add(addColumn);

-		}

-		return createResult(commandList, "Add columns"); //$NON-NLS-1$

-	}

-

-	private Command createAddColumn(final ETypedElement eTypedElement) {

-		ETypedElement signature = eTypedElement;

-		if(eTypedElement instanceof FacetOperation) {

-			final FacetOperation facetOperation = (FacetOperation)eTypedElement;

-			signature = FacetUtils.getSignature(facetOperation);

-		}

-		Column existingColumn = null;

-		for(Column column : this.table.getColumns()) {

-			if(column instanceof FeatureColumn) {

-				final FeatureColumn featureColumn = (FeatureColumn)column;

-				if(featureColumn.getFeature().equals(signature)) {

-					existingColumn = column;

-					break;

-				}

-			}

-		}

-		final List<Command> commandList = new CommandList();

-		if(existingColumn == null) {

-			final FeatureColumn column = TableFactory.eINSTANCE.createFeatureColumn();

-			final Command setColumn = this.commandFactory.createAddCommand(this.editingDomain, this.table, TablePackage.eINSTANCE.getTable_Columns(), column);

-			commandList.add(setColumn);

-			final Command setETypedElement = this.commandFactory.createSetCommand(this.editingDomain, column, TablePackage.eINSTANCE.getFeatureColumn_Feature(), signature);

-			commandList.add(setETypedElement);

-		}

-		return createResult(commandList, "Add column"); //$NON-NLS-1$

-	}

-

-	public Command createSetCustomizationCommand(final List<Customization> customizations) {

-		final List<Command> commandList = new CommandList();

-		final Set<FacetSet> referredFS = CustomizationUtils.findFacetsCustomizedBy(customizations);

-		final List<FacetSet> alreadyLoaded = this.table.getFacetSets();

-		final List<Customization> removedCustoms = new ArrayList<Customization>();

-		removedCustoms.addAll(this.table.getCustomizations());

-		removedCustoms.removeAll(customizations);

-		final List<FacetSet> facetSets = new ArrayList<FacetSet>();

-		facetSets.addAll(customizations);

-		// This "remove" avoid to have a same object in twice in the list.

-		facetSets.removeAll(alreadyLoaded);

-		facetSets.addAll(alreadyLoaded);

-		// This "remove" avoid to have a same object in twice in the list.

-		facetSets.removeAll(referredFS);

-		facetSets.addAll(referredFS);

-		facetSets.removeAll(removedCustoms);

-		final Command facetLoad = createSetLoadedFacetSetsCommand(facetSets, false);

-		commandList.add(facetLoad);

-		final Command customLoad = createCoreSetCustomizationsCommand(customizations);

-		commandList.add(customLoad);

-		return createResult(commandList, "Load cutomizations and associated facet sets"); //$NON-NLS-1$

-	}

-

-	private Command createCoreSetCustomizationsCommand(final List<Customization> customizations) {

-		final List<Customization> sortedCustoms = new ArrayList<Customization>();

-		sortedCustoms.addAll(this.table.getLocalCustomizations());

-		for(Customization customization : customizations) {

-			if(!sortedCustoms.contains(customization)) {

-				sortedCustoms.add(customization);

-			}

-		}

-		final List<Command> commandList = new CommandList();

-		if(!this.table.getCustomizations().equals(sortedCustoms)) {

-			final Command command = this.commandFactory.createSetCommand(this.editingDomain, this.table, TablePackage.eINSTANCE.getTable_Customizations(), sortedCustoms);

-			commandList.add(command);

-		}

-		return createResult(commandList, "Set loaded cutomizations"); //$NON-NLS-1$

-	}

-

-	class CommandList extends LinkedList<Command> {

-

-		private static final long serialVersionUID = 8581553157248060152L;

-

-		@Override

-		public boolean add(final Command command) {

-			boolean result;

-			if(command == null) {

-				result = false;

-			} else {

-				result = super.add(command);

-			}

-			return result;

-		}

-	}

-

-	public Command createRemoveColumnsCommand(final List<ETypedElement> elements) {

-		final List<Command> commandList = new ArrayList<Command>();

-		if(elements != null && !elements.isEmpty()) {

-			for(Column column : this.table.getColumns()) {

-				if(column instanceof FeatureColumn) {

-					final FeatureColumn featureColumn = (FeatureColumn)column;

-					if(elements.contains(featureColumn.getFeature())) {

-						final Command rmCommand = this.commandFactory.createRemoveCommand(this.editingDomain, this.table, TablePackage.eINSTANCE.getTable_Columns(), featureColumn);

-						commandList.add(rmCommand);

-					}

-				}

-			}

-

-		}

-		return createResult(commandList, NLS.bind("Remove {0} columms", Integer.valueOf(commandList.size()))); //$NON-NLS-1$

-	}

-

-//	public Command createSortRowCommand(final FeatureColumn featureColumn, final ColumnSortDirection direction) {

-//		final List<Row> rows = new ArrayList<Row>(this.table.getRows());

-//		final ETypedElement eTypedElement = featureColumn.getFeature();

-//		final RowComparator comparator = new RowComparator(eTypedElement, direction, this.facetManager);

-//		Collections.sort(rows, comparator);

-//		return new BrutalListSetCommand(this.table, TablePackage.eINSTANCE.getTable_Rows(), rows, Messages.TableCommandFactory_row_sort_label, NLS.bind(Messages.TableCommandFactory_row_sort_description, eTypedElement.getName()));

-//	}

-

-	public Command createRemoveRowByEObjectCommand(final Collection<? extends EObject> eObjectRows) {

-		final List<Row> rowsToRemove = new ArrayList<Row>();

-		for(Row row : this.table.getRows()) {

-			if(eObjectRows.contains(row.getElement())) {

-				rowsToRemove.add(row);

-			}

-		}

-		return createRemoveRowsCommand(rowsToRemove);

-	}

-

-	public Command createRemoveUselessColumnsCommand(final Collection<Row> rowsToRemove, final List<FacetSet> nextLoadedFS) {

-		final List<Command> commandList = new CommandList();

-		final List<Row> rowsToKeep = new ArrayList<Row>(this.table.getRows());

-		rowsToKeep.removeAll(rowsToRemove);

-		List<FacetSet> facetSets;

-		if(nextLoadedFS == null) {

-			facetSets = this.table.getFacetSets();

-		} else {

-			facetSets = nextLoadedFS;

-		}

-		final List<FeatureColumn> columns = TableInstanceUtils.columnsToRemove(this.table, facetSets, rowsToKeep);

-

-		for(FeatureColumn column : columns) {

-//			DebugUtils.debug(TableCommandFactory.DEBUG, "column to remove: " //$NON-NLS-1$

-//				+ EcoreUtil.getURI(column.getFeature()));

-			final Command rmColumnCmd = this.commandFactory.createRemoveCommand(this.editingDomain, this.table, TablePackage.eINSTANCE.getTable_Columns(), column);

-			commandList.add(rmColumnCmd);

-		}

-//		if(TableCommandFactory.DEBUG) {

-//			DebugUtils.debug("Columns to be removed: " + commandList.size()); //$NON-NLS-1$

-//		}

-		return createResult(commandList,"remove useless column");

-	}

-

-	public Command createRemoveRowsCommand(final Collection<Row> rows) {

-		final List<Command> cmdList = new CommandList();

-		for(Row row : rows) {

-			final Command removeRowCommand = this.commandFactory.createRemoveCommand(this.editingDomain, this.table, TablePackage.eINSTANCE.getTable_Rows(), row);

-			cmdList.add(removeRowCommand);

-		}

-		final Command updateColumnCmd = createRemoveUselessColumnsCommand(rows, null);

-		cmdList.add(updateColumnCmd);

-		return createResult(cmdList, NLS.bind("Remove {0} row(s)", Integer.valueOf(cmdList.size()))); //$NON-NLS-1$;

-	}

-

-	public Command createAddRowsCommand(final Collection<? extends EObject> eObjects) {

-		final List<Command> cmdList = new CommandList();

-		int nbRows = 0;

-		// the EPackage for which the MetamodelView has already been created

-		final Set<EPackage> alreadyDone = new HashSet<EPackage>();

-		final List<EStructuralFeature> processedSF = new ArrayList<EStructuralFeature>();

-		final List<EObject> tableContent = TableWidgetUtils.getElements(this.table);

-		for(EObject eObject : eObjects) {

-			if(!tableContent.contains(eObject)) {

-				final Row row = TableFactory.eINSTANCE.createRow();

-				final Command setToRowCmd = this.commandFactory.createSetCommand(this.editingDomain, row, TablePackage.eINSTANCE.getRow_Element(), eObject);

-				cmdList.add(setToRowCmd);

-				final Command addRowCmd = this.commandFactory.createAddCommand(this.editingDomain, this.table, TablePackage.eINSTANCE.getTable_Rows(), row);

-				cmdList.add(addRowCmd);

-				nbRows++;

-				for(EStructuralFeature eStructuralFeature : eObject.eClass().getEAllStructuralFeatures()) {

-					if(!processedSF.contains(eStructuralFeature)) {

-						processedSF.add(eStructuralFeature);

-						final Command createAddColumn = createAddColumn(alreadyDone, eStructuralFeature);

-						cmdList.add(createAddColumn);

-					}

-				}

-			}

-		}

-		return createResult(cmdList, NLS.bind("Add of {0} rows", Integer.valueOf(nbRows))); //$NON-NLS-1$

-	}

-

-	private Command createAddColumn(final Set<EPackage> alreadyDone, final EStructuralFeature structuralFeature) {

-		final List<Command> cmdList = new CommandList();

-		if(!TableInstanceUtils.isColumnAlreadyDeclared(this.table, structuralFeature)) {

-			final FeatureColumn referenceColumn = TableFactory.eINSTANCE.createFeatureColumn();

-			referenceColumn.setFeature(structuralFeature);

-			final Command cmd = this.commandFactory.createAddCommand(this.editingDomain, this.table, TablePackage.eINSTANCE.getTable_Columns(), referenceColumn);

-			cmdList.add(cmd);

-			// we add the local customization file

-			final List<Customization> localCustoms = this.table.getLocalCustomizations();

-			final EClass eClass = structuralFeature.getEContainingClass();

-			if(eClass != null) {

-				final EPackage ePackage = eClass.getEPackage();

-				if(!alreadyDone.contains(ePackage) && CustomizationUtils.findCustomizationExtendingEPackage(localCustoms, ePackage) == null) {

-					final Command localCustomCmd = createAddLocalCustomCommand(ePackage);

-					if(localCustomCmd.canExecute()) {

-						cmdList.add(localCustomCmd);

-					}

-					alreadyDone.add(ePackage);

-				}

-			}

-		}

-		return createResult(cmdList, NLS.bind("Add a column for {0}::{1}", //$NON-NLS-1$

-			structuralFeature.getEContainingClass().getName(), structuralFeature.getName()));

-	}

-

-	private Command createAddLocalCustomCommand(final EPackage ePackage) {

-		final List<Command> cmdList = new CommandList();

-		final ICommandFactoryResult<Customization> cmdFactoryResult = createCreateLocalCustom(ePackage);

-		final Customization newCustom = cmdFactoryResult.getResult();

-		cmdList.add(cmdFactoryResult.getCommand());

-		final List<Customization> customs = new ArrayList<Customization>();

-		customs.addAll(this.table.getCustomizations());

-		// we look for the index of the new local custom

-		final List<Customization> localCustoms = this.table.getLocalCustomizations();

-		int index = 0;

-		for(Customization custom : customs) {

-			if(localCustoms.contains(custom)) {

-				break;

-			}

-			index++;

-		}

-		customs.add(index, newCustom);

-		final Command setCustomCmd = this.commandFactory.createSetCommand(this.editingDomain, this.table, TablePackage.eINSTANCE.getTable_Customizations(), customs);

-		cmdList.add(setCustomCmd);

-		return createResult(cmdList, NLS.bind("Add of a new customization for the ePackage '{0}'", //$NON-NLS-1$

-			ePackage.getName()));

-	}

-

-	public ICommandFactoryResult<Customization> createCreateLocalCustom(final EPackage ePackage) {

-		final ICustomizationCommandFactory customCmdFactory = ICustomizationCommandFactoryFactory.DEFAULT.createCustomizationCommandFactory(this.editingDomain, this.commandFactory);

-		final List<Command> cmdList = new CommandList();

-		final ICommandFactoryResult<Customization> cmdFactoryResult = customCmdFactory.createCustomization("Column hiding customization for " //$NON-NLS-1$

-			+ ePackage.getName());

-		final Customization customization = cmdFactoryResult.getResult();

-		cmdList.add(cmdFactoryResult.getCommand());

-		final Command addToLocalCmd = this.commandFactory.createAddCommand(this.editingDomain, this.table, TablePackage.eINSTANCE.getTable_LocalCustomizations(), customization);

-		cmdList.add(addToLocalCmd);

-		final Command addAllCmd = this.commandFactory.createAddCommand(this.editingDomain, this.table, TablePackage.eINSTANCE.getTable_Customizations(), customization);

-		cmdList.add(addAllCmd);

-		final Command cmd = createResult(cmdList, "Create a local custom."); //$NON-NLS-1$

-		return ICommandFactoryResultFactory.DEFAULT.createCommandFactoryResult(cmd, customization);

-

-	}

-

-	public Command createSetFacetSetsCommand(final List<? extends FacetSet> facetSets) {

-		return createSetLoadedFacetSetsCommand(facetSets, true);

-	}

-

-

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/TableInstanceCommandFactory.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/TableInstanceCommandFactory.java
deleted file mode 100644
index 6e522d3f108..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/TableInstanceCommandFactory.java
+++ /dev/null
@@ -1,349 +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.table.efacet.menu.factory;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-

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

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

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

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

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

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

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

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

-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;

-import org.eclipse.emf.facet.custom.ui.internal.exported.ICustomizationCommandFactory;

-import org.eclipse.emf.facet.custom.ui.internal.exported.ICustomizationCommandFactoryFactory;

-import org.eclipse.emf.facet.efacet.core.FacetUtils;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.IsOneOfQuery;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryFactory;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage;

-import org.eclipse.emf.facet.util.emf.core.command.ICommandFactoryResult;

-import org.eclipse.emf.facet.util.emf.core.command.ICommandFactoryResultFactory;

-import org.eclipse.emf.facet.widgets.celleditors.ICommandFactoriesRegistry;

-import org.eclipse.emf.facet.widgets.celleditors.ICommandFactory;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Column;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.FeatureColumn;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Row;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.SourceColumn;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Table;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.TablePackage;

-import org.eclipse.emf.facet.widgets.table.ui.internal.exported.ITableWidgetInternal;

-

-

-//FIXME duplicated and adapted code from EMF-Facet

-//EMF-Facet should provides a best way to hide columns

-public final class TableInstanceCommandFactory {

-

-	public static Command createShowHideColumnCommand(final ITableWidgetInternal widgetController,final EditingDomain editingDomain, final ICommandFactory commandFactory, final Table table, final List<Column> columnsToShow, final List<Column> columnsToHide, final boolean putOnTheTop) {

-		final CompoundCommand compoundCommand = new CompoundCommand("Show/hide column"); //$NON-NLS-1$

-

-		for(final Column current : columnsToShow) {

-			if(current instanceof SourceColumn) {

-				final Command cmd = commandFactory.createSetCommand(editingDomain, current, TablePackage.eINSTANCE.getSourceColumn_IsHidden(), Boolean.FALSE);

-				if(cmd.canExecute()) {

-					compoundCommand.append(cmd);

-				}

-			}

-		}

-//		HashSet<FeatureColumn> fColumnsToHide = new HashSet<FeatureColumn>();

-		final HashSet<ETypedElement> featureToHide = new HashSet<ETypedElement>();

-		for(final Column current : columnsToHide) {

-			if(current instanceof FeatureColumn) {

-//				fColumnsToHide.add((FeatureColumn)current);

-				featureToHide.add(((FeatureColumn)current).getFeature());

-			} else {

-				final Command cmd = commandFactory.createSetCommand(editingDomain, current, TablePackage.eINSTANCE.getSourceColumn_IsHidden(), Boolean.TRUE);

-				compoundCommand.append(cmd);

-			}

-		}

-

-		final EList<Column> currentColumns = table.getColumns();

-		final List<Column> toHide2 = new ArrayList<Column>(currentColumns);

-		toHide2.removeAll(columnsToHide);

-		toHide2.removeAll(columnsToShow);

-		final List<Column> visibleColumns = widgetController.getVisibleColumns(false);

-		for(final Column col : toHide2) {

-			if(visibleColumns.contains(col)) {

-				columnsToShow.add(col);

-			} else if(col instanceof FeatureColumn) {

-				featureToHide.add(((FeatureColumn)col).getFeature());

-			}

-		}

-

-		final Command tmp = createHideColumnCommand(widgetController,editingDomain, table,featureToHide);

-

-		if(tmp != null) {

-			compoundCommand.append(tmp);

-		}

-		//FIXME : we ignore it in Papyrus...

-		//	if (putOnTheTop) {

-		//		Command cmd = createPutLocalCustomizationOnTheTopCommand(widgetController);

-		//		if (cmd.canExecute()) {

-		//			compoundCommand.append(cmd);

-		//		}

-		//	}

-		return compoundCommand;

-	}

-

-	//public static Command createPutLocalCustomizationOnTheTopCommand(final EditingDomain editingDomain

-	//		final Object natTableWidget) {

-	//	ICommandFactory commandFactory = natTableWidget.getCommandFactory();

-	//	List<Customization> localCustoms = natTableWidget.getLocalCustomizations();

-	//	List<Customization> customizations = new ArrayList<Customization>();

-	//	customizations.addAll(natTableWidget.getTable().getCustomizations());

-	//	customizations.removeAll(localCustoms);

-	//	customizations.addAll(0, localCustoms);

-	//	return commandFactory.createSetCommand(natTableWidget.getEditingDomain(),

-	//			natTableWidget.getTable(),

-	//			TablePackage.eINSTANCE.getTable_Customizations(),

-	//			customizations);

-	//}

-

-

-

-	private TableInstanceCommandFactory() {

-		// Prevents instantiation

-	}

-

-	/**

-	 * This method retruns an EMF command deleting the a collection of EObject

-	 *

-	 * @param label

-	 *        This label will be visible in the menu 'Edit'.

-	 * @param eObjects

-	 * @param controller

-	 * @return

-	 */

-	public static Command delete(final String label, final Collection<? extends EObject> eObjects, final EditingDomain domain, final ICommandFactory factory) {

-		final List<Command> cmdList = new ArrayList<Command>();

-		for(final EObject eObject : eObjects) {

-			final Command command = factory.createDeleteCommand(domain, eObject);

-			cmdList.add(command);

-		}

-		Command result = null;

-		if(!cmdList.isEmpty()) {

-			result = new CompoundCommand(label, cmdList);

-		}

-		return result;

-	}

-

-	/**

-	 * This method create a command deleting use less row and columns.

-	 *

-	 * @param controller

-	 * @return null if no action has to be performed.

-	 */

-	public static final Command createRemoveUselessRowsAndColumnsCommand(final EditingDomain domain, final ICommandFactory factory, final Table table) {

-		final List<Command> cmdList = new ArrayList<Command>();

-		final List<Row> rowsToRemove = TableInstanceUtils.findUselessRow(table);

-//		if(TableWidgetController.DEBUG_REMOVE_USELESS_ROWS_AND_COLUMNS) {

-//			DebugUtils.debug("Rows to be removed: " + rowsToRemove.size()); //$NON-NLS-1$

-//		}

-		final Command deleteRows = TableInstanceCommandFactory.delete("Delete useless row", rowsToRemove,domain, factory);

-		if(deleteRows != null) {

-			cmdList.add(deleteRows);

-		}

-		final TableCommandFactory tableCmdFactory = new TableCommandFactory(table,domain, factory, null);

-		final Command removeColumnCommand = tableCmdFactory.createRemoveUselessColumnsCommand(rowsToRemove, null);

-		if(removeColumnCommand != null) {

-			if(!removeColumnCommand.canExecute()) {

-				//FIXME

-				throw new RuntimeException("Command cannot be executed");

-//				throw new TableWidgetRuntimeException("Command cannot be executed"); //$NON-NLS-1$

-			}

-			cmdList.add(removeColumnCommand);

-		}

-		CompoundCommand command = null;

-		if(!cmdList.isEmpty()) {

-			command = new CompoundCommand("Remove useless columns", cmdList);

-		}

-		return command;

-	}

-

-	/**

-	 *

-	 * @param column

-	 *        a column

-	 * @param isHidden

-	 *        the new feature value for this column

-	 * @param customizedFeatureName

-	 *        the customized feature name

-	 * @return

-	 */

-	public static Command createHideColumnCommand(final ITableWidgetInternal widgetController, final EditingDomain domain, final Table table, final Collection<ETypedElement> featuresToHide) {

-		final FacetOperation isVisibleProperty = widgetController.getCustomPropertiesHandler().getIsVisible();

-		final CompoundCommand resultCmd = new CompoundCommand("Show/hide column"); //$NON-NLS-1$

-		final EditingDomain editingDomain = domain;

-		final ICommandFactory commandFactory = ICommandFactoriesRegistry.INSTANCE.getCommandFactoryFor(editingDomain);

-		//		final EStructuralFeature featureOfTheColumn = featureColumn

-		//				.getFeature();

-		//		EObject packageLevel = featureOfTheColumn.eContainer().eContainer();

-		//		if (!(packageLevel instanceof EPackage)) {

-		//			throw new IllegalStateException(

-		//					"Unexpected feature container type " + packageLevel + " found. (EPackage is execpected)"); //$NON-NLS-1$ //$NON-NLS-2$

-		//		}

-		//		final EPackage customizedEPackage = (EPackage) packageLevel;

-		// 1 we look for the corresponding customization

-		final List<Customization> localCustomizations = table.getLocalCustomizations();

-		Customization customization = null;

-		if(!localCustomizations.isEmpty()) {

-			customization = localCustomizations.get(0);

-		}

-		final ICustomizationCommandFactory customCmdFactory = ICustomizationCommandFactoryFactory.DEFAULT.createCustomizationCommandFactory(editingDomain, commandFactory);

-		// If the wanted customization does not exist then we create it.

-		if(customization == null) {

-			//			final TableCommandFactory factory = new TableCommandFactory(table, domain, commandFactory, null);

-			final ICommandFactoryResult<Customization> cmdFactoryResult = createCreateLocalCustom(editingDomain, commandFactory, table, EcorePackage.eINSTANCE);

-			customization = cmdFactoryResult.getResult();

-			resultCmd.append(cmdFactoryResult.getCommand());

-		}

-		Facet typeCustomization = CustomizationUtils.findFacetByExtendedMetaclass(FacetUtils.getFacets(customization), EcorePackage.eINSTANCE.getETypedElement());

-		IsOneOfQuery conformanceQuery;

-		if(typeCustomization == null) {

-			conformanceQuery = QueryFactory.eINSTANCE.createIsOneOfQuery();

-			final ICommandFactoryResult<EClassCustomization> createEClassCustom = customCmdFactory.createEClassCustomization(customization, EcorePackage.eINSTANCE.getETypedElement(), conformanceQuery);

-			typeCustomization = createEClassCustom.getResult();

-			resultCmd.append(createEClassCustom.getCommand());

-		} else {

-			if(!(typeCustomization instanceof EClassCustomization)) {

-				//				throw new TableWidgetRuntimeException("Unexpected type for the variable 'featureContainer'"); //$NON-NLS-1$

-				//TODO

-			}

-			final DerivedTypedElement conformanceTE = (DerivedTypedElement)typeCustomization.getConformanceTypedElement();

-			conformanceQuery = (IsOneOfQuery)conformanceTE.getQuery();

-		}

-		//		final HashSet<ETypedElement> featuresToHide = new HashSet<ETypedElement>();

-		//		for(FeatureColumn column : featureColumns) {

-		//			featuresToHide.add(column.getFeature());

-		//		}

-		final Command initQuery = commandFactory.createSetCommand(editingDomain, conformanceQuery, QueryPackage.eINSTANCE.getIsOneOfQuery_ExpectedEObjects(), new ArrayList<ETypedElement>(featuresToHide));

-		resultCmd.append(initQuery);

-		final Query query = QueryFactory.eINSTANCE.createFalseLiteralQuery();

-		final ICommandFactoryResult<Facet> propConfigCmd = customCmdFactory.setPropertyConfig(typeCustomization, null, isVisibleProperty, query);

-		resultCmd.append(propConfigCmd.getCommand());

-		return resultCmd;

-	}

-

-

-	public static ICommandFactoryResult<Customization> createCreateLocalCustom(final EditingDomain editingDomain, final ICommandFactory commandFactory, final Table table, final EPackage ePackage) {

-		final ICustomizationCommandFactory customCmdFactory = ICustomizationCommandFactoryFactory.DEFAULT.createCustomizationCommandFactory(editingDomain, commandFactory);

-		final List<Command> cmdList = new CommandList();

-		final ICommandFactoryResult<Customization> cmdFactoryResult = customCmdFactory.createCustomization("Column hiding customization for " //$NON-NLS-1$

-			+ ePackage.getName());

-		final Customization customization = cmdFactoryResult.getResult();

-		cmdList.add(cmdFactoryResult.getCommand());

-		final Command addToLocalCmd = commandFactory.createAddCommand(editingDomain, table, TablePackage.eINSTANCE.getTable_LocalCustomizations(), customization);

-		cmdList.add(addToLocalCmd);

-		final Command addAllCmd = commandFactory.createAddCommand(editingDomain, table, TablePackage.eINSTANCE.getTable_Customizations(), customization);

-		cmdList.add(addAllCmd);

-		final Command cmd = createResult(cmdList, "Create a local custom."); //$NON-NLS-1$

-		return ICommandFactoryResultFactory.DEFAULT.createCommandFactoryResult(cmd, customization);

-

-	}

-

-	private static Command createResult(final List<Command> commandList, final String label) {

-		Command result = null;

-		while(commandList.contains(null)) {

-			commandList.remove(null);

-		}

-		if(!commandList.isEmpty()) {

-			result = new CompoundCommand(label, commandList);

-		}

-		return result;

-	}

-

-

-

-	//	/**

-	//	 * This method retruns an EMF command deleting the a collection of EObject

-	//	 *

-	//	 * @param label

-	//	 *        This label will be visible in the menu 'Edit'.

-	//	 * @param eObjects

-	//	 * @param controller

-	//	 * @return

-	//	 */

-	//	public static Command delete(final String label, final Collection<? extends EObject> eObjects, final TableWidgetController controller) {

-	//		List<Command> cmdList = new ArrayList<Command>();

-	//		for(EObject eObject : eObjects) {

-	//			Command command = controller.getCommandFactory().createDeleteCommand(controller.getEditingDomain(), eObject);

-	//			cmdList.add(command);

-	//		}

-	//		Command result = null;

-	//		if(!cmdList.isEmpty()) {

-	//			result = new CompoundCommand(label, cmdList);

-	//		}

-	//		return result;

-	//	}

-	//

-	//	/**

-	//	 * This method create a command deleting use less row and columns.

-	//	 *

-	//	 * @param controller

-	//	 * @return null if no action has to be performed.

-	//	 */

-	//	public static final Command createRemoveUselessRowsAndColumnsCommand(final TableWidgetController controller) {

-	//		List<Command> cmdList = new ArrayList<Command>();

-	//		List<Row> rowsToRemove = TableInstanceUtils.findUselessRow(controller.getTable());

-	//		if(TableWidgetController.DEBUG_REMOVE_USELESS_ROWS_AND_COLUMNS) {

-	//			DebugUtils.debug("Rows to be removed: " + rowsToRemove.size()); //$NON-NLS-1$

-	//		}

-	//		final Command deleteRows = TableInstanceCommandFactory.delete(Messages.TableWidgetController_DeleteUselessRows, rowsToRemove, controller);

-	//		if(deleteRows != null) {

-	//			cmdList.add(deleteRows);

-	//		}

-	//		final TableCommandFactory tableCmdFactory = new TableCommandFactory(controller.getTable(), controller.getEditingDomain(), controller.getCommandFactory(), null);

-	//		final Command removeColumnCommand = tableCmdFactory.createRemoveUselessColumnsCommand(rowsToRemove, null);

-	//		if(removeColumnCommand != null) {

-	//			if(!removeColumnCommand.canExecute()) {

-	//				throw new TableWidgetRuntimeException("Command cannot be executed"); //$NON-NLS-1$

-	//			}

-	//			cmdList.add(removeColumnCommand);

-	//		}

-	//		CompoundCommand command = null;

-	//		if(!cmdList.isEmpty()) {

-	//			command = new CompoundCommand(Messages.TableWidgetController_RemoveUselessRowsAndColumns, cmdList);

-	//		}

-	//		return command;

-	//	}

-	private static class CommandList extends LinkedList<Command> {

-

-		/**

-		 *

-		 */

-		private static final long serialVersionUID = 4393120485370832319L;

-

-		@Override

-		public boolean add(final Command command) {

-			boolean result;

-			if(command == null) {

-				result = false;

-			} else {

-				result = super.add(command);

-			}

-			return result;

-		}

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/TableInstanceUtils.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/TableInstanceUtils.java
deleted file mode 100644
index 29514ec5451..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/factory/TableInstanceUtils.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010, 2011, 2012 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 Bros (Mia-Software) - Bug 332437 - NatTable : pluggable cell editors

- *    Nicolas Guyomar (Mia-Software) - Bug 331442 - To be able to add and remove lines (model elements) from the table

- *    Nicolas Bros (Mia-Software) - Bug 332226 - To be able to create or delete model element from the table

- *    Nicolas Guyomar (Mia-Software) - Bug 332226 - To be able to create or delete model element from the table

- *    Nicolas Bros (Mia-Software) - Bug 332438 - NatTable : table type

- *    Nicolas Bros (Mia-Software) - Bug 332440 - NatTable : force cell editors

- *    Nicolas Bros (Mia-Software) - Bug 331675 - NatTable : copy cells as text 

- *    Nicolas Bros (Mia-Software) - Bug 331900 - customizable NatTable

- *    Nicolas Bros (Mia-Software) - Bug 332010 - view Facet customizations on NatTable

- *    Nicolas Bros (Mia-Software) - Bug 332215 - customizable NatTable column headers

- *    Nicolas Guyomar (Mia-Software) - Bug 332215 - customizable NatTable column headers

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

- *    Nicolas Guyomar (Mia-Software) - Bug 332998 - To be able to add a column and fill it with the result of a query

- *    Gregoire Dupe (Mia-Software) - Bug 332998 - To be able to add a column and fill it with the result of a query

- *    Gregoire Dupe (Mia-Software) - Bug 333015 - To be able to hide columns

- *    Nicolas Guyomar (Mia-Software) - Bug 333015 - To be able to hide columns

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

- *    Nicolas Guyomar (Mia-Software) - Bug 333414 - The user must be able to save the column order

- *    Nicolas Guyomar (Mia-Software) - Bug 335154 - Sort Column By Type : Cannot modify resource set without a write transaction

- *    Nicolas Guyomar (Mia-Software) - Bug 335155 - Hide Empty Column : Cannot modify resource set without a write transaction

- *    Nicolas Guyomar (Mia-Software) - Bug 335156 - Only Show Common column : Cannot modify resource set without a write transaction

- *    Nicolas Guyomar (Mia-Software) - Bug 335020 - Nattable widget should use the Eclipse framework

- *    Nicolas Guyomar (Mia-Software) - Bug 337322 - [TableConfiguration] Customization declared in the file tableconfiguration is not loaded

- *    Nicolas Guyomar (Mia-Software) - Bug 338536 - Problem with the refresh of the table : the scrollbar returns to this initial position

- *    Nicolas Bros (Mia-Software) - Bug 338536 - Problem with the refresh of the table : the scrollbar returns to this initial position

- *    Nicolas Guyomar (Mia-Software) - Bug 337454 - We can't delete a query Column

- *    Nicolas Guyomar (Mia-Software) - Bug 337395 - Unused columns should be destroyed

- *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

- *    Nicolas Guyomar (Mia-Software) - Bug 339922 - INatTableWidget method isCellSelected should use the plural

- *    Nicolas Guyomar (Mia-Software) - Bug 340681 - Facet column implementation

- *    Vincent Lorenzo (CEA-LIST) - Bug 337326 - Show/Hide Column : Sort the columns by name 

- *    Nicolas Guyomar (Mia-Software) - Bug 340940 - To be able to view facet attributes and facet references in a table

- *    Vincent Lorenzo (CEA-LIST) - Bug 337408 - Add an action to sort columns by name 

- *    Nicolas Guyomar (Mia-Software) - Bug 336482 - KeyBinding to edit element in Table : F2 

- *    Vincent Lorenzo (CEA-LIST) - Bug 341238 - We need to be able to specify which column have to be hidden/visible using the customization mechanism

- *    Gregoire Dupe (Mia-Software) - Bug 341238 - We need to be able to specify which column have to be hidden/visible using the customization mechanism

- *    Nicolas Guyomar (Mia-Software) - Bug 342451 - To be able to edit derived facet attributes and derived facet references in a table

- *    Vincent Lorenzo (CEA-LIST) - Bug 341238 - We need to be able to specify which column have to be hidden/visible using the customization mechanism

- *    Nicolas Guyomar (Mia-Software) - Bug 343411 - [Table] Create new elements does not support IJavaModelQuery anymore

- *    Gregoire Dupe (Mia-Software) - Bug 343811 - EMF Facet Regression : Created elements in a table are not serialized

- *    Vincent Lorenzo (CEA-LIST) - Bug 344125 - The API should provide a method selectRows(List<EObject> elementsToSelect)

- *    Nicolas Guyomar (Mia-Software) - Bug 344274 - SWT BOT fail on Hudson

- *    Nicolas Guyomar (Mia-Software) - Bug 344475 - To be able to select a cell by EStructuralFeature in the table

- *    Nicolas Guyomar (Mia-Software) - Bug 342028 - Field can be edited even if they are marked as N/A

- *    Nicolas Guyomar (Mia-Software) - Bug 344413 - Facet Columns are never created when we begin with an empty table

- *    Gregoire Dupe (Mia-Software) - Bug 343859 - The local customizations are not applied when we reopen a table

- *    Nicolas Guyomar (Mia-Software) - Bug 344670 - Problems with the columns creation : very slow + scrollbar blinked

- *    Vincent Lorenzo (CEA LIST) - Bug 341238 - We need to be able to specify which column have to be hidden/visible using the customization mechanism

- *    Nicolas Guyomar (Mia-Software) - Bug 344925 - Undo/Redo after the action Show Columns

- *    Gregoire Dupe (Mia-Software) - Bug 344925 - Undo/Redo after the action Show Columns - Regression fix

- *    Nicolas Guyomar (Mia-Software) - Bug 345665 - Columns are duplicated when you drop many elements in the same time

- *    Nicolas Guyomar (Mia-Software) - Bug 346465 - [EMF Facet Table] Remove line does not remove obsolete column

- *    Gregoire Dupe (Mia-Software) - Bug 345730 - Deleting an element in the model breaks the table

- *    Gregoire Dupe (Mia-Software) - Bug 354224 - mutually exclusive Facets

- *    Grégoire Dupé (Mia-Software) - Bug 356795 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.emf.facet.widgets.nattable.tests.Bug344413Test.testBug344413

- *    Gregoire Dupe (Mia-Software) - Bug 366804 - [Restructuring] Table widget upgrade

- *    Gregoire Dupe (Mia-Software) - Bug 367613 - Table widget refactoring

- *    Gregoire Dupe (Mia-Software) - Bug 367700 - [Unit Test Failure][0.2/3.8] org.eclipse.emf.facet.widgets.table.tests.internal.v0_2.swtbot.NatTableUITests.testOpenLoadCustomizationDialog

- *    Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

- *    Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning

- *    Gregoire Dupe (Mia-Software) - Bug 374903 - [Table] ITableWidget.setLoadedFacetSets

- *    Gregoire Dupe (Mia-Software) - Bug 375087 - [Table] ITableWidget.addColumn(List<ETypedElement>, List<FacetSet>)

- *    Gregoire Dupe (Mia-Software) - Bug 372626 - Aggregates

- *    Gregoire Dupe (Mia-Software) - Bug 387008 - [Table] Papyrus needs methods provided by TableInstanceCommandFactory

- *    Gregoire Dupe (Mia-Software) - Bug 380293 - [Table] Columns declared in tableconfiguration are never created when we create an empty table

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

-package org.eclipse.papyrus.infra.table.efacet.menu.factory;

-

-import java.util.ArrayList;

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

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

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

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

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

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

-import org.eclipse.emf.facet.efacet.core.FacetUtils;

-import org.eclipse.emf.facet.efacet.core.IFacetManager;

-import org.eclipse.emf.facet.efacet.core.IFacetManagerFactory;

-import org.eclipse.emf.facet.efacet.core.exception.FacetManagerException;

-import org.eclipse.emf.facet.efacet.core.internal.exported.IResolverManager;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

-//import org.eclipse.emf.facet.util.core.Logger;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Column;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.FeatureColumn;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Row;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Table;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.TableConfiguration;

-//import org.eclipse.emf.facet.widgets.table.ui.internal.exported.exception.UnresolvedProxyException;

-

-//FIXME : duplicted code used in the local tableinstancecommand factory -> EMF-Facet should open its API

-public final class TableInstanceUtils {

-

-	private TableInstanceUtils() {

-		// Must not be used

-	}

-

-	/**

-	 * This methods the row referring a deleted or detached element.

-	 * 

-	 * @param tableInstance

-	 * @return

-	 */

-	public static List<Row> findUselessRow(final Table tableInstance) {

-		final List<Row> rowsToRemove = new ArrayList<Row>();

-		for(Row row : tableInstance.getRows()) {

-			if(row.getElement() == null || row.getElement().eResource() == null) {

-				rowsToRemove.add(row);

-			}

-		}

-		return rowsToRemove;

-	}

-

-	/**

-	 * This method returns the list of structural feature required to presents

-	 * the chosen rows.

-	 * 

-	 * @param table

-	 * @param rowsToKeep

-	 * @param nextLoadedFacets

-	 *        can be null.

-	 * @param facetManager

-	 * @return

-	 */

-	public static Set<ETypedElement> getAllETypedElement(final Table table,

-			final List<Row> rowsToKeep,

-			final List<? extends FacetSet> nextLoadedFacets) {

-		final Set<ETypedElement> eTypedElements = new HashSet<ETypedElement>();

-		final IFacetManager facetManager = IFacetManagerFactory.DEFAULT

-				.getOrCreateFacetManager(new ResourceSetImpl());

-		if (nextLoadedFacets == null) {

-			facetManager.getManagedFacetSets().addAll(table.getFacetSets());

-		} else {

-			facetManager.getManagedFacetSets().addAll(nextLoadedFacets);

-		}

-		for (Row row : rowsToKeep) {

-			final EClass eClass = row.getElement().eClass();

-			eTypedElements.addAll(eClass.getEAllStructuralFeatures());

-			eTypedElements.addAll(eClass.getEAllOperations());

-			try {

-				final Set<ETypedElement> facetTEs = FacetUtils

-						.getETypedElements(row.getElement(),

-								ETypedElement.class, facetManager);

-				eTypedElements.addAll(facetTEs);

-			} catch (FacetManagerException e) {

-				//FIXME

-//				Logger.logError(

-//						e,

-//						"An exception has occured while retrieving structural features of:" + row.getElement(), Activator.getDefault()); //$NON-NLS-1$

-			}

-		}

-		return eTypedElements;

-	}

-

-	public static List<FeatureColumn> columnsToRemove(final Table table, final List<? extends FacetSet> newFacetSets, final List<Row> rowsToKeep) {

-

-		final List<FeatureColumn> result = new LinkedList<FeatureColumn>();

-		if(rowsToKeep.isEmpty()) {

-			// If there is no rows, then there should not be any column

-			for(Column column : table.getColumns()) {

-				if(column instanceof FeatureColumn) {

-					final FeatureColumn featureColumn = (FeatureColumn)column;

-					addToListNotDefault(featureColumn, result, table);

-				}

-			}

-		} else {

-			final List<? extends ETypedElement> eTypedElements = new ArrayList<ETypedElement>(TableInstanceUtils.getAllETypedElement(table, rowsToKeep, newFacetSets));

-			for(Column column : table.getColumns()) {

-				if(column instanceof FeatureColumn) {

-					final FeatureColumn featureColumn = (FeatureColumn)column;

-					ETypedElement eTypedElement = featureColumn.getFeature();

-					eTypedElement = (ETypedElement)EcoreUtil.resolve(eTypedElement, table);

-					if(eTypedElement.eIsProxy()) {

-						throw new RuntimeException("The current structural feature should have been resolved. " + EcoreUtil.getURI(eTypedElement)); //$NON-NLS-1$

-					}

-					final ETypedElement resolvedTE = IResolverManager.DEFAULT.resolve(eTypedElement, ETypedElement.class);

-					if(resolvedTE != null) {

-						eTypedElement = resolvedTE;

-					}

-					if(!eTypedElements.contains(eTypedElement)) {

-						addToListNotDefault(featureColumn, result, table);

-					}

-				}

-			}

-		}

-		return result;

-	}

-

-	private static void addToListNotDefault(final FeatureColumn featureColumn, final List<FeatureColumn> list, final Table table) {

-		// The column declared as default in the table configuration must not be

-		// removed

-		final TableConfiguration tableConfig = table.getTableConfiguration();

-		if(tableConfig == null || !tableConfig.getDefaultColumns().contains(featureColumn.getFeature())) {

-			list.add(featureColumn);

-		}

-	}

-

-	public static boolean isColumnAlreadyDeclared(final Table table, final EStructuralFeature structuralFeature) {

-		boolean result = false;

-		for(Column column : table.getColumns()) {

-			if(column instanceof FeatureColumn) {

-				final FeatureColumn featureColumn = (FeatureColumn)column;

-				if(featureColumn.getFeature() == structuralFeature) {

-					result = true;

-					break;

-				}

-			}

-		}

-		return result;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/ColumnsToShowDialog.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/ColumnsToShowDialog.java
deleted file mode 100644
index 9ea0802cf45..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/ColumnsToShowDialog.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

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

-package org.eclipse.papyrus.infra.table.efacet.menu.handler;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.List;

-

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

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

-import org.eclipse.jface.layout.GridDataFactory;

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

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

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

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

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

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

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

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

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

-import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;

-import org.eclipse.ui.dialogs.FilteredTree;

-import org.eclipse.ui.dialogs.PatternFilter;

-import org.eclipse.ui.dialogs.SelectionDialog;

-

-

-public class ColumnsToShowDialog extends SelectionDialog {

-

-	/** the label provider used by the tree viewer */

-	private final ILabelProvider labelProvider;

-

-	/** the content provider used by the tree viewer */

-	private final IContentProvider contentProvider;

-

-	/** the with of the dialog */

-	private static final int DIALOG_WIDTH = 1000;

-

-	/** the height of the dialog */

-	private static final int DIALOG_HEIGHT = 600;

-

-	/** the direct features */

-	private final Collection<ETypedElement> directFeatures;

-

-	/** the additional features */

-	private final Collection<ENamedElement> additionalFeatures;

-

-	/** the initial selection */

-	private final Collection<ETypedElement> initialSelection;

-

-	/** the tree used to display the direct features */

-	private FilteredTree directFeaturesTree;

-

-	/** the tree used to display the additional features */

-	private FilteredTree additionnalFeaturesTree;

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 * @param parentShell

-	 *        the parent shell

-	 * @param features

-	 *        the direct features

-	 * @param additionalFeatures

-	 *        the additional features (FacetSet, Facets or ETypedElement)

-	 * @param initialSelection

-	 *        the initial selection

-	 * @param labelProvider

-	 *        the label provider used by the viewers

-	 * @param contentProvider

-	 *        the content provider used by the viewers

-	 */

-	public ColumnsToShowDialog(final Shell parentShell, final Collection<ETypedElement> features, final Collection<ENamedElement> additionalFeatures, final Collection<ETypedElement> initialSelection, final ILabelProvider labelProvider, final IContentProvider contentProvider) {

-		super(parentShell);

-		setTitle("Select the columns to show");

-		this.directFeatures = features;

-		this.additionalFeatures = additionalFeatures;

-		this.labelProvider = labelProvider;

-		this.contentProvider = contentProvider;

-		this.initialSelection = initialSelection;

-	}

-

-	@Override

-	public void create() {

-		super.create();

-

-		final Composite parent = (Composite)getDialogArea();

-		final GridLayout layout = (GridLayout)parent.getLayout();

-		layout.numColumns = 2;

-		layout.makeColumnsEqualWidth = true;

-

-		final Composite selectorPane = new Composite(parent, SWT.NONE);

-		selectorPane.setLayout(new GridLayout(2, false));

-		selectorPane.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		final Composite selectedPane = new Composite(parent, SWT.NONE);

-		selectedPane.setLayout(new GridLayout(2, false));

-		selectedPane.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		createDirectFeaturesSection(selectorPane);

-		createAdditionalFeaturesSection(selectedPane);

-

-		getShell().setSize(DIALOG_WIDTH, DIALOG_HEIGHT);

-		getShell().layout();

-

-		//TODO

-		//		super.getShell().setImage(Activator.getDefault().getImage("/icons/papyrus.png")); //$NON-NLS-1$

-	}

-

-	/**

-	 *

-	 * @param parent

-	 *        the parent of the button panel

-	 * @return

-	 *         the composite used as parent for the buttons

-	 */

-	protected Composite createButtonPanel(final Composite parent) {

-		final Composite buttonsPanel = new Composite(parent, SWT.NONE);

-		final GridLayout buttonPanelLayout = new GridLayout(2, true);

-		buttonPanelLayout.marginWidth = 0;

-		buttonPanelLayout.marginHeight = 0;

-		buttonsPanel.setLayout(buttonPanelLayout);

-		buttonsPanel.setLayoutData(new GridData(SWT.END, SWT.FILL, false, false));

-		return buttonsPanel;

-	}

-

-	/**

-	 * Create the direct features section

-	 *

-	 * @param parent

-	 *        crate the feature section

-	 *

-	 */

-	protected void createDirectFeaturesSection(final Composite parent) {

-		//1. create the composite used for this section

-		final Composite featureComposite = new Composite(parent, SWT.BORDER);

-		featureComposite.setLayout(new GridLayout(1, false));

-		featureComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		//2. create the label of the section

-		final Label label = new Label(featureComposite, SWT.NONE);

-		label.setText("Direct Features");

-

-		//3. create the tree

-		this.directFeaturesTree = new FilteredCheckboxTree(featureComposite, SWT.BORDER | SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.CHECK, new PatternFilter());

-		GridDataFactory.fillDefaults().grab(true, true).applyTo(this.directFeaturesTree);

-

-		this.directFeaturesTree.getViewer().setLabelProvider(this.labelProvider);

-		this.directFeaturesTree.getViewer().setContentProvider(this.contentProvider);

-		this.directFeaturesTree.getViewer().setInput(this.directFeatures);

-

-		//3.bis set the initial selection

-		((ContainerCheckedTreeViewer)this.directFeaturesTree.getViewer()).setCheckedElements(this.initialSelection.toArray());

-

-		//4. create the buttons select all and deselect all

-		final Composite buttonsPanel = createButtonPanel(featureComposite);

-		final Button selectAllFeaturesButton = new Button(buttonsPanel, SWT.NONE);

-		selectAllFeaturesButton.setText("Select All");

-		selectAllFeaturesButton.setToolTipText("Select all available features.");

-		selectAllFeaturesButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		selectAllFeaturesButton.addSelectionListener(new SelectionListener() {

-

-			public void widgetSelected(final SelectionEvent e) {

-				selectAllDirectFeatures();

-			}

-

-			public void widgetDefaultSelected(final SelectionEvent e) {

-				//nothing to do

-			}

-		});

-

-		final Button deselectAllFeaturesButton = new Button(buttonsPanel, SWT.NONE);

-		deselectAllFeaturesButton.setText("Deselect All");

-		deselectAllFeaturesButton.setToolTipText("Deselect all available features.");

-		deselectAllFeaturesButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		deselectAllFeaturesButton.addSelectionListener(new SelectionListener() {

-

-			public void widgetSelected(final SelectionEvent e) {

-				deselectAllDirectFeatures();

-			}

-

-			public void widgetDefaultSelected(final SelectionEvent e) {

-				//nothing to do

-			}

-		});

-

-	}

-

-

-

-	protected void createAdditionalFeaturesSection(final Composite facetPane) {

-		//1. create the composite used for this section

-		final Composite facetComposite = new Composite(facetPane, SWT.BORDER);

-		facetComposite.setLayout(new GridLayout(1, true));

-		facetComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-

-		//2. create the label for this section

-		final Label label = new Label(facetComposite, SWT.NONE);

-		label.setText("Additional Features");

-

-		//3. create the tree for this section

-		this.additionnalFeaturesTree = new FilteredCheckboxTree(facetComposite, SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.CHECK, new PatternFilter());//, true);

-		GridDataFactory.fillDefaults().grab(true, true).applyTo(this.additionnalFeaturesTree);

-		this.additionnalFeaturesTree.getViewer().expandAll();

-		this.additionnalFeaturesTree.getViewer().setLabelProvider(this.labelProvider);

-		this.additionnalFeaturesTree.getViewer().setContentProvider(this.contentProvider);

-		this.additionnalFeaturesTree.getViewer().setInput(this.additionalFeatures);

-		this.additionnalFeaturesTree.getViewer().expandAll();

-		((ContainerCheckedTreeViewer)this.additionnalFeaturesTree.getViewer()).setCheckedElements(this.initialSelection.toArray());

-

-		//4. create the buttons select all and deselect all

-		final Composite buttonsPanel = createButtonPanel(facetComposite);

-		final Button selectAllAdditionalFeaturesButton = new Button(buttonsPanel, SWT.NONE);

-		selectAllAdditionalFeaturesButton.setText("Select All");

-		selectAllAdditionalFeaturesButton.setToolTipText("Select all available additional features.");

-		selectAllAdditionalFeaturesButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		selectAllAdditionalFeaturesButton.addSelectionListener(new SelectionListener() {

-

-			public void widgetSelected(final SelectionEvent e) {

-				selectAllAdditionalFeatures();

-			}

-

-			public void widgetDefaultSelected(final SelectionEvent e) {

-				//nothing to do

-			}

-		});

-

-		final Button deselectAllAdditionalFeaturesButton = new Button(buttonsPanel, SWT.NONE);

-		deselectAllAdditionalFeaturesButton.setText("Deselect All");

-		deselectAllAdditionalFeaturesButton.setToolTipText("Deselect all available additional features.");

-		deselectAllAdditionalFeaturesButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

-		deselectAllAdditionalFeaturesButton.addSelectionListener(new SelectionListener() {

-

-			public void widgetSelected(final SelectionEvent e) {

-				deselectAllAdditionalFeatures();

-			}

-

-			public void widgetDefaultSelected(final SelectionEvent e) {

-				//nothing to do

-			}

-		});

-	}

-

-

-

-	/**

-	 * select all additional features

-	 */

-	protected void selectAllAdditionalFeatures() {

-		final ContainerCheckedTreeViewer viewer = (ContainerCheckedTreeViewer)this.additionnalFeaturesTree.getViewer();

-		for(final Object current : this.additionalFeatures) {

-			viewer.setSubtreeChecked(current, true);

-		}

-	}

-

-	/**

-	 * deselect all additional features

-	 */

-	protected void deselectAllAdditionalFeatures() {

-		final ContainerCheckedTreeViewer viewer = (ContainerCheckedTreeViewer)this.additionnalFeaturesTree.getViewer();

-		for(final Object current : this.additionalFeatures) {

-			viewer.setSubtreeChecked(current, false);

-		}

-	}

-

-	/**

-	 * select all direct features

-	 */

-	protected void selectAllDirectFeatures() {

-		final ContainerCheckedTreeViewer viewer = (ContainerCheckedTreeViewer)this.directFeaturesTree.getViewer();

-		for(final Object current : this.directFeatures) {

-			viewer.setSubtreeChecked(current, true);

-		}

-	}

-

-	/**

-	 * deselect all direct features

-	 */

-	protected void deselectAllDirectFeatures() {

-		final ContainerCheckedTreeViewer viewer = (ContainerCheckedTreeViewer)this.directFeaturesTree.getViewer();

-		for(final Object current : this.directFeatures) {

-			viewer.setSubtreeChecked(current, false);

-		}

-	}

-

-	public void pressOk() {

-		okPressed();

-	}

-

-	/**

-	 * The <code>ListSelectionDialog</code> implementation of this <code>Dialog</code> method builds a list of the selected elements for

-	 * later retrieval by the client and closes this dialog.

-	 */

-	@Override

-	protected void okPressed() {

-		final Collection<ETypedElement> selectedFeatures = getAllChechedElements(this.directFeaturesTree);

-		final Collection<ETypedElement> selectedAdditionalFeatures = getAllChechedElements(this.additionnalFeaturesTree);

-

-		final List<Collection<ETypedElement>> result = new ArrayList<Collection<ETypedElement>>();

-		result.add(selectedFeatures);

-		result.add(selectedAdditionalFeatures);

-		setResult(result);

-		super.okPressed();

-	}

-

-	/**

-	 *

-	 * @param tree

-	 *        a tree

-	 * @return

-	 *         all items checked ignoring grayed elements

-	 */

-	protected Collection<ETypedElement> getAllChechedElements(final FilteredTree tree) {

-		final Collection<ETypedElement> checkedElements = new HashSet<ETypedElement>();

-		final TreeViewer viewer = tree.getViewer();

-		final TreeItem[] items = viewer.getTree().getItems();

-		for(final TreeItem treeItem : items) {

-			if(treeItem.getChecked()) {

-				final Object data = treeItem.getData();

-				if(data instanceof ETypedElement) {

-					checkedElements.add((ETypedElement)data);

-				}

-			}

-			if(treeItem.getChecked() || treeItem.getGrayed()) {

-				checkedElements.addAll(getAllCheckedSubItems(treeItem));

-			}

-		}

-		return checkedElements;

-	}

-

-	/**

-	 *

-	 * @param item

-	 *        a item

-	 * @return

-	 *         all sub items checked ignoring grayed items

-	 */

-	protected Collection<ETypedElement> getAllCheckedSubItems(final TreeItem item) {

-		final Collection<ETypedElement> checkedElements = new HashSet<ETypedElement>();

-		for(final TreeItem current : item.getItems()) {

-			if(current.getGrayed()) {

-

-			} else if(current.getChecked()) {

-				final Object data = current.getData();

-				if(data instanceof ETypedElement) {

-					checkedElements.add((ETypedElement)data);

-				}

-			}

-			checkedElements.addAll(getAllCheckedSubItems(current));

-		}

-

-		return checkedElements;

-	}

-

-	/**

-	 *

-	 *

-	 * @return

-	 *         the result of the dialog :

-	 *         an array of 2 List<ETypeElement> : the first list contains the direct features selected and the second one contains the additional

-	 *         features

-	 */

-	@Override

-	public Object[] getResult() {

-		//overriden only for the documentation of the methods

-		return super.getResult();

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/Constants.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/Constants.java
deleted file mode 100644
index 5889324b8b0..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/Constants.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.menu.handler;

-

-

-//TODO merge with the same class in oep.uml.efacet

-public class Constants {

-

-	

-	private Constants() {

-		//to prevent instanciation

-	}

-	

-	public static final String STEREOTYPE_QUALIFIED_NAME = "stereotypeQualifiedName";

-	public static final String STEREOTYPE_PROPERTY_NAME = "stereotypePropertyName";

-	

-	public static final String ADDITIONAL_CONTENTS_FACET_SET_NAME = "AdditionalContentsForTable";

-

-	public static final String ADDITIONAL_CONTENTS_FACET_SET_NS_URI = "http://www.eclipse.org/papyrustableefacet/additionalcontentsfacetset";

-

-	public static final String ADDITIONAL_CONTENTS_FACET_SET_PREFIX = "additionalcontentsfacetset";

-

-	public static final String ADDITIONAL_CONTENTS_FACET_SET_DOCUMENTATION = "This FacetSet provides facets to edit easily additional contents (as Stereotype Properties). It had been generated by the Papyrus Show/Hide columns";

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/EcoreENamedElementComparator.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/EcoreENamedElementComparator.java
deleted file mode 100644
index 68f74f01e9e..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/EcoreENamedElementComparator.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.menu.handler;

-

-import java.util.Comparator;

-

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

-

-

-public class EcoreENamedElementComparator implements Comparator<ENamedElement> {

-

-	public int compare(final ENamedElement o1, final ENamedElement o2) {

-		return o1.getName().compareToIgnoreCase(o2.getName());

-	}

-

-}
\ No newline at end of file
diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/FacetFactory.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/FacetFactory.java
deleted file mode 100644
index 805eefea3fb..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/FacetFactory.java
+++ /dev/null
@@ -1,352 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.menu.handler;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

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

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

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

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

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.EObjectLiteralQuery;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.OperationCallQuery;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryFactory;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.StringLiteralQuery;

-import org.eclipse.papyrus.uml.efacet.metamodel.umlefacet.ProfileFacetSet;

-import org.eclipse.papyrus.uml.efacet.metamodel.umlefacet.StereotypeFacet;

-import org.eclipse.papyrus.uml.efacet.metamodel.umlefacet.StereotypePropertyFacetAttribute;

-import org.eclipse.papyrus.uml.efacet.metamodel.umlefacet.StereotypePropertyFacetReference;

-import org.eclipse.papyrus.uml.efacet.metamodel.umlefacet.UmlEFacetFactory;

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

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

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

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

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

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

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

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

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

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

-

-public class FacetFactory {

-

-

-	private FacetFactory() {

-		//to prevent instanciation

-	}

-

-	public static final String UML_BOOLEAN = "Boolean";

-

-	public static final String UML_INTEGER = "Integer";

-

-	public static final String UML_STRING = "String";

-

-	public static final String UML_REAL = "Real";

-

-	public static final String UML_UNLIMITED_NATURAL = "UnlimitedNatural";

-

-	public static final FacetSet createFacetSet(final String name, final String nsPrefix, final String nsURI, final String documentation) {

-		final FacetSet set = EFacetFactory.eINSTANCE.createFacetSet();

-		set.setName(name);

-		set.setNsPrefix(nsPrefix);

-		set.setNsURI(nsURI);

-		set.setDocumentation(documentation);

-		return set;

-	}

-

-	/**

-	 * 

-	 * @param profile

-	 * @return

-	 *         the ProfileFacetSet for this profile or <code>null</code> if the profile argument doesn't contains steretoypes with properties

-	 */

-	public static final ProfileFacetSet createProfileFacetSet(final Profile profile) {

-		final ProfileFacetSet set = UmlEFacetFactory.eINSTANCE.createProfileFacetSet();

-		set.setName(profile.getName());

-		set.setProfileQualifiedName(profile.getQualifiedName());

-		profile.getPackagedElements();

-		for(final PackageableElement packagedElement : profile.getPackagedElements()) {

-			if(packagedElement instanceof Profile) {

-				final ProfileFacetSet subProfile = createProfileFacetSet((Profile)packagedElement);

-				//We ignore empty facetSet

-				if(subProfile != null && (subProfile.getEClassifiers().size() != 0 || subProfile.getESubpackages().size() != 0)) {

-					set.getESubpackages().add(subProfile);

-				}

-			} else if(packagedElement instanceof Stereotype) {

-				//TODO and inherited properties

-				//we ignore stereotypes without properties

-				final StereotypeFacet stereotypeFacet = createFacet((Stereotype)packagedElement);

-				if(stereotypeFacet.getFacetElements().size() != 0) {

-					set.getEClassifiers().add(stereotypeFacet);

-				}

-			}

-		}

-

-		//TODO

-		//		set.setNsPrefix(nsPrefix);

-		//		set.setNsURI(nsURI);

-		//		set.setDocumentation(documentation);

-

-		if(set.getEClassifiers().size() != 0 || set.getESubpackages().size() != 0) {

-			return set;

-		}

-		return null;

-

-	}

-

-	public static final StereotypeFacet createFacet(final Stereotype stereotype) {

-		final StereotypeFacet facet = UmlEFacetFactory.eINSTANCE.createStereotypeFacet();

-		facet.setStereotypeQualifiedName(stereotype.getQualifiedName());

-		facet.setName(stereotype.getName());

-		facet.setDocumentation("This facet represents the eClass " + stereotype.getName());

-		//		facet.setConformanceTypedElement(value);//TODO

-		facet.setExtendedMetaclass(UMLPackage.eINSTANCE.getElement());//TODO

-		//TODO and inherited properties?

-		final Collection<String> ignoredPropertyName = new ArrayList<String>();

-

-		final String BASE_ = "base_"; //TODO move it in another plugin!

-		for(final Class tutu : stereotype.getExtendedMetaclasses()) {

-			ignoredPropertyName.add(BASE_ + tutu.getName());

-		}

-		for(final Property attribute : stereotype.getOwnedAttributes()) {

-			if(ignoredPropertyName.contains(attribute.getName())) {

-				continue;

-			}

-			if(attribute.getType() instanceof DataType) {

-				final StereotypePropertyFacetAttribute facetAttr = createFacetAttribute(attribute, stereotype);

-				facet.getFacetElements().add(facetAttr);

-			} else if(attribute.getType() instanceof Element) {//or EObject TODO ?

-				final StereotypePropertyFacetReference facetRef = createFacetReference(attribute, stereotype);

-				facet.getFacetElements().add(facetRef);

-			}

-		}

-

-		//		//We create the query to get the reprensentedStereotype

-		//		final FacetOperation operation = EFacetFactory.eINSTANCE.createFacetOperation();

-		//		operation.setLowerBound(1);

-		//		operation.setUpperBound(1);

-		//		operation.setDocumentation("Returns the qualified name of the represented stereotype");

-		//		operation.setName("getStereotypeQualifiedName");

-		//		//		operation.setEType(); //string

-		//		final StringLiteralQuery query = QueryFactory.eINSTANCE.createStringLiteralQuery();

-		//		query.setValue(stereotype.getQualifiedName());

-		//		operation.setQuery(query);

-		return facet;

-	}

-

-

-

-

-

-	public static final StereotypePropertyFacetReference createFacetReference(final Property attribute2, final Stereotype ste) {

-		final StereotypePropertyFacetReference facetReference = UmlEFacetFactory.eINSTANCE.createStereotypePropertyFacetReference();

-		facetReference.setIsDerived(attribute2.isDerived());

-		facetReference.setPropertyName(attribute2.getName());

-

-		facetReference.setName(attribute2.getName());

-		facetReference.setDocumentation("This Facet Attribute represents the stereotype property " + attribute2.getQualifiedName());

-		facetReference.setChangeable(!attribute2.isDerived());

-		facetReference.setDerived(true);

-		final Type type = attribute2.getType();

-		final EClassifier eType = EcorePackage.eINSTANCE.getEObject(); //TODO or element ?

-		OperationCallQuery query;

-		FacetOperation facetOperationCalled = null;

-		final int upperBound = attribute2.upperBound();

-

-		//UML primitive type

-		if(type instanceof Element) {

-			if(upperBound == -1 || upperBound > 1) {

-				facetOperationCalled = FacetOperationUtils.getEObjectMultiReferenceOperation(attribute2.eResource().getResourceSet());

-			} else {

-				facetOperationCalled = FacetOperationUtils.getEObjectSingleReferenceOperation(attribute2.eResource().getResourceSet());

-			}

-

-			//we prepare the arguments

-			query = QueryFactory.eINSTANCE.createOperationCallQuery();

-			query.setCanHaveSideEffects(false);

-

-			final EObjectLiteralQuery featureQuery = QueryFactory.eINSTANCE.createEObjectLiteralQuery();

-			featureQuery.setElement(facetReference);

-			query.getArguments().add(featureQuery);

-//			final StringLiteralQuery qualifiedNameQuery = QueryFactory.eINSTANCE.createStringLiteralQuery();

-//			qualifiedNameQuery.setValue(ste.getQualifiedName());

-//			query.getArguments().add(qualifiedNameQuery);

-//

-//			final StringLiteralQuery propertyNameQuery = QueryFactory.eINSTANCE.createStringLiteralQuery();

-//			propertyNameQuery.setValue(attribute2.getName());

-//			query.getArguments().add(propertyNameQuery);

-			

-			facetReference.setQuery(query);

-

-			query.setOperation(facetOperationCalled);

-		} else {

-			//TODO?

-		}

-		facetReference.setEType(eType);

-		facetReference.setLowerBound(attribute2.getLower());

-		facetReference.setUpperBound(attribute2.getUpper());

-		return facetReference;

-	}

-

-

-

-	//the first version with the qualifiedName

-	public static final StereotypePropertyFacetAttribute createFacetAttribute(final Property attribute2, final Stereotype ste) {

-		final ResourceSet set = attribute2.eResource().getResourceSet();

-		//		final FacetAttribute facetAttribute = EFacetFactory.eINSTANCE.createFacetAttribute();

-

-		final StereotypePropertyFacetAttribute facetAttribute = UmlEFacetFactory.eINSTANCE.createStereotypePropertyFacetAttribute();

-		facetAttribute.setIsDerived(attribute2.isDerived());

-		facetAttribute.setPropertyName(attribute2.getName());

-

-

-		facetAttribute.setName(attribute2.getName());

-		facetAttribute.setDocumentation("This Facet Attribute represents the stereotype property " + attribute2.getQualifiedName());

-		facetAttribute.setChangeable(!attribute2.isDerived());

-		facetAttribute.setDerived(true);

-		final Type type = attribute2.getType();

-		EClassifier eType = null;

-		OperationCallQuery query;

-		FacetOperation facetOperationCalled = null;

-		final int upperBound = attribute2.upperBound();

-

-		//UML primitive type

-		if(type instanceof PrimitiveType) {

-			final PrimitiveType pType = (PrimitiveType)type;

-			final String name = pType.getName();

-			if(UML_BOOLEAN.equals(name)) {

-				eType = EcorePackage.eINSTANCE.getEBoolean();

-				if(upperBound == -1 || upperBound > 1) {

-					facetOperationCalled = FacetOperationUtils.getBooleanMultiValueOperation(set);

-				} else {

-					facetOperationCalled = FacetOperationUtils.getBooleanSingleValueOperation(set);

-				}

-			} else if(UML_INTEGER.equals(name)) {

-				eType = EcorePackage.eINSTANCE.getEInt();

-				if(upperBound == -1 || upperBound > 1) {

-					facetOperationCalled = FacetOperationUtils.getIntegerMultiValueOperation(set);

-				} else {

-					facetOperationCalled = FacetOperationUtils.getIntegerSingleValueOperation(set);

-				}

-

-			} else if(UML_REAL.equals(name)) {

-				eType = EcorePackage.eINSTANCE.getEDouble();

-				if(upperBound == -1 || upperBound > 1) {

-					facetOperationCalled = FacetOperationUtils.getRealMultiValueOperation(set);

-				} else {

-					facetOperationCalled = FacetOperationUtils.getRealSingleValueOperation(set);

-				}

-

-			} else if(UML_STRING.equals(name)) {

-				eType = EcorePackage.eINSTANCE.getEString();

-				if(upperBound == -1 || upperBound > 1) {

-					facetOperationCalled = FacetOperationUtils.getStringMultiValueOperation(set);

-				} else {

-					facetOperationCalled = FacetOperationUtils.getStringSingleValueOperation(set);

-				}

-

-			} else if(UML_UNLIMITED_NATURAL.equals(name)) {

-				eType = EcorePackage.eINSTANCE.getEInt();

-				if(upperBound == -1 || upperBound > 1) {

-					facetOperationCalled = FacetOperationUtils.getUnlimitedNaturalMultiValueOperation(set);

-				} else {

-					facetOperationCalled = FacetOperationUtils.getUnlimitedNaturalSingleValueOperation(attribute2.eResource().getResourceSet());

-				}

-

-			}

-

-

-			//we prepare the arguments

-			query = QueryFactory.eINSTANCE.createOperationCallQuery();

-			query.setCanHaveSideEffects(false);

-

-			final EObjectLiteralQuery featureQuery = QueryFactory.eINSTANCE.createEObjectLiteralQuery();

-			featureQuery.setElement(facetAttribute);

-			query.getArguments().add(featureQuery);

-			

-//			final StringLiteralQuery qualifiedNameQuery = QueryFactory.eINSTANCE.createStringLiteralQuery();

-//			qualifiedNameQuery.setValue(ste.getQualifiedName());

-//			query.getArguments().add(qualifiedNameQuery);

-//

-//			final StringLiteralQuery propertyNameQuery = QueryFactory.eINSTANCE.createStringLiteralQuery();

-//			propertyNameQuery.setValue(attribute2.getName());

-//			query.getArguments().add(propertyNameQuery);

-			facetAttribute.setQuery(query);

-

-			query.setOperation(facetOperationCalled);

-

-		} else if(type instanceof DataType) {

-			//TODO

-		}

-

-		facetAttribute.setEType(eType);//TODO

-		//		attribute.setQuery(query);////TODO

-		facetAttribute.setLowerBound(attribute2.getLower());

-		facetAttribute.setUpperBound(attribute2.getUpper());

-		return facetAttribute;

-	}

-

-	//	//the second version with references to property and stereitype

-	//	public static final FacetAttribute createFacetAttribute2(Property attribute2, final Stereotype ste) {

-	//		FacetAttribute facetAttribute = EFacetFactory.eINSTANCE.createFacetAttribute();

-	//		facetAttribute.setName(attribute2.getName());

-	//		facetAttribute.setDocumentation("This Facet Attribute represents the stereotype property " + attribute2.getQualifiedName());

-	//		facetAttribute.setChangeable(!attribute2.isDerived());

-	//		facetAttribute.setDerived(true);

-	//		Type type = attribute2.getType();

-	//		EClassifier eType = null;

-	//		OperationCallQuery query;

-	//		FacetOperation facetOperationCalled = null;

-	//		int upperBound = facetAttribute.getUpperBound();

-	//		if(type instanceof PrimitiveType) {

-	//			PrimitiveType pType = (PrimitiveType)type;

-	//			final String name = pType.getName();

-	//			if("EString".equals(name) || "String".equals(name)) {

-	//				eType = EcorePackage.eINSTANCE.getEString();

-	//				if(upperBound > 1) {

-	//					//TODO

-	//				} else {

-	//					facetOperationCalled = getSingleStringValueOperation2(attribute2.eResource().getResourceSet());

-	//				}

-	//			} else if("EBoolean".equals(name)) {

-	//				eType = EcorePackage.eINSTANCE.getEBoolean();

-	//			} else if("EInt".equals(name)) {

-	//				eType = EcorePackage.eINSTANCE.getEInt();

-	//			}

-	//			//else TODO to finish

-	//

-	//

-	//

-	//

-	//

-	//			//we prepare the arguments

-	//			query = QueryFactory.eINSTANCE.createOperationCallQuery();

-	//			query.setCanHaveSideEffects(false);

-	//

-	//			EObjectLiteralQuery qualifiedNameQuery = QueryFactory.eINSTANCE.createEObjectLiteralQuery();

-	//			qualifiedNameQuery.setElement(ste);

-	//			query.getArguments().add(qualifiedNameQuery);

-	//

-	//			EObjectLiteralQuery propertyNameQuery = QueryFactory.eINSTANCE.createEObjectLiteralQuery();

-	//			propertyNameQuery.setElement(attribute2);

-	//			query.getArguments().add(propertyNameQuery);

-	//			facetAttribute.setQuery(query);

-	//

-	//			query.setOperation(facetOperationCalled);

-	//

-	//		}

-	//		facetAttribute.setEType(eType);//TODO

-	//		//		attribute.setQuery(query);////TODO

-	//		facetAttribute.setLowerBound(attribute2.getLower());

-	//		facetAttribute.setUpperBound(attribute2.getUpper());

-	//		return facetAttribute;

-	//	}

-

-	public static final FacetReference createFacetReference() {

-		final FacetReference reference = EFacetFactory.eINSTANCE.createFacetReference();

-		return reference;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/FacetOperationUtils.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/FacetOperationUtils.java
deleted file mode 100644
index c6030c134d4..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/FacetOperationUtils.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.menu.handler;

-

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

-import org.eclipse.emf.facet.efacet.core.IFacetSetCatalogManager;

-import org.eclipse.emf.facet.efacet.core.IFacetSetCatalogManagerFactory;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

-

-

-public class FacetOperationUtils {

-

-	/** the facet providing the operation to edit stereotype properties */

-	private static Facet stereotypedElementFacet;

-

-	private static FacetOperation stringSingleValueOperation;

-

-	private static FacetOperation stringMultiValueOperation;

-

-

-	private static FacetOperation eobjectMultiReferenceOperation;

-

-	private static FacetOperation eobejctMonoReferenceOperation;

-

-	private static FacetOperation booleanSingleValueOperation;

-

-	private static FacetOperation booleanMultiValueOperation;

-

-	private static FacetOperation integerMultiValueOperation;

-

-	private static FacetOperation integerSingleValueOperation;

-

-	private static FacetOperation realSingleValueOperation;

-

-	private static FacetOperation realMultiValueOperation;

-

-	private static FacetOperation unlimitedNaturalSingleValueOperation;

-

-	private static FacetOperation unlimitedNaturalMultiValueOperation;

-

-	private FacetOperationUtils() {

-		//to prevent instanciation

-	}

-

-	public static final Facet getStereotypedElementFacet(final ResourceSet resourceSet) {

-		if(stereotypedElementFacet == null) {

-			IFacetSetCatalogManager manager = IFacetSetCatalogManagerFactory.DEFAULT.getOrCreateFacetSetCatalogManager(resourceSet);

-			for(FacetSet set : manager.getRegisteredFacetSets()) {

-				if("org.eclipse.papyrus.uml.efacet/0.9/UML_stereotype".equals(set.getNsURI())) {

-					stereotypedElementFacet = (Facet)set.getEClassifier("stereotyped_element");

-					break;

-				}

-			}

-		}

-		return stereotypedElementFacet;

-	}

-

-	public static FacetOperation getBooleanMultiValueOperation(final ResourceSet resourceSet) {

-		if(booleanMultiValueOperation == null) {

-			final Facet stereotypedElementFacet = getStereotypedElementFacet(resourceSet);

-			if(stereotypedElementFacet != null)

-				for(final FacetOperation op : stereotypedElementFacet.getFacetOperations()) {

-					if("getBooleanMultiValue".equals(op.getName())) {

-						booleanMultiValueOperation = op;

-						break;

-					}

-				}

-		}

-		return booleanMultiValueOperation;

-	}

-

-

-

-	public static FacetOperation getBooleanSingleValueOperation(final ResourceSet resourceSet) {

-		if(booleanSingleValueOperation == null) {

-			final Facet stereotypedElementFacet = getStereotypedElementFacet(resourceSet);

-			if(stereotypedElementFacet != null)

-				for(final FacetOperation op : stereotypedElementFacet.getFacetOperations()) {

-					if("getBooleanSingleValue".equals(op.getName())) {

-						booleanSingleValueOperation = op;

-						break;

-					}

-				}

-		}

-		return booleanSingleValueOperation;

-	}

-

-

-	public static FacetOperation getEObjectMultiReferenceOperation(final ResourceSet resourceSet) {

-		if(eobjectMultiReferenceOperation == null) {

-			final Facet stereotypedElementFacet = getStereotypedElementFacet(resourceSet);

-			if(stereotypedElementFacet != null)

-				for(final FacetOperation op : stereotypedElementFacet.getFacetOperations()) {

-					if("getEObjectMultiReference".equals(op.getName())) {

-						eobjectMultiReferenceOperation = op;

-						break;

-					}

-				}

-		}

-		return eobjectMultiReferenceOperation;

-	}

-

-	public static FacetOperation getEObjectSingleReferenceOperation(final ResourceSet resourceSet) {

-		if(eobejctMonoReferenceOperation == null) {

-			final Facet stereotypedElementFacet = getStereotypedElementFacet(resourceSet);

-			if(stereotypedElementFacet != null)

-				for(final FacetOperation op : stereotypedElementFacet.getFacetOperations()) {

-					if("getEObjectSingleReference".equals(op.getName())) {

-						eobejctMonoReferenceOperation = op;

-						break;

-					}

-				}

-		}

-		return eobejctMonoReferenceOperation;

-	}

-

-	public static FacetOperation getIntegerMultiValueOperation(final ResourceSet resourceSet) {

-		if(integerMultiValueOperation == null) {

-			final Facet stereotypedElementFacet = getStereotypedElementFacet(resourceSet);

-			if(stereotypedElementFacet != null)

-				for(final FacetOperation op : stereotypedElementFacet.getFacetOperations()) {

-					if("getIntegerMultiValue".equals(op.getName())) {

-						integerMultiValueOperation = op;

-						break;

-					}

-				}

-		}

-		return integerMultiValueOperation;

-	}

-

-	public static FacetOperation getIntegerSingleValueOperation(final ResourceSet resourceSet) {

-		if(integerSingleValueOperation == null) {

-			final Facet stereotypedElementFacet = getStereotypedElementFacet(resourceSet);

-			if(stereotypedElementFacet != null)

-				for(final FacetOperation op : stereotypedElementFacet.getFacetOperations()) {

-					if("getIntegerSingleValue".equals(op.getName())) {

-						integerSingleValueOperation = op;

-						break;

-					}

-				}

-		}

-		return integerSingleValueOperation;

-	}

-

-

-	public static FacetOperation getRealMultiValueOperation(final ResourceSet resourceSet) {

-		if(realMultiValueOperation == null) {

-			final Facet stereotypedElementFacet = getStereotypedElementFacet(resourceSet);

-			if(stereotypedElementFacet != null)

-				for(final FacetOperation op : stereotypedElementFacet.getFacetOperations()) {

-					if("getRealMultiValue".equals(op.getName())) {

-						realMultiValueOperation = op;

-						break;

-					}

-				}

-		}

-		return realMultiValueOperation;

-	}

-

-	public static FacetOperation getRealSingleValueOperation(final ResourceSet resourceSet) {

-		if(realSingleValueOperation == null) {

-			final Facet stereotypedElementFacet = getStereotypedElementFacet(resourceSet);

-			if(stereotypedElementFacet != null)

-				for(final FacetOperation op : stereotypedElementFacet.getFacetOperations()) {

-					if("getRealSingleValue".equals(op.getName())) {

-						realSingleValueOperation = op;

-						break;

-					}

-				}

-		}

-		return realSingleValueOperation;

-	}

-

-	public static FacetOperation getStringMultiValueOperation(final ResourceSet resourceSet) {

-		if(stringMultiValueOperation == null) {

-			final Facet stereotypedElementFacet = getStereotypedElementFacet(resourceSet);

-			if(stereotypedElementFacet != null)

-				for(final FacetOperation op : stereotypedElementFacet.getFacetOperations()) {

-					if("getStringMultiValue".equals(op.getName())) {

-						stringMultiValueOperation = op;

-						break;

-					}

-				}

-		}

-		return stringMultiValueOperation;

-	}

-

-	public static FacetOperation getStringSingleValueOperation(final ResourceSet resourceSet) {

-		if(stringSingleValueOperation == null) {

-			final Facet stereotypedElementFacet = getStereotypedElementFacet(resourceSet);

-			if(stereotypedElementFacet != null)

-				for(final FacetOperation op : stereotypedElementFacet.getFacetOperations()) {

-					if("getStringSingleValue".equals(op.getName())) {

-						stringSingleValueOperation = op;

-						break;

-					}

-				}

-		}

-		return stringSingleValueOperation;

-	}

-

-	public static FacetOperation getUnlimitedNaturalMultiValueOperation(final ResourceSet resourceSet) {

-		if(unlimitedNaturalMultiValueOperation == null) {

-			final Facet stereotypedElementFacet = getStereotypedElementFacet(resourceSet);

-			if(stereotypedElementFacet != null)

-				for(final FacetOperation op : stereotypedElementFacet.getFacetOperations()) {

-					if("getUnlimitedNaturalMultiValue".equals(op.getName())) {

-						unlimitedNaturalMultiValueOperation = op;

-						break;

-					}

-				}

-		}

-		return unlimitedNaturalMultiValueOperation;

-	}

-

-

-	public static FacetOperation getUnlimitedNaturalSingleValueOperation(final ResourceSet resourceSet) {

-		if(unlimitedNaturalSingleValueOperation == null) {

-			final Facet stereotypedElementFacet = getStereotypedElementFacet(resourceSet);

-			if(stereotypedElementFacet != null)

-				for(final FacetOperation op : stereotypedElementFacet.getFacetOperations()) {

-					if("getUnlimitedNaturalSingleValue".equals(op.getName())) {

-						unlimitedNaturalSingleValueOperation = op;

-						break;

-					}

-				}

-		}

-		return unlimitedNaturalSingleValueOperation;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/FilteredCheckboxTree.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/FilteredCheckboxTree.java
deleted file mode 100644
index a5838624ed4..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/FilteredCheckboxTree.java
+++ /dev/null
@@ -1,456 +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 - Duplicated and adapted code from org.eclipse.pde.internal.ui.launcher.FilteredCheckboxTree

- *

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

-

-package org.eclipse.papyrus.infra.table.efacet.menu.handler;

-

-import java.util.*;

-import java.util.List;

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

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

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

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

-import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;

-import org.eclipse.ui.dialogs.FilteredTree;

-import org.eclipse.ui.dialogs.PatternFilter;

-import org.eclipse.ui.progress.WorkbenchJob;

-

-/**

- * A FilteredChecboxTree. This tree stores all the tree elements internally, and keeps the

- * check state in sync. This way, even if an element is filtered, the caller can get and set the

- * checked state.

- * 

- * The internal representation is additive. That is, elements are never removed from the internal

- * representation. This is OK since the PDE launch Dialog never changes the elements once

- * the view is opened. If any other tree is based on this code, they may want to address this issue.

- * 

- * This is not public because it was customized for the Launch Dialog.

- * 

- */

-public class FilteredCheckboxTree extends FilteredTree {

-

-	private WorkbenchJob refreshJob;

-

-	/**

-	 * The FilteredCheckboxTree Constructor.

-	 * 

-	 * @param parent

-	 *        The parent composite where this Tree will be placed.

-	 * @param treeStyle

-	 *        Tree styles

-	 * @param filter

-	 *        The pattern filter that will be used to filter elements

-	 */

-	public FilteredCheckboxTree(Composite parent, int treeStyle, PatternFilter filter) {

-		super(parent, treeStyle, filter, true);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.dialogs.FilteredTree#doCreateTreeViewer(org.eclipse.swt.widgets.Composite, int)

-	 */

-	protected TreeViewer doCreateTreeViewer(Composite parent, int style) {

-		return new FilterableCheckboxTreeViewer(parent, style);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.dialogs.FilteredTree#doCreateRefreshJob()

-	 */

-	protected WorkbenchJob doCreateRefreshJob() {

-		// Since refresh job is private, we have to get a handle to it

-		// when it is created, and store it locally.  

-		// 

-		// See: 218903: [Viewers] support extensibility of the refresh job in FilteredTree

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

-		WorkbenchJob job = super.doCreateRefreshJob();

-		refreshJob = job;

-		return job;

-	}

-

-	/**

-	 * Resets the filter and returns when the refresh is complete

-	 */

-	public void resetFilter() {

-		// Set the next to the initial Text, stop any outstanding jobs

-		// and call the refresh job to run synchronously.

-		getFilterControl().setText(this.initialText);

-		refreshJob.cancel();

-		refreshJob.runInUIThread(new NullProgressMonitor());

-	}

-

-	/**

-	 * Get the number of pixels the tree viewer is from the top of the filtered

-	 * checkbox tree viewer. This is useful if you wish to align buttons with the

-	 * tree.

-	 * 

-	 * @return the offset of the Tree from the top of the container

-	 */

-	int getTreeLocationOffset() {

-		GridLayout layout = (GridLayout)getLayout();

-		return layout.horizontalSpacing + layout.marginTop + ((GridData)getLayoutData()).verticalIndent + getFilterControl().getSize().y + 1;

-	}

-

-	/**

-	 * Classes which implement this interface deal with notifications from the

-	 * filtered checkbox tree viewer. The notifications are fired before a refresh

-	 * happens.

-	 */

-	interface PreRefreshNotifier {

-

-		public void preRefresh(FilterableCheckboxTreeViewer viewer, boolean filtered);

-	}

-

-	/**

-	 * A CheckboxTreeViewer that maintains an internal representation of all the nodes.

-	 * 

-	 */

-	public class FilterableCheckboxTreeViewer extends ContainerCheckedTreeViewer {

-

-		static final String NONE = "none"; //$NON-NLS-1$

-

-		static final String CHECKED = "checked"; //$NON-NLS-1$

-

-		static final String GREYED = "greyed"; //$NON-NLS-1$

-

-		static final String CHECKED_GREYED = "checked_greyed"; //$NON-NLS-1$

-

-		/**

-		 * The internal node for the FilterableCheckboxTreeViewer

-		 */

-		class FilteredCheckboxTreeItem {

-

-			Object data; // Data element

-

-			String state; // Checked State

-

-			List children = new ArrayList();

-

-			public FilteredCheckboxTreeItem(Object data, String state, Map itemCache, FilteredCheckboxTreeItem parent) {

-				this.data = data;

-				this.state = state;

-				itemCache.put(data, this);

-				if(parent != null) {

-					parent.children.add(this);

-				}

-			}

-		}

-

-		/* A cache of all the nodes */

-		Map itemCache = new HashMap();

-

-		/* The preRefresh Listeners */

-		List refreshingListeners = new ArrayList();

-

-		protected void unmapAllElements() {

-			itemCache = new HashMap();

-			super.unmapAllElements();

-		}

-

-		/**

-		 * FilterableCheckboxTreeViewer constructor. This creates the tree part of the filtered tree.

-		 */

-		public FilterableCheckboxTreeViewer(Composite parent, int style) {

-			super(parent, style);

-			addCheckStateListener(new ICheckStateListener() {

-

-				public void checkStateChanged(CheckStateChangedEvent event) {

-					FilteredCheckboxTreeItem item = (FilteredCheckboxTreeItem)itemCache.get(event.getElement());

-					if(item != null) {

-						item.state = event.getChecked() ? CHECKED : NONE;

-					}

-				}

-			});

-		}

-

-		/**

-		 * Allows clients to listen to the tree refresh.

-		 */

-		public void addPreRefreshNotifier(PreRefreshNotifier notifier) {

-			if(refreshingListeners.contains(notifier))

-				return;

-			refreshingListeners.add(notifier);

-		}

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.CheckboxTreeViewer#getChecked(java.lang.Object)

-		 */

-		public boolean getChecked(Object element) {

-			Widget testFindItem = getViewer().testFindItem(element);

-			testFindItem = null;

-			if(testFindItem == null) {

-				if(itemCache.containsKey(element)) {

-					FilteredCheckboxTreeItem item = (FilteredCheckboxTreeItem)itemCache.get(element);

-					if(item.state.equals(CHECKED))

-						return true;

-					if(item.state.equals(CHECKED_GREYED))

-						return true;

-					if(item.state.equals(GREYED))

-						return true;

-					else if(item.state.equals(NONE))

-						return false;

-				}

-			}

-			return super.getChecked(element);

-		}

-

-		public Object[] getCheckedChildren(Object element) {

-			FilteredCheckboxTreeItem item = (FilteredCheckboxTreeItem)itemCache.get(element);

-			List checkedChildren = new ArrayList();

-			if(item != null) {

-				List children = item.children;

-				Iterator iterator = children.iterator();

-				while(iterator.hasNext()) {

-					FilteredCheckboxTreeItem child = (FilteredCheckboxTreeItem)iterator.next();

-					if(child.state == CHECKED) {

-						checkedChildren.add(child.data);

-					}

-				}

-			}

-			return checkedChildren.toArray();

-		}

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.CheckboxTreeViewer#getCheckedElements()

-		 */

-		public Object[] getCheckedElements() {

-			Iterator iterator = itemCache.values().iterator();

-			List checkedElements = new LinkedList();

-			while(iterator.hasNext()) {

-				FilteredCheckboxTreeItem item = (FilteredCheckboxTreeItem)iterator.next();

-				Widget testFindItem = getViewer().testFindItem(item.data);

-				testFindItem = null;

-				if(testFindItem == null) {

-					if(item.state.equals(CHECKED) || item.state.equals(CHECKED_GREYED) || item.state.equals(GREYED)) {

-						checkedElements.add(item.data);

-					}

-				} else {

-					if(((TreeItem)testFindItem).getChecked()) {

-						checkedElements.add(testFindItem.getData());

-					}

-				}

-			}

-			return checkedElements.toArray();

-		}

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.CheckboxTreeViewer#setChecked(java.lang.Object, boolean)

-		 */

-		public boolean setChecked(Object element, boolean state) {

-			if(itemCache.containsKey(element)) {

-				FilteredCheckboxTreeItem item = (FilteredCheckboxTreeItem)itemCache.get(element);

-				item.state = state ? CHECKED : NONE;

-			}

-			return super.setChecked(element, state);

-		}

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.CheckboxTreeViewer#setCheckedElements(java.lang.Object[])

-		 */

-		public void setCheckedElements(Object[] elements) {

-			Set s = new HashSet(itemCache.keySet());

-			s.removeAll(new HashSet(Arrays.asList(elements)));

-			for(int i = 0; i < elements.length; i++) {

-				FilteredCheckboxTreeItem item = (FilteredCheckboxTreeItem)itemCache.get(elements[i]);

-				if(item != null) {

-					item.state = CHECKED;

-				}

-			}

-			for(Iterator iterator = s.iterator(); iterator.hasNext();) {

-				Object object = iterator.next();

-				FilteredCheckboxTreeItem item = (FilteredCheckboxTreeItem)itemCache.get(object);

-				if(item != null) {

-					item.state = NONE;

-				}

-			}

-			super.setCheckedElements(elements);

-		}

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.CheckboxTreeViewer#setSubtreeChecked(java.lang.Object, boolean)

-		 */

-		public boolean setSubtreeChecked(Object element, boolean state) {

-			String newState = state ? CHECKED : NONE;

-			TreeItem item = (TreeItem)testFindItem(element);

-			FilteredCheckboxTreeItem filteredCheckboxTreeItem = (FilteredCheckboxTreeItem)itemCache.get(element);

-			if(item != null && filteredCheckboxTreeItem != null) {

-				filteredCheckboxTreeItem.state = newState;

-				TreeItem[] items = item.getItems();

-				for(int i = 0; i < items.length; i++) {

-					item = items[i];

-					if(item != null) {

-						filteredCheckboxTreeItem = (FilteredCheckboxTreeItem)itemCache.get(item.getData());

-						if(filteredCheckboxTreeItem != null) {

-							filteredCheckboxTreeItem.state = newState;

-						}

-					}

-				}

-			}

-			return super.setSubtreeChecked(element, state);

-		}

-

-		/*

-		 * public boolean setSubtreeChecked(Object element, boolean state) {

-		 * String newState = state ? CHECKED : NONE;

-		 * FilteredCheckboxTreeItem filteredCheckboxTreeItem = (FilteredCheckboxTreeItem) itemCache.get(element);

-		 * if (filteredCheckboxTreeItem != null) {

-		 * filteredCheckboxTreeItem.state = newState;

-		 * List children = filteredCheckboxTreeItem.children;

-		 * for (Iterator iterator = children.iterator(); iterator.hasNext();) {

-		 * FilteredCheckboxTreeItem child = (FilteredCheckboxTreeItem) iterator.next();

-		 * child.state = newState;

-		 * }

-		 * }

-		 * return super.setSubtreeChecked(element, state);

-		 * }

-		 */

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.CheckboxTreeViewer#preservingSelection(java.lang.Runnable)

-		 */

-		protected void preservingSelection(Runnable updateCode) {

-			super.preservingSelection(updateCode);

-

-			// Re-apply the checked state

-			ArrayList allTreeItems = getAllTreeItems(treeViewer.getTree().getItems());

-			for(Iterator iterator = allTreeItems.iterator(); iterator.hasNext();) {

-				TreeItem item = (TreeItem)iterator.next();

-				doApplyCheckedState(item, item.getData());

-			}

-		}

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.AbstractTreeViewer#internalRefresh(java.lang.Object, boolean)

-		 */

-		protected void internalRefresh(Object element, boolean updateLabels) {

-			String text = FilteredCheckboxTree.this.getFilterString();

-			boolean initial = initialText != null && initialText.equals(text);

-			boolean filtered = (text.length() > 0 && !initial);

-

-			// Notify anybody who is listening for the refresh

-			for(Iterator iterator = refreshingListeners.iterator(); iterator.hasNext();) {

-				PreRefreshNotifier notifier = (PreRefreshNotifier)iterator.next();

-				notifier.preRefresh(FilterableCheckboxTreeViewer.this, filtered);

-			}

-			saveCheckedState();

-			super.internalRefresh(element, updateLabels);

-			treeViewer.expandAll();

-		}

-

-		/*

-		 * Set the checked state

-		 */

-		private void doApplyCheckedState(Item item, Object element) {

-			// update the item first

-			super.doUpdateItem(item, element);

-

-			// Update the checked state

-			TreeItem treeItem = (TreeItem)item;

-			if(itemCache.containsKey(element)) {

-				String state = ((FilteredCheckboxTreeItem)itemCache.get(element)).state;

-				if(state.equals(CHECKED_GREYED)) {

-					treeItem.setGrayed(true);

-					treeItem.setChecked(true);

-				} else if(state.equals(CHECKED)) {

-					treeItem.setChecked(true);

-					treeItem.setGrayed(false);

-				} else if(state.equals(GREYED)) {

-					treeItem.setGrayed(true);

-					treeItem.setChecked(false);

-				} else {

-					treeItem.setGrayed(false);

-					treeItem.setChecked(false);

-				}

-			}

-		}

-

-		/*

-		 * A helper method to get all the items in the tree

-		 */

-		private ArrayList getAllTreeItems(TreeItem[] roots) {

-			ArrayList list = new ArrayList();

-			for(int i = 0; i < roots.length; i++) {

-				TreeItem item = roots[i];

-				list.add(item);

-				list.addAll(getAllTreeItems(item.getItems()));

-			}

-			return list;

-		}

-

-		/**

-		 * Saves the checked state of all the elements in the tree

-		 */

-		private void saveCheckedState() {

-			TreeItem[] items = treeViewer.getTree().getItems();

-			for(int i = 0; i < items.length; i++) {

-				TreeItem item = items[i];

-				if(!itemCache.containsKey(item.getData())) {

-					new FilteredCheckboxTreeItem(item.getData(), getItemState(item), itemCache, null);

-				}

-				FilteredCheckboxTreeItem filteredCheckboxTreeItem = (FilteredCheckboxTreeItem)itemCache.get(item.getData());

-				filteredCheckboxTreeItem.state = getItemState(item);

-				saveCheckedState(filteredCheckboxTreeItem, item);

-			}

-		}

-

-		/**

-		 * Saves the checked state of an item and all its children

-		 */

-		private void saveCheckedState(FilteredCheckboxTreeItem parent, TreeItem parentItem) {

-			TreeItem[] items = parentItem.getItems();

-			for(int i = 0; i < items.length; i++) {

-				TreeItem item = items[i];

-				if(!itemCache.containsKey(item.getData())) {

-					new FilteredCheckboxTreeItem(item.getData(), getItemState(item), itemCache, parent);

-				}

-				FilteredCheckboxTreeItem filteredCheckboxTreeItem = (FilteredCheckboxTreeItem)itemCache.get(item.getData());

-				filteredCheckboxTreeItem.state = getItemState(item);

-				saveCheckedState(filteredCheckboxTreeItem, item);

-			}

-		}

-

-		/**

-		 * Computes the checked state from a tree item

-		 */

-		private String getItemState(TreeItem item) {

-			if(item.getChecked() && item.getGrayed()) {

-				return CHECKED_GREYED;

-			} else if(item.getChecked()) {

-				return CHECKED;

-			} else if(item.getGrayed()) {

-				return GREYED;

-			} else {

-				return NONE;

-			}

-		}

-

-	} // end of FilterableCheckboxTreeViewer

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/SelectColumnsHandler.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/SelectColumnsHandler.java
deleted file mode 100644
index 31023fdfb65..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/SelectColumnsHandler.java
+++ /dev/null
@@ -1,752 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.menu.handler;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.ListIterator;

-import java.util.Map;

-import java.util.Set;

-import java.util.SortedSet;

-import java.util.TreeSet;

-

-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.core.runtime.IProgressMonitor;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.facet.efacet.core.IFacetManager;

-import org.eclipse.emf.facet.efacet.core.IFacetManagerFactory;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.EFacetFactory;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.impl.FacetSetImpl;

-import org.eclipse.emf.facet.widgets.celleditors.ICommandFactoriesRegistry;

-import org.eclipse.emf.facet.widgets.celleditors.ICommandFactory;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Column;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.FeatureColumn;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Table;

-import org.eclipse.emf.facet.widgets.table.ui.internal.exported.ITableWidget;

-import org.eclipse.emf.facet.widgets.table.ui.internal.exported.ITableWidgetInternal;

-import org.eclipse.emf.facet.widgets.table.ui.internal.exported.ITableWidgetProvider;

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

-import org.eclipse.emf.transaction.util.TransactionUtil;

-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.gmf.runtime.emf.core.util.CrossReferenceAdapter;

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

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

-import org.eclipse.jface.window.Window;

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

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

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

-import org.eclipse.papyrus.infra.table.efacet.common.editor.AbstractTableEditor;

-import org.eclipse.papyrus.infra.table.efacet.menu.Activator;

-import org.eclipse.papyrus.infra.table.efacet.menu.factory.ITableCommandFactory;

-import org.eclipse.papyrus.infra.table.efacet.menu.factory.TableCommandFactory;

-import org.eclipse.papyrus.infra.table.efacet.menu.factory.TableInstanceCommandFactory;

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.TableContentsUtils;

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

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PlatformUI;

-

-

-//FIXME : uml dependency

-public class SelectColumnsHandler extends AbstractHandler {

-

-

-

-	/** all direct features available in the table */

-	final protected SortedSet<ETypedElement> allDirectFeatures = new TreeSet<ETypedElement>(new EcoreENamedElementComparator());

-

-	/** all additional possible contents */

-	final protected Collection<FacetSet> allAdditionalContents = new HashSet<FacetSet>();

-

-	/** the initial direct features visibles in the table */

-	final protected Collection<ETypedElement> initialDirectFeatureSelected = new HashSet<ETypedElement>();

-

-	/** the initial additional features visibles in the table */

-	final protected Collection<ETypedElement> initialAdditionalFeatureSelected = new HashSet<ETypedElement>();

-

-	/** the list of the facetSet used in the current table */

-	final protected Collection<FacetSet> facetSetsUsedInTheTable = new HashSet<FacetSet>();

-

-	/** the map between existing columns (visible or not) and the feature */

-	final protected Map<ETypedElement, Column> columnsFeatureMap = new HashMap<ETypedElement, Column>();

-

-

-	//TODO remove it

-	final StereotypeManagement management = new StereotypeManagement();

-

-	/**

-	 * clear the fields

-	 */

-	protected void clearFields() {

-		this.allDirectFeatures.clear();

-		this.initialDirectFeatureSelected.clear();

-		this.initialAdditionalFeatureSelected.clear();

-		this.facetSetsUsedInTheTable.clear();

-		this.columnsFeatureMap.clear();

-		this.allAdditionalContents.clear();

-	}

-

-	//TODO look for an existing method in EMF for EPackage

-	private FacetSet getRootFacetSet(final FacetElement facetElement) {

-		EObject container = facetElement;

-		while(container.eContainer() != null) {

-			container = container.eContainer();

-		}

-		if(container instanceof FacetSet) {

-			return (FacetSet)container;

-		}

-		return null;

-	}

-

-	/**

-	 * Inits the fields of this class

-	 * 

-	 * @param widget

-	 *        the table widget

-	 * @param papyrusTable

-	 *        the papyrus table

-	 */

-	protected void initField(final ITableWidget widget, final PapyrusTable papyrusTable) {

-		clearFields();

-		//the contents of the table

-		final List<EObject> contents = TableContentsUtils.getTableContents(papyrusTable, papyrusTable.getTable().getContext(), false);

-

-		//1. Get all direct features

-		for(final EObject current : contents) {

-			this.allDirectFeatures.addAll(current.eClass().getEAllStructuralFeatures());

-		}

-

-		//2. we build the list of the initialSelection

-		final List<Column> visibleColumns = widget.getVisibleColumns(false);

-		final Set<ETypedElement> visibleFeatures = new HashSet<ETypedElement>();

-		for(final Column current : visibleColumns) {

-			if(current instanceof FeatureColumn) {

-				final ETypedElement feature = ((FeatureColumn)current).getFeature();

-				if(feature instanceof FacetElement) {

-					this.initialAdditionalFeatureSelected.add(feature);

-				} else {

-					this.initialDirectFeatureSelected.add(feature);

-				}

-			}

-		}

-

-		for(final Column current : papyrusTable.getTable().getColumns()) {

-			if(current instanceof FeatureColumn) {

-				final FeatureColumn col = (FeatureColumn)current;

-				final ETypedElement feature = col.getFeature();

-				//3. we associate each features to each columns

-				this.columnsFeatureMap.put(feature, col);

-

-				//3 bis. we build the list of the initialSelection

-				if(feature instanceof FacetElement) {

-					final FacetSet set = getRootFacetSet((FacetElement)feature);

-					this.facetSetsUsedInTheTable.add(set);

-				}

-			}

-		}

-

-		//4. get the additional features

-		final FacetSet additionFeatureRootFacetSet = getAdditionalContentsFacetSet(papyrusTable);

-		if(additionFeatureRootFacetSet != null) {

-			//TODO ask for that to Grégoire Dupé!

-			//TODO before update the source code of EMF-Facet

-			final List<EPackage> sets = additionFeatureRootFacetSet.getESubpackages();

-			for(final EPackage ePackage : sets) {

-				if(ePackage instanceof FacetSet) {

-					this.allAdditionalContents.add((FacetSet)ePackage);

-				}

-			}

-		}

-		this.allAdditionalContents.addAll(this.facetSetsUsedInTheTable);

-		this.allAdditionalContents.addAll(this.management.getAdditionalFeatures(papyrusTable, contents, this.facetSetsUsedInTheTable));

-

-	}

-

-	/**

-	 * 

-	 * @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 CompoundCommand compoundCmd = new CompoundCommand("Papyrus Show/Hide columns command");

-		final PapyrusTable papyrusTable = getPapyrusTable();

-		final ITableWidget widget = getTableWidget();

-		final TransactionalEditingDomain domain = getEditingDomain();

-		FacetSet additionFeatureRootFacetSet = getAdditionalContentsFacetSet(papyrusTable);

-		if(papyrusTable != null && widget != null) {

-			initField(widget, papyrusTable);

-			final Collection<ETypedElement> initialSelection = new ArrayList<ETypedElement>();

-			initialSelection.addAll(this.initialDirectFeatureSelected);

-			initialSelection.addAll(this.initialAdditionalFeatureSelected);

-			final Collection<ENamedElement> allFacetSets = new TreeSet<ENamedElement>(new EcoreENamedElementComparator());

-			allFacetSets.addAll(this.facetSetsUsedInTheTable);

-			allFacetSets.addAll(this.allAdditionalContents);

-			FacetSet set = getAdditionalContentsFacetSet(papyrusTable);

-			if(set != null) {

-				allFacetSets.remove(set);

-			}

-			final ColumnsToShowDialog dialog = new ColumnsToShowDialog(Display.getCurrent().getActiveShell(), this.allDirectFeatures, allFacetSets, initialSelection, getLabelProvider(), new SortedColumnContentProvider());

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

-				final Object[] result = dialog.getResult();

-				final Set<ETypedElement> directFeatures = (Set<ETypedElement>)result[0];

-				final Set<ETypedElement> additionalFeatures = (Set<ETypedElement>)result[1];

-				if(!directFeatures.equals(this.initialDirectFeatureSelected)) {

-					//1. get command to show/hide direct features

-					final Command cmd = getShowHideDirectFeatureColumnsCommand(papyrusTable, (ITableWidgetInternal)widget, directFeatures);

-					if(cmd != null) {

-						compoundCmd.append(cmd);

-					}

-				}

-

-				if(!additionalFeatures.equals(initialAdditionalFeatureSelected)) {

-					// 2. get the command to show/hide additional contents

-					final Command cmd2 = getCreateDestroyAdditonalFeatureColumnsCommand(papyrusTable, (ITableWidgetInternal)widget, additionalFeatures);

-					if(cmd2 != null) {

-						compoundCmd.append(cmd2);

-					}

-					//

-					//					//3. get command to store/unstore facets

-					//					final Set<FacetSet> requiredFacetSets = new HashSet<FacetSet>();

-					//					final Set<FacetSet> toAddToResource = new HashSet<FacetSet>();

-					//					final Set<FacetSet> uselessFacetSets = new HashSet<FacetSet>();

-					//					for(final ETypedElement current : additionalFeatures) {

-					//						assert (current instanceof FacetElement);

-					//						final FacetSet root = getRootFacetSet((FacetElement)current);

-					//						assert root != null;

-					//						requiredFacetSets.add(root);

-					//						if(root.eResource() == null) {

-					//							toAddToResource.add(root);

-					//						}

-					//					}

-					//

-					//					if(additionFeatureRootFacetSet != null) {

-					//						for(final EPackage set : additionFeatureRootFacetSet.getESubpackages()) {

-					//							if(set instanceof FacetSet && !requiredFacetSets.contains(set)) {

-					//								uselessFacetSets.add((FacetSet)set);//TODO and if this facetSet is required by another table

-					//							}

-					//						}

-					//					}

-

-					//					//4. add required facetSet to the resource

-					//					if(additionFeatureRootFacetSet == null) {

-					//						//we create the facetset

-					//						additionFeatureRootFacetSet = EFacetFactory.eINSTANCE.createFacetSet();

-					//						additionFeatureRootFacetSet.setName(this.ADDITIONAL_CONTENTS_FACET_SET_NAME);

-					//						additionFeatureRootFacetSet.setNsPrefix(this.ADDITIONAL_CONTENTS_FACET_SET_PREFIX);

-					//						additionFeatureRootFacetSet.setNsURI(this.ADDITIONAL_CONTENTS_FACET_SET_NS_URI);

-					//						additionFeatureRootFacetSet.setDocumentation(this.ADDITIONAL_CONTENTS_FACET_SET_DOCUMENTATION);

-					//						additionFeatureRootFacetSet.getESubpackages().addAll(toAddToResource);

-					//						final FacetSet createdFacetSet = additionFeatureRootFacetSet;

-					//						final ICommand addLocalFacetSetToResource = new AbstractTransactionalCommand(domain, "Add Additional Contents FacetSet to the resource", null) {

-					//

-					//							@Override

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

-					//								papyrusTable.eResource().getContents().add(createdFacetSet);

-					//								return CommandResult.newOKCommandResult();

-					//							}

-					//						};

-					//						compoundCmd.append(new GMFtoEMFCommandWrapper(addLocalFacetSetToResource));

-					//					} else if(toAddToResource != null) {

-					//						final FacetSet localSet = additionFeatureRootFacetSet;

-					//						final ICommand addNewFacetSetToResource = new AbstractTransactionalCommand(domain, "Add Additional Contents FacetSet to the resource", null) {

-					//

-					//							@Override

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

-					//								localSet.getESubpackages().addAll(toAddToResource);

-					//								return CommandResult.newOKCommandResult();

-					//							}

-					//						};

-					//						compoundCmd.append(new GMFtoEMFCommandWrapper(addNewFacetSetToResource));

-					//					}

-

-					//5. remove useless facets set

-					//TODO

-				}

-				if(!compoundCmd.isEmpty()) {

-					domain.getCommandStack().execute(compoundCmd);

-					System.out.println("fait");

-				}

-

-			}

-		}

-		//we clear the fields

-		clearFields();

-		return null;

-	}

-

-	//TODO should be moved in another classes to be used by the stereotypemanager?

-	protected FacetSet getAdditionalContentsFacetSet(final PapyrusTable table) {

-		FacetSet set = null;

-		final Resource resource = table.eResource();

-		final Iterator<EObject> iter = resource.getContents().iterator();

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

-			final EObject current = iter.next();

-			if(current instanceof FacetSet) {

-				final FacetSet tmp = (FacetSet)current;

-				if(Constants.ADDITIONAL_CONTENTS_FACET_SET_NS_URI.equals(tmp.getNsURI())) {

-					set = tmp;

-				}

-			}

-		}

-

-		return set;

-	}

-

-	/**

-	 * 

-	 * @param papyrusTable

-	 *        the papyrus table

-	 * @param widget

-	 *        the widget

-	 * @param selectedFeatures

-	 *        the direct features selected

-	 * @return

-	 *         the command to show/hide the required columns (we doesn't destroy columns, because EMF-Facet will cerate it, if they are required, for

-	 *         the next added element in the table)

-	 */

-	protected Command getShowHideDirectFeatureColumnsCommand(final PapyrusTable papyrusTable, final ITableWidgetInternal widget, final Collection<ETypedElement> selectedFeatures) {

-		final CompoundCommand compoundCmd = new CompoundCommand("Show/Hide direct features command");

-

-		//1. calculus of the columns to show/add

-		final List<ETypedElement> featuresToAdd = new ArrayList<ETypedElement>(selectedFeatures);

-		featuresToAdd.removeAll(this.initialDirectFeatureSelected);

-		//these columns should be set To Visible OR created

-

-		//2. calculus of the columns to hide

-		final List<Object> directFeaturesToHide = new ArrayList<Object>(this.initialDirectFeatureSelected);

-		directFeaturesToHide.removeAll(selectedFeatures);

-

-		//these columns should be hidden

-		final List<Column> columnsToHide = new ArrayList<Column>();

-		for(final Object current : directFeaturesToHide) {

-			final Column toHide = this.columnsFeatureMap.get(current);

-			if(toHide != null) {

-				columnsToHide.add(toHide);

-			}

-		}

-

-		final List<Column> columnsToShow = new ArrayList<Column>();

-

-		//not useful for direct features

-		final List<ETypedElement> columnsToCreate = new ArrayList<ETypedElement>();

-

-		for(final Object currentColumn : featuresToAdd) {

-			if(this.columnsFeatureMap.containsKey(currentColumn)) {

-				columnsToShow.add(this.columnsFeatureMap.get(currentColumn));

-			} else {

-				columnsToCreate.add((ETypedElement)currentColumn);

-			}

-		}

-

-		final TransactionalEditingDomain domain = getEditingDomain();

-		final ITableWidgetInternal widgetController = widget;

-		final ICommandFactory commandFactory = ICommandFactoriesRegistry.INSTANCE.getCommandFactoryFor(domain);

-		final boolean putOnTheTop = false;

-

-		final Command showHideCommand = TableInstanceCommandFactory.createShowHideColumnCommand(widgetController, domain, commandFactory, papyrusTable.getTable(), columnsToShow, columnsToHide, putOnTheTop);

-

-		if(showHideCommand != null && showHideCommand.canExecute()) {

-			compoundCmd.append(showHideCommand);

-		}

-

-		//columns to create should always be null with direct features!

-		assert columnsToCreate.isEmpty();

-		if(!compoundCmd.isEmpty() && compoundCmd.canExecute()) {

-			return compoundCmd;

-		}

-		return null;

-

-	}

-

-	/**

-	 * FIXME : we should provide JUnit tests for this method :

-	 * - when the AddtionalContentsfacetSet is empty -> it should be removed from the resource

-	 * - when the AddtionalContentsfacetSet is not erquired by a table -> it should be remove of the facetSet referenced by the table

-	 * - when a subfacetset is required by any table -> it should be removed of the list of the subfacetset owned by the AddtionalContentsFacetSet

-	 * 

-	 * /!\We assume that the facet used for columns are not used in the same time for others things!

-	 * 

-	 * @param papyrusTable

-	 *        the papyrus table

-	 * @param widget

-	 *        the widget

-	 * @param selectedAdditionalFeatures

-	 *        the addtional features selected

-	 * @return

-	 *         the command to create and destroy the required columns (can be <code>null</code>)

-	 *         /!\ EMF-Facet allows to hide EMF-Facet columns, so if such column already exists but are not visible, we show them

-	 */

-	private Command getCreateDestroyAdditonalFeatureColumnsCommand(final PapyrusTable papyrusTable, final ITableWidgetInternal widget, final Collection<ETypedElement> selectedAdditionalFeatures) {

-		final CompoundCommand compoundCmd = new CompoundCommand("Show/Hide additional features command");

-		final Resource resource = papyrusTable.eResource();

-		final ResourceSet resourceSet = resource.getResourceSet();

-		final TransactionalEditingDomain domain = getEditingDomain();

-		final ITableCommandFactory factory = getTableCmdFactory(domain, resourceSet, papyrusTable.getTable());

-		FacetSet additionFeatureRootFacetSet = getAdditionalContentsFacetSet(papyrusTable);

-

-		//0. determine which current facetset are uszed for columns and which facetset are used for other things

-		final Set<FacetSet> setForOtherThings = new HashSet<FacetSet>(papyrusTable.getTable().getFacetSets());

-		for(final Column current : papyrusTable.getTable().getColumns()) {

-			if(current instanceof FeatureColumn) {

-				ETypedElement element = ((FeatureColumn)current).getFeature();

-				if(element instanceof FacetElement) {

-					setForOtherThings.remove(getRootFacetSet((FacetElement)element));

-				}

-			}

-		}

-

-

-		//1. calculus of the columns to show/add

-		//these columns should be set to visible or created

-		final List<ETypedElement> featuresToAdd = new ArrayList<ETypedElement>(selectedAdditionalFeatures);

-		featuresToAdd.removeAll(this.initialAdditionalFeatureSelected);

-

-		//we should take into account that EMF-Facet allows to destroy AND hide columns, so some columns can already exists but are currently not visible

-		final List<ETypedElement> columnsToCreate = new ArrayList<ETypedElement>();

-		columnsToCreate.addAll(featuresToAdd);

-		final List<Column> existingColumnsToShow = new ArrayList<Column>();

-

-		final ListIterator<ETypedElement> iter = columnsToCreate.listIterator();

-		while(iter.hasNext()) {

-			final ETypedElement current = iter.next();

-			if(this.columnsFeatureMap.containsKey(current)) {

-				existingColumnsToShow.add(this.columnsFeatureMap.get(current));

-				//the current column already exists, so we should not create it

-				iter.remove();

-			}

-		}

-

-		//2. calculus of the columns to hide/destroy

-		final List<ETypedElement> additionalFeaturesToHide = new ArrayList<ETypedElement>(this.initialAdditionalFeatureSelected);

-		additionalFeaturesToHide.removeAll(selectedAdditionalFeatures);

-

-		//3. determine which FacetSet for columns are required by the table

-		final Set<FacetSet> facetSetColumnsUsedInTable = new HashSet<FacetSet>(); //TODO useful?

-

-		//4. determine which subfacetset for additional contents are useful

-		//4bis. determine which subfacet set for additional contents should be added to the additionalcontents facetset

-		final Set<FacetSet> requiredSubFacetSets = new HashSet<FacetSet>();

-		final Set<FacetSet> toAddToResource = new HashSet<FacetSet>();

-		for(final ETypedElement current : selectedAdditionalFeatures) {

-			FacetSet root = getRootFacetSet((FacetElement)current);

-			if(root.eResource() == null) {

-				toAddToResource.add((FacetSet)root);

-				EObject container = current;

-				while(container != null) {

-					if(container instanceof FacetSet) {

-						requiredSubFacetSets.add((FacetSet)container);

-					}

-					container = container.eContainer();

-				}

-			} else if(root == additionFeatureRootFacetSet) {

-				facetSetColumnsUsedInTable.add(additionFeatureRootFacetSet);

-				EObject container = current;

-				while(container != null) {

-					if(container instanceof FacetSet && container != additionFeatureRootFacetSet) {

-						requiredSubFacetSets.add((FacetSet)container);

-					}

-					container = container.eContainer();

-				}

-			} else {

-				facetSetColumnsUsedInTable.add(root);

-			}

-		}

-

-		//5. determine which subfacetset for additional contents are not useful in the current table

-		//5 bis. determine which subfacetset for additional contents are never used in the whole model.

-		final Set<FacetSet> uselessFacetSetsInAllExistingTable = new HashSet<FacetSet>();

-		final Set<FacetSet> uselessFacetSetsInCurrentTable = new HashSet<FacetSet>();

-		if(additionFeatureRootFacetSet != null) {

-			for(final EPackage set : additionFeatureRootFacetSet.getESubpackages()) {

-				if(set instanceof FacetSet && !requiredSubFacetSets.contains(set)) {

-					uselessFacetSetsInCurrentTable.add((FacetSet)set);

-					final TreeIterator<EObject> it = set.eAllContents();

-					boolean useless = true;

-					while(it.hasNext() && useless) {

-						EObject value = it.next();

-						if(value instanceof FacetElement) {

-							ECrossReferenceAdapter eCrossReference = CrossReferenceAdapter.getCrossReferenceAdapter(papyrusTable.eResource().getResourceSet());

-							Collection<Setting> references = eCrossReference.getInverseReferences(value, false);

-							Iterator<Setting> settingIter = references.iterator();

-							while(settingIter.hasNext() && useless) {

-								EObject ref = settingIter.next().getEObject();

-								//TODO check with memory analyzer! because we can found existing columns with no resources and no container

-								if(ref instanceof Column && ref.eContainer() != null && ref.eResource() != null) {

-									useless = papyrusTable.getTable().getColumns().contains(ref);

-								}

-							}

-						}

-					}

-					if(useless) {

-						uselessFacetSetsInAllExistingTable.add((FacetSet)set);

-					}

-				}

-			}

-		}

-

-

-		//6.we calculate the new registered FacetSet for the addition contents facetset

-		final Collection<FacetSet> newRegisteredSubFacetSet = new HashSet<FacetSet>();

-		final Collection<FacetSet> oldSubRegisteredFacetSet = new HashSet<FacetSet>();

-		if(additionFeatureRootFacetSet != null) {

-			//TODO waiting for he patch of 392413: FacetSet metamodel : FacetSet#getFacetSets always return a new list

-			for(final EPackage current : additionFeatureRootFacetSet.getESubpackages()) {

-				if(current instanceof FacetSet) {

-					oldSubRegisteredFacetSet.add((FacetSet)current);

-				}

-			}

-		}

-		newRegisteredSubFacetSet.addAll(oldSubRegisteredFacetSet);

-		newRegisteredSubFacetSet.addAll(toAddToResource);

-		newRegisteredSubFacetSet.removeAll(uselessFacetSetsInAllExistingTable);

-

-

-

-		//7.we calculate the usage of the additional facet set contents in the current table

-		final Collection<FacetSet> usedInCurrentTable = new HashSet<FacetSet>();

-		usedInCurrentTable.addAll(oldSubRegisteredFacetSet);

-		usedInCurrentTable.addAll(toAddToResource);

-		usedInCurrentTable.removeAll(uselessFacetSetsInCurrentTable);

-

-

-		//8.boolean value to know if we can destroy the additional contents facetset

-		boolean destroyAdditionalContentsFacetSet = newRegisteredSubFacetSet.size() == 0 && additionFeatureRootFacetSet != null;

-

-		//9.boolean value to know if we can remove the additional contents FacetSet reference from the current table

-		boolean removeAdditionalContentsFacetSetFromTheCurrentTable = usedInCurrentTable.isEmpty();

-

-

-		//10. the add/remove of the columns itself!

-		//		if(!oldSubRegisteredFacetSet.equals(newRegisteredSubFacetSet)) {

-

-		//11. register the new value for the sub facetset registred by the additional content facetset

-		if(additionFeatureRootFacetSet == null && newRegisteredSubFacetSet.size() != 0) {

-			additionFeatureRootFacetSet = createAdditionalContentsFacetSet();

-			additionFeatureRootFacetSet.getESubpackages().addAll(newRegisteredSubFacetSet);

-			compoundCmd.append(addFacetSetToResourceCommand(domain, resource, additionFeatureRootFacetSet));

-		} else if(additionFeatureRootFacetSet != null && !newRegisteredSubFacetSet.equals(oldSubRegisteredFacetSet)) {

-			final FacetSet localSet = additionFeatureRootFacetSet;

-			final ICommand addNewFacetSetToResource = new AbstractTransactionalCommand(domain, "Set new value for sub facetset Additional Contents", null) {

-

-				@Override

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

-					localSet.getESubpackages().clear();

-					localSet.getESubpackages().addAll(newRegisteredSubFacetSet);

-					return CommandResult.newOKCommandResult();

-				}

-			};

-			compoundCmd.append(new GMFtoEMFCommandWrapper(addNewFacetSetToResource));

-		}

-		//		}

-		if(destroyAdditionalContentsFacetSet) {

-			facetSetColumnsUsedInTable.remove(additionFeatureRootFacetSet);

-		} else {

-			facetSetColumnsUsedInTable.add(additionFeatureRootFacetSet);

-		}

-

-

-		//all facetSet used in the table

-		final Set<FacetSet> allFacetSets = new HashSet<FacetSet>();

-		allFacetSets.addAll(facetSetColumnsUsedInTable);

-		allFacetSets.addAll(setForOtherThings);

-		// get the command to create columns

-		if(columnsToCreate.size() != 0) {

-			final Command createColumns = factory.createAddColumnCommand(columnsToCreate, new ArrayList<FacetSet>(allFacetSets));

-			if(createColumns != null && createColumns.canExecute()) {

-				compoundCmd.append(createColumns);

-			}

-		}

-

-		// get the command to destroy columns (only if the AdditionContentsFacetSet continues to be referenced by the current table. If not, the columns will be automatically destroyed

-		if(additionalFeaturesToHide.size() != 0 && !removeAdditionalContentsFacetSetFromTheCurrentTable) {

-			final Command removeColumns = factory.createRemoveColumnsCommand(additionalFeaturesToHide);

-			if(removeColumns != null && removeColumns.canExecute()) {

-				compoundCmd.append(removeColumns);

-			}

-		}

-		

-		Command setUsedFacetSetCommand = factory.createSetLoadedFacetSetsCommand(new ArrayList<FacetSet>(allFacetSets));

-		if(setUsedFacetSetCommand!=null && setUsedFacetSetCommand.canExecute()){

-			compoundCmd.append(setUsedFacetSetCommand);

-		}

-		

-		final ICommandFactory commandFactory = ICommandFactoriesRegistry.INSTANCE.getCommandFactoryFor(domain);

-

-		//exiting hidden columns are selected to be shown

-		if(existingColumnsToShow.size() != 0) {

-			final Command showHideCommand = TableInstanceCommandFactory.createShowHideColumnCommand(widget, domain, commandFactory, papyrusTable.getTable(), existingColumnsToShow, new ArrayList<Column>(), true);

-			if(showHideCommand != null && showHideCommand.canExecute()) {

-				compoundCmd.append(showHideCommand);

-			}

-		}

-

-		// the additional contents facet set is useless in the current table. , we remove it from the list of the referenced facetset

-		if(removeAdditionalContentsFacetSetFromTheCurrentTable) {

-			final List<FacetSet> set = new ArrayList<FacetSet>(papyrusTable.getTable().getFacetSets());

-			set.remove(additionFeatureRootFacetSet);

-			compoundCmd.append(factory.createSetLoadedFacetSetsCommand(set));

-		}

-

-		// the additional contents facet set is useless in all table, we remove it of the resource

-		if(destroyAdditionalContentsFacetSet) {

-			compoundCmd.append(removeFacetSetToResourceCommand(domain, resource, additionFeatureRootFacetSet));

-		}

-		//		}

-

-		if(!compoundCmd.isEmpty()) {

-			return compoundCmd;

-		}

-		return null;

-	}

-

-	private Command removeFacetSetToResourceCommand(final TransactionalEditingDomain domain, final Resource resource, final FacetSet setToRemove) {

-		final ICommand removeFacetSet = new AbstractTransactionalCommand(domain, "Remove FacetSet from the resource", null) {

-

-			@Override

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

-				resource.getContents().remove(setToRemove);

-				return CommandResult.newOKCommandResult();

-			}

-		};

-		return new GMFtoEMFCommandWrapper(removeFacetSet);

-	}

-

-	private Command addFacetSetToResourceCommand(final TransactionalEditingDomain domain, final Resource resource, final FacetSet setToAdd) {

-		final ICommand removeFacetSet = new AbstractTransactionalCommand(domain, "Add FacetSet from the resource", null) {

-

-			@Override

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

-				resource.getContents().add(setToAdd);

-				return CommandResult.newOKCommandResult();

-			}

-		};

-		return new GMFtoEMFCommandWrapper(removeFacetSet);

-	}

-

-	private FacetSet createAdditionalContentsFacetSet() {

-		final FacetSet additionFeatureRootFacetSet = EFacetFactory.eINSTANCE.createFacetSet();

-		additionFeatureRootFacetSet.setName(Constants.ADDITIONAL_CONTENTS_FACET_SET_NAME);

-		additionFeatureRootFacetSet.setNsPrefix(Constants.ADDITIONAL_CONTENTS_FACET_SET_PREFIX);

-		additionFeatureRootFacetSet.setNsURI(Constants.ADDITIONAL_CONTENTS_FACET_SET_NS_URI);

-		additionFeatureRootFacetSet.setDocumentation(Constants.ADDITIONAL_CONTENTS_FACET_SET_DOCUMENTATION);

-		return additionFeatureRootFacetSet;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the editing domain used by this handler or <code>null</code> if not found

-	 */

-	private TransactionalEditingDomain getEditingDomain() {

-		TransactionalEditingDomain domain = null;

-		domain = TransactionUtil.getEditingDomain(getPapyrusTable());

-		return domain;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the current table editor, or <code>null</code> if not found

-	 */

-	private AbstractTableEditor getCurrentTableEditor() {

-		final IStructuredSelection selection = (IStructuredSelection)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

-		final Object current = selection.getFirstElement();

-		if(current instanceof EObject) {

-

-			IEditorPart part = null;

-			try {

-				part = ServiceUtilsForResource.getInstance().getNestedActiveIEditorPart(((EObject)current).eResource());

-			} catch (final ServiceException e) {

-				Activator.log.error(e);

-			}

-			if(part instanceof AbstractTableEditor) {

-				return (AbstractTableEditor)part;

-			}

-

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the papyrus table

-	 */

-	private PapyrusTable getPapyrusTable() {

-		final IEditorPart part = getCurrentTableEditor();

-		if(part != null) {

-			return (PapyrusTable)part.getAdapter(PapyrusTable.class);

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the table widget

-	 */

-	private ITableWidget getTableWidget() {

-		final IAdaptable editor = getCurrentTableEditor();

-		final ITableWidgetProvider provider = (ITableWidgetProvider)editor.getAdapter(ITableWidgetProvider.class);

-		if(provider != null) {

-			return provider.getTableWidget();

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the label provider by for the dialog

-	 */

-	private ILabelProvider getLabelProvider() {

-		final AdapterFactory factory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-		final ILabelProvider labelProvider = new AdapterFactoryLabelProvider(factory);

-		return labelProvider;

-	}

-

-	/**

-	 * 

-	 * @param editingDomain

-	 *        the editing domain

-	 * @param resourceSet

-	 *        the resource set

-	 * @param table

-	 *        the table

-	 * @return

-	 *         the command factory for these parameters

-	 */

-	//TODO duplicated code from the AbstractTriggerListener

-	private static ITableCommandFactory getTableCmdFactory(final TransactionalEditingDomain editingDomain, final ResourceSet resourceSet, final Table table) {

-		final IFacetManager facetManager = IFacetManagerFactory.DEFAULT.getOrCreateFacetManager(resourceSet);

-		final ICommandFactory commandFactory = ICommandFactoriesRegistry.INSTANCE.getCommandFactoryFor(editingDomain);

-		return new TableCommandFactory(table, editingDomain, commandFactory, facetManager);

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/SortedColumnContentProvider.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/SortedColumnContentProvider.java
deleted file mode 100644
index 1130f7b705d..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/SortedColumnContentProvider.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *   Vincent Lorenzo (CEA-LIST) - bug 337326 - Show/Hide Column : Sort the columns by name

- *   Gregoire Dupe (Mia-Software) - Bug 366804 - [Restructuring] Table widget upgrade

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

-package org.eclipse.papyrus.infra.table.efacet.menu.handler;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-import java.util.TreeSet;

-

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

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

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

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

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

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetElement;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Column;

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

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

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

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

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

-

-/**

- * A Content Provider which allows to sort the provided elements

- *

- *

- *

- */

-public class SortedColumnContentProvider implements ITreeContentProvider {

-

-	/** boolean to know if the returned content should be sorted or not */

-	private boolean isSorted = true;

-

-	/** the initial content */

-	private final List<Column> initialList = new ArrayList<Column>();

-

-	/** the comparator used to sort the element */

-	private Comparator<Column> comparator = null;

-

-	public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput) {

-		if(newInput instanceof List) {

-			for(final Object object : (List<?>)newInput) {

-				if(object instanceof Column) {

-					final Column column = (Column)object;

-					this.initialList.add(column);

-				}

-			}

-		}

-	}

-

-	public void dispose() {

-		// Nothing

-	}

-

-	public Object[] getElements(final Object inputElement) {

-		if(inputElement instanceof Map<?, ?>) {//should be deleted

-			return ((Map)inputElement).keySet().toArray();

-		} else if(inputElement instanceof Collection<?>) {

-			return ((Collection)inputElement).toArray();

-		}

-		return new Object[0];

-	}

-

-	/**

-	 * Setter for {@link #comparator}

-	 *

-	 * @param comparator

-	 *        the comparator used to sort the element

-	 */

-	public void setComparator(final Comparator<Column> comparator) {

-		this.comparator = comparator;

-	}

-

-	/**

-	 * Setter for {@link #isSorted}

-	 *

-	 * @param newValue

-	 *

-	 */

-	public void setIsSorted(final boolean newValue) {

-		this.isSorted = newValue;

-	}

-

-	public Object[] getChildren(final Object parentElement) {

-		if(parentElement instanceof EClass) {

-			return ((EClass)parentElement).getEAllStructuralFeatures().toArray();

-		}

-		if(parentElement instanceof Set<?>) {

-			return ((Set)parentElement).toArray();

-		}

-		if(parentElement instanceof EStructuralFeature) {

-			return new Object[0];

-		} else if(parentElement instanceof Stereotype) {

-			final EList<EStructuralFeature> allRef = ((Stereotype)parentElement).eClass().getEAllStructuralFeatures();

-			final List<Feature> features = new ArrayList(((Stereotype)parentElement).allFeatures());

-			Collections.sort(features, new UMLFeatureComparator());

-			return features.toArray();

-		}

-		if(parentElement instanceof Facet) {

-			return ((Facet)parentElement).getFacetElements().toArray();

-		}

-		if(parentElement instanceof FacetSet) {

-			final FacetSet facetSet = (FacetSet)parentElement;

-			//TODO sort them

-

-			final Set<ENamedElement> subFacetSet = new TreeSet<ENamedElement>(new EcoreENamedElementComparator());

-

-			try {

-				final EList<EPackage> subPackages = facetSet.getESubpackages();

-				subFacetSet.addAll(subPackages);

-

-			} catch (final Exception e) {

-				final EList<EPackage> subPackages = facetSet.getESubpackages();

-				subFacetSet.addAll(subPackages);

-			}

-			final Set<ENamedElement> subFacets = new TreeSet<ENamedElement>(new EcoreENamedElementComparator());

-			subFacets.addAll(((FacetSet)parentElement).getEClassifiers());

-			//

-			final List<ENamedElement> contents = new ArrayList<ENamedElement>();

-			contents.addAll(subFacetSet);

-			contents.addAll(subFacets);

-			return contents.toArray();

-		}

-		return new Object[0];

-	}

-

-	public Object getParent(final Object element) {

-		if(element instanceof Element) {

-			return ((Element)element).eContainer();

-		} else if(element instanceof FacetElement) {

-			return ((FacetElement)element).eContainer();

-		}

-		return null;

-	}

-

-	public boolean hasChildren(final Object element) {

-		//		return true;

-		return getChildren(element).length != 0;

-	}

-

-	public class EcoreFeatureComparator implements Comparator<EStructuralFeature> {

-

-		public int compare(final EStructuralFeature o1, final EStructuralFeature o2) {

-			return o1.getName().compareToIgnoreCase(o2.getName());

-		}

-

-	}

-

-	public class UMLFeatureComparator implements Comparator<Feature> {

-

-		public int compare(final Feature o1, final Feature o2) {

-			return o1.getName().compareToIgnoreCase(o2.getName());

-		}

-

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/StereotypeManagement.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/StereotypeManagement.java
deleted file mode 100644
index 7a8b3443f3b..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.menu/src/org/eclipse/papyrus/infra/table/efacet/menu/handler/StereotypeManagement.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.menu.handler;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

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

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

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

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

-import org.eclipse.papyrus.uml.efacet.metamodel.umlefacet.ProfileFacetSet;

-import org.eclipse.papyrus.uml.efacet.metamodel.umlefacet.StereotypeFacet;

-import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

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

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

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

-

-public class StereotypeManagement {

-

-	public StereotypeManagement() {

-

-	}

-

-

-	public List<FacetSet> getAdditionalFeatures(final PapyrusTable papyrusTable, final Collection<EObject> tableContents, final Collection<FacetSet> existingFacetSets) {

-		final Set<Stereotype> appliedStereotypes = new HashSet<Stereotype>();

-		for(final EObject current : tableContents) {

-			if(current instanceof Element) {

-				appliedStereotypes.addAll(((Element)current).getAppliedStereotypes());

-			}

-		}

-

-		final Set<Profile> usedProfile = new HashSet<Profile>();

-		for(final Stereotype current : appliedStereotypes) {

-			usedProfile.add((Profile)PackageUtil.getRootPackage(current));

-		}

-

-		//TODO provides a way to register facetset representing static profile

-

-		//TODO verify that an existing FacetSet doesn't exist for it

-		final String wantedURI = "http://www.eclipse.org/papyrustableefacet/additionalcontentsfacetset";

-		FacetSet additionalContentsFacetSet = null;

-		lookForFacetSet : for(EObject current : papyrusTable.eResource().getContents()) {

-			if(current instanceof FacetSet) {

-				if(wantedURI.equals(((EPackage)current).getNsURI())) {

-					additionalContentsFacetSet = (FacetSet)current;

-					break lookForFacetSet;

-				}

-			}

-		}

-

-		Map<String, ProfileFacetSet> mapProfileQNameFacetSet = new HashMap<String, ProfileFacetSet>();

-		if(additionalContentsFacetSet != null) {

-			final TreeIterator<EObject> iter = additionalContentsFacetSet.eAllContents();

-

-			while(iter.hasNext()) {

-				final EObject current = iter.next();

-				if(current instanceof ProfileFacetSet) {

-					mapProfileQNameFacetSet.put(((ProfileFacetSet)current).getProfileQualifiedName(), (ProfileFacetSet)current);

-				} else if(current instanceof StereotypeFacet) {

-

-				}

-			}

-		}

-		final List<FacetSet> addtionalFacetSet = new ArrayList<FacetSet>();

-		for(final Profile current : usedProfile) {

-			if(!mapProfileQNameFacetSet.containsKey(current.getQualifiedName())) {

-				ProfileFacetSet set = FacetFactory.createProfileFacetSet(current);

-				if(set != null) {

-					addtionalFacetSet.add(set);

-				}

-			}

-		}

-

-		return addtionalFacetSet;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/.classpath b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/.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/org.eclipse.papyrus.infra.table.efacet.nestededitor/.project b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/.project
deleted file mode 100644
index 51b61d58706..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.table.efacet.nestededitor</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/org.eclipse.papyrus.infra.table.efacet.nestededitor/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/.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/org.eclipse.papyrus.infra.table.efacet.nestededitor/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/META-INF/MANIFEST.MF
deleted file mode 100644
index 900d602a729..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Table Of Nested Editors (Incubation)
-Bundle-SymbolicName: org.eclipse.papyrus.infra.table.efacet.nestededitor;singleton:=true
-Bundle-Version: 0.9.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.infra.table.efacet.nestededitor.Activator
-Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.table.efacet.common;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.table.efacet.metamodel;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.core,
- org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel,
- org.eclipse.emf.facet.util.emf.core,
- org.eclipse.emf.facet.query.java.core,
- org.eclipse.papyrus.infra.emf,
- org.eclipse.papyrus.infra.tools;bundle-version="0.9.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.emf.facet.custom.ui,
- org.eclipse.emf.facet.widgets.table.ui,
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/build.properties b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/build.properties
deleted file mode 100644
index 6f20375d6c7..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/icons/TableOfEditors.gif b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/icons/TableOfEditors.gif
deleted file mode 100644
index 20416f02be0..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/icons/TableOfEditors.gif
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/icons/TableOfEditors.png b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/icons/TableOfEditors.png
deleted file mode 100644
index 3eb64f31e36..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/icons/TableOfEditors.png
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/plugin.xml b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/plugin.xml
deleted file mode 100644
index c2d84fc7a1b..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/plugin.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?eclipse version="3.4"?>

-

-<plugin>

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

-      <editorDiagram factoryClass="org.eclipse.papyrus.infra.table.efacet.nestededitor.factory.NestedEditorTableEditorFactory" icon="icons/TableOfEditors.gif">

-      </editorDiagram>

-   </extension>

-   <extension point="org.eclipse.ui.commands">

-      <command categoryId="org.eclipse.papyrus.editor.category" description="Create a new Nested Editor Table Editor " id="org.eclipse.papyrus.infra.table.efacet.nestededitor.creation" name="Create a new Nested Editor Table Editor ">

-      </command>

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Create a new Nested Editor Table Editor Without Dialog"

-            id="org.eclipse.papyrus.infra.table.efacet.nestededitor.creation.withoutdialog"

-            name="Create a new Nested Editor Table Editor Without Dialog">

-      </command>

-   </extension>

-   <extension point="org.eclipse.ui.handlers">

-      <handler class="org.eclipse.papyrus.infra.table.efacet.nestededitor.handler.CreateNestedEditorTableEditorHandler" commandId="org.eclipse.papyrus.infra.table.efacet.nestededitor.creation">

-         <activeWhen>

-            <or>

-               <with variable="activeEditorId">

-                  <equals value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </or>

-         </activeWhen>

-      </handler>

-      <handler

-            class="org.eclipse.papyrus.infra.table.efacet.nestededitor.handler.CreateNestedEditorTableEditorHandlerWithoutDialog"

-            commandId="org.eclipse.papyrus.infra.table.efacet.nestededitor.creation.withoutdialog">

-         <activeWhen>

-            <or>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </or>

-         </activeWhen>

-      </handler>

-   </extension>

-   <extension id="create.table.menus" name="Create Table Menus" point="org.eclipse.ui.menus">

-      <menuContribution allPopups="false" locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.table.efacet.creation">

-         <command commandId="org.eclipse.papyrus.infra.table.efacet.nestededitor.creation" icon="icons/TableOfEditors.gif" label="Nested Editor Table" mnemonic="&amp;G" style="push" tooltip="Create a new Nested Editor Table">

-            <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.ui.menu.efacet.table.creation">

-         <command

-               commandId="org.eclipse.papyrus.infra.table.efacet.nestededitor.creation"

-               icon="icons/TableOfEditors.gif"

-               label="Nested Editor Table"

-               mnemonic="&amp;G"

-               style="push"

-               tooltip="Create a new Nested Editor Table">

-            <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.toolbar.table.efacet.creation">

-         <command

-               commandId="org.eclipse.papyrus.infra.table.efacet.nestededitor.creation"

-               icon="icons/TableOfEditors.gif"

-               label="Nested Editor Table"

-               mnemonic="&amp;G"

-               style="push"

-               tooltip="Create a new Nested Editor Table">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-   <extension

-         point="org.eclipse.emf.facet.util.emf.core.modeldeclaration">

-      <modeldeclaration

-            file="resources/nestededitor.efacet">

-      </modeldeclaration>

-   </extension>

-
-</plugin>

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/resources/nested_editor_table.papyrustableconfiguration b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/resources/nested_editor_table.papyrustableconfiguration
deleted file mode 100644
index 209ec0719ff..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/resources/nested_editor_table.papyrustableconfiguration
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration:PapyrusTableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet" xmlns:javaQuery="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery" xmlns:org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration="http://www.eclipse.org/Papyrus/PapyrusTableConfiguration/0.9.0/papyrustableconfiguration" fillingMode="QUERIES">

-  <fillingQueries xsi:type="javaQuery:JavaQuery" href="nestededitor.efacet#//NestedEditor/allNestedEditor/@query"/>

-  <tableConfiguration>

-    <defaultColumns xsi:type="efacet:FacetAttribute" href="nestededitor.efacet#//NestedEditor/name"/>

-    <defaultColumns xsi:type="efacet:FacetReference" href="nestededitor.efacet#//NestedEditor/context"/>

-    <defaultColumns xsi:type="efacet:FacetAttribute" href="nestededitor.efacet#//NestedEditor/isOpened"/>

-  </tableConfiguration>

-</org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration:PapyrusTableConfiguration>

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/resources/nestededitor.efacet b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/resources/nestededitor.efacet
deleted file mode 100644
index 7c76769d9a0..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/resources/nestededitor.efacet
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<efacet: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:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet" xmlns:javaQuery="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery" name="nestededitor">

-  <eClassifiers xsi:type="efacet:Facet" name="NestedEditor">

-    <extendedMetaclass href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-    <facetElements xsi:type="efacet:FacetAttribute" name="name" changeable="true" derived="true" documentation="">

-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.infra.table.efacet.nestededitor.query.GetEditorNameQuery"/>

-    </facetElements>

-    <facetElements xsi:type="efacet:FacetReference" name="context" changeable="false" derived="true" documentation="">

-      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-      <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.infra.table.efacet.nestededitor.query.GetEditorContextQuery"/>

-    </facetElements>

-    <facetElements xsi:type="efacet:FacetAttribute" name="isOpened" changeable="false" derived="true" documentation="">

-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-      <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.infra.table.efacet.nestededitor.query.GetOpenEditorStatusQuery"/>

-    </facetElements>

-    <facetElements xsi:type="efacet:FacetReference" name="allNestedEditor" upperBound="-1" changeable="false" derived="true" documentation="">

-      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-      <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.papyrus.infra.table.efacet.nestededitor.query.GetAllNestedEditorsQuery"/>

-    </facetElements>

-  </eClassifiers>

-</efacet:FacetSet>

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/Activator.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/Activator.java
deleted file mode 100644
index afbc92c7b9a..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/Activator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.nestededitor;

-

-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.table.efacet.nestededitor"; //$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/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/editor/HideNewColumnsListener.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/editor/HideNewColumnsListener.java
deleted file mode 100644
index 3ec2e5d9a99..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/editor/HideNewColumnsListener.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.nestededitor.editor;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

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

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

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

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

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

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

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

-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Column;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.FeatureColumn;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Row;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.TableFactory;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.TablePackage;

-import org.eclipse.emf.facet.widgets.table.ui.internal.exported.ITableWidget;

-import org.eclipse.emf.facet.widgets.table.ui.internal.exported.ITableWidgetInternal;

-import org.eclipse.emf.facet.widgets.table.ui.internal.exported.ITableWidgetProvider;

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

-import org.eclipse.emf.validation.internal.modeled.model.validation.Feature;

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

-import org.eclipse.papyrus.infra.table.efacet.common.listener.AbstractTableTriggerListener;

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

-import org.eclipse.papyrus.infra.table.efacet.nestededitor.internal.copy.TableInstanceCommandFactory;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PlatformUI;

-

-

-public class HideNewColumnsListener extends AbstractTableTriggerListener {

-

-	/**

-	 * features already managed

-	 */

-	private Set<ETypedElement> featuresAlreadyManaged = new HashSet<ETypedElement>();

-

-	public HideNewColumnsListener(final PapyrusTable table) {

-		super(table);

-		for(final Column column : table.getTable().getColumns()) {

-			if(column instanceof FeatureColumn) {

-				final ETypedElement element = ((FeatureColumn)column).getFeature();

-				if(element instanceof EStructuralFeature) {

-					featuresAlreadyManaged.add((EStructuralFeature)element);

-				}

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @param notification

-	 * a notification

-	 * @return

-	 * all the features of the object added in the table

-	 */

-	private Set<ETypedElement> getAllFeaturesObject(final Notification notification) {

-		final Set<ETypedElement> newFeatures = new HashSet<ETypedElement>();

-		final Object newValue = notification.getNewValue();

-		if(newValue instanceof Row) {

-			Row row = (Row)newValue;

-			EObject element = row.getElement();

-			Collection<EStructuralFeature> allFeatures = element.eClass().getEAllStructuralFeatures();

-			newFeatures.addAll(allFeatures);

-			newFeatures.removeAll(featuresAlreadyManaged);

-		}

-

-		return newFeatures;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.table.efacet.common.listener.AbstractTableTriggerListener#isManagedNotification(org.eclipse.emf.common.notify.Notification)

-	 *

-	 * @param notification

-	 * @return

-	 */

-	@Override

-	protected boolean isManagedNotification(Notification notification) {

-		if(notification.getEventType() == Notification.ADD && notification.getNotifier() == this.table.getTable() && notification.getFeature() == TableFactory.eINSTANCE.getTablePackage().getTable_Rows()) {

-			Object newValue = notification.getNewValue();

-			if(newValue != null && newValue instanceof Row) {

-				return true;//there is something to do for each new row 

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.table.efacet.common.listener.AbstractTableTriggerListener#getCommandName(org.eclipse.emf.common.notify.Notification)

-	 *

-	 * @param notification

-	 * @return

-	 */

-	@Override

-	protected String getCommandName(Notification notification) {

-		return "Hide new columns command";

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.table.efacet.common.listener.AbstractTableTriggerListener#getSynchronizationCommand(org.eclipse.emf.transaction.TransactionalEditingDomain, org.eclipse.emf.common.notify.Notification)

-	 *

-	 * @param domain

-	 * @param notification

-	 * @return

-	 */

-	@Override

-	protected Command getSynchronizationCommand(final TransactionalEditingDomain domain, final Notification notification) {

-		final Collection<ETypedElement> features = getAllFeaturesObject(notification);

-		if(!features.isEmpty()) {

-			featuresAlreadyManaged.addAll(features);

-			final ITableWidgetInternal widget = getWidget();

-			return TableInstanceCommandFactory.createHideColumnCommand(widget, domain, table.getTable(), features);

-		}

-		return null;

-	}

-

-	/**

-	 * TODO EMF-Facet should provides a best way to hide columns programmatically

-	 * @return

-	 */

-	private ITableWidgetInternal getWidget() {

-		final IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();

-		Assert.isTrue(editor instanceof CoreMultiDiagramEditor);

-		final IEditorPart activeEditor = ((CoreMultiDiagramEditor)editor).getActiveEditor();

-		ITableWidgetProvider provider = (ITableWidgetProvider)activeEditor.getAdapter(ITableWidgetProvider.class);

-		ITableWidget widget = provider.getTableWidget();

-		if(widget instanceof ITableWidgetInternal) {

-			return (ITableWidgetInternal)widget;

-		}

-		return null;

-	}

-

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/editor/NestedEditorTableEditor.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/editor/NestedEditorTableEditor.java
deleted file mode 100644
index 393d9a95db6..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/editor/NestedEditorTableEditor.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.table.efacet.nestededitor.editor;

-

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

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

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

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

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

-import org.eclipse.papyrus.infra.table.efacet.common.editor.AbstractSynchronizedTableEditor;

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

-

-

-public class NestedEditorTableEditor extends AbstractSynchronizedTableEditor {

-

-	/** the type of the editor */

-	public static final String EDITOR_TYPE = "PapyrusNestedEditorTable"; //$NON-NLS-1$

-

-	/** the default name for this table */

-	public static final String DEFAULT_NAME = "NestedEditorTable"; //$NON-NLS-1$

-

-	/**

-	 * This listener allows to hide all new columns

-	 */

-	private TriggerListener hideNewColmumnsListener;

-

-	/**

-	 * @param servicesRegistry

-	 * @param rawModel

-	 * 

-	 */

-	public NestedEditorTableEditor(final ServicesRegistry servicesRegistry, final PapyrusTable rawModel) {

-		super(servicesRegistry, rawModel);

-	}

-

-	/**

-	 * add listeners on the context of the table and on the table itself

-	 */

-	@Override

-	protected void configureEditorEditingDomain() {

-		super.configureEditorEditingDomain();

-		final EditingDomain editingDomain = getEditingDomain();

-		Assert.isTrue(editingDomain instanceof TransactionalEditingDomain);

-

-		this.hideNewColmumnsListener = new HideNewColumnsListener(this.rawModel);

-		((TransactionalEditingDomain)editingDomain).addResourceSetListener(this.hideNewColmumnsListener);

-

-

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-		((TransactionalEditingDomain)getEditingDomain()).removeResourceSetListener(this.hideNewColmumnsListener);

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/factory/NestedEditorTableEditorFactory.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/factory/NestedEditorTableEditorFactory.java
deleted file mode 100644
index 98cee421dfa..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/factory/NestedEditorTableEditorFactory.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.infra.table.efacet.nestededitor.factory;

-

-import org.eclipse.papyrus.infra.table.efacet.common.factory.AbstractTableEditorFactory;

-import org.eclipse.papyrus.infra.table.efacet.nestededitor.editor.NestedEditorTableEditor;

-

-

-/**

- *

- * 

- */

-public class NestedEditorTableEditorFactory extends AbstractTableEditorFactory {

-

-

-	/**

-	 * Constructor.

-	 * 

-	 * @param diagramClass

-	 * @param expectedType

-	 */

-	public NestedEditorTableEditorFactory() {

-		super(NestedEditorTableEditor.class, NestedEditorTableEditor.EDITOR_TYPE);

-	}

-

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/handler/CreateNestedEditorTableEditorHandler.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/handler/CreateNestedEditorTableEditorHandler.java
deleted file mode 100644
index a69b9c6d916..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/handler/CreateNestedEditorTableEditorHandler.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.table.efacet.nestededitor.handler;

-

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

-import org.eclipse.papyrus.infra.table.efacet.common.handlers.AbstractCreateTableEditorHandler;

-import org.eclipse.papyrus.infra.table.efacet.nestededitor.Activator;

-import org.eclipse.papyrus.infra.table.efacet.nestededitor.editor.NestedEditorTableEditor;

-

-public class CreateNestedEditorTableEditorHandler extends AbstractCreateTableEditorHandler {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 */

-	public CreateNestedEditorTableEditorHandler() {

-		super(NestedEditorTableEditor.EDITOR_TYPE, NestedEditorTableEditor.DEFAULT_NAME);

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.table.efacet.common.handlers.AbstractCreateTableEditorHandler#getPapyrusTableConfigurationURI()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected URI getPapyrusTableConfigurationURI() {

-		final String symbolicName = Activator.getDefault().getBundle().getSymbolicName();

-		final URI uri = URI.createPlatformPluginURI(symbolicName + "/resources/nested_editor_table.papyrustableconfiguration", true); //$NON-NLS-1$

-		return uri;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/handler/CreateNestedEditorTableEditorHandlerWithoutDialog.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/handler/CreateNestedEditorTableEditorHandlerWithoutDialog.java
deleted file mode 100644
index 17074b19535..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/handler/CreateNestedEditorTableEditorHandlerWithoutDialog.java
+++ /dev/null
@@ -1,34 +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.table.efacet.nestededitor.handler;

-

-

-

-public class CreateNestedEditorTableEditorHandlerWithoutDialog extends CreateNestedEditorTableEditorHandler {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 */

-	public CreateNestedEditorTableEditorHandlerWithoutDialog() {

-		super();

-	}

-

-

-	@Override

-	protected boolean shouldOpenNameDialog() {

-		return false;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/internal/copy/CustomizationUtils.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/internal/copy/CustomizationUtils.java
deleted file mode 100644
index 9d88cfbf75c..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/internal/copy/CustomizationUtils.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2012 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:

- *    Gregoire Dupe (Mia-Software) - Bug 367700 - [Unit Test Failure][0.2/3.8] org.eclipse.emf.facet.widgets.table.tests.internal.v0_2.swtbot.NatTableUITests.testOpenLoadCustomizationDialog

- *    Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

- *    Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning

- *    Gregoire Dupe (Mia-Software) - Bug 375087 - [Table] ITableWidget.addColumn(List<ETypedElement>, List<FacetSet>)

- *    Gregoire Dupe (Mia-Software) - Bug 376576 - [EFacet] Change the multiplicity of Facet::extendedFacet

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

-package org.eclipse.papyrus.infra.table.efacet.nestededitor.internal.copy;

-

-import java.util.Collection;

-

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

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

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

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

-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.FacetCustomization;

-import org.eclipse.emf.facet.efacet.core.FacetUtils;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

-

-//TODO duplicated and adapted code from EMF-Facet

-//EMF-Facet should provides a best way to hide columns

-public final class CustomizationUtils {

-

-	private CustomizationUtils() {

-		// Must not be used.

-	}

-

-	/** @return the {@link Facet}s customized by the given customizations. */

-	public static Set<FacetSet> findFacetsCustomizedBy(final List<Customization> customizations) {

-		final Set<FacetSet> referencedFS = new HashSet<FacetSet>();

-		for(Customization customization : customizations) {

-			for(EClassifier eClassifier : customization.getEClassifiers()) {

-				if(eClassifier instanceof FacetCustomization) {

-					final FacetCustomization facetCustom = (FacetCustomization)eClassifier;

-					for(Facet extFacet : facetCustom.getExtendedFacets()) {

-						referencedFS.add((FacetSet)extFacet.getEPackage());

-					}

-				}

-			}

-		}

-		return referencedFS;

-	}

-

-	/** Returns the first customization among the given list of customizations that extends the given EPackage. */

-	public static Customization findCustomizationExtendingEPackage(final List<Customization> customizations, final EPackage ePackage) {

-		if(ePackage == null) {

-			throw new IllegalArgumentException("ePackage must not be null"); //$NON-NLS-1$

-		}

-		Customization result = null;

-		for(Customization customization : customizations) {

-			if(customization != null && ePackage.equals(FacetUtils.getExtendedEPackage(customization))) {

-				result = customization;

-				break;

-			}

-		}

-		return result;

-	}

-

-	/** Returns the first {@link Facet} among the given list of facets that extends the given EClass. */

-	public static Facet findFacetByExtendedMetaclass(final Collection<Facet> facets, final EClass extendedMetaClass) {

-		Facet result = null;

-		for(Facet facet : facets) {

-			Facet candidate = facet;

-			if(candidate.getExtendedMetaclass() == extendedMetaClass) {

-				result = candidate;

-				break;

-			}

-		}

-		return result;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/internal/copy/TableInstanceCommandFactory.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/internal/copy/TableInstanceCommandFactory.java
deleted file mode 100644
index 12842edd2ef..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/internal/copy/TableInstanceCommandFactory.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010, 2011, 2012 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 Bros (Mia-Software) - Bug 332437 - NatTable : pluggable cell editors

- *    Nicolas Guyomar (Mia-Software) - Bug 331442 - To be able to add and remove lines (model elements) from the table

- *    Nicolas Bros (Mia-Software) - Bug 332226 - To be able to create or delete model element from the table

- *    Nicolas Guyomar (Mia-Software) - Bug 332226 - To be able to create or delete model element from the table

- *    Nicolas Bros (Mia-Software) - Bug 332438 - NatTable : table type

- *    Nicolas Bros (Mia-Software) - Bug 332440 - NatTable : force cell editors

- *    Nicolas Bros (Mia-Software) - Bug 331675 - NatTable : copy cells as text 

- *    Nicolas Bros (Mia-Software) - Bug 331900 - customizable NatTable

- *    Nicolas Bros (Mia-Software) - Bug 332010 - view Facet customizations on NatTable

- *    Nicolas Bros (Mia-Software) - Bug 332215 - customizable NatTable column headers

- *    Nicolas Guyomar (Mia-Software) - Bug 332215 - customizable NatTable column headers

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

- *    Nicolas Guyomar (Mia-Software) - Bug 332998 - To be able to add a column and fill it with the result of a query

- *    Gregoire Dupe (Mia-Software) - Bug 332998 - To be able to add a column and fill it with the result of a query

- *    Gregoire Dupe (Mia-Software) - Bug 333015 - To be able to hide columns

- *    Nicolas Guyomar (Mia-Software) - Bug 333015 - To be able to hide columns

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

- *    Nicolas Guyomar (Mia-Software) - Bug 333414 - The user must be able to save the column order

- *    Nicolas Guyomar (Mia-Software) - Bug 335154 - Sort Column By Type : Cannot modify resource set without a write transaction

- *    Nicolas Guyomar (Mia-Software) - Bug 335155 - Hide Empty Column : Cannot modify resource set without a write transaction

- *    Nicolas Guyomar (Mia-Software) - Bug 335156 - Only Show Common column : Cannot modify resource set without a write transaction

- *    Nicolas Guyomar (Mia-Software) - Bug 335020 - Nattable widget should use the Eclipse framework

- *    Nicolas Guyomar (Mia-Software) - Bug 337322 - [TableConfiguration] Customization declared in the file tableconfiguration is not loaded

- *    Nicolas Guyomar (Mia-Software) - Bug 338536 - Problem with the refresh of the table : the scrollbar returns to this initial position

- *    Nicolas Bros (Mia-Software) - Bug 338536 - Problem with the refresh of the table : the scrollbar returns to this initial position

- *    Nicolas Guyomar (Mia-Software) - Bug 337454 - We can't delete a query Column

- *    Nicolas Guyomar (Mia-Software) - Bug 337395 - Unused columns should be destroyed

- *    Nicolas Guyomar (Mia-Software) - Bug 339554 - org.eclipse.emf.facet.widgets.celleditors API cleaning

- *    Nicolas Guyomar (Mia-Software) - Bug 339922 - INatTableWidget method isCellSelected should use the plural

- *    Nicolas Guyomar (Mia-Software) - Bug 340681 - Facet column implementation

- *    Vincent Lorenzo (CEA-LIST) - Bug 337326 - Show/Hide Column : Sort the columns by name 

- *    Nicolas Guyomar (Mia-Software) - Bug 340940 - To be able to view facet attributes and facet references in a table

- *    Vincent Lorenzo (CEA-LIST) - Bug 337408 - Add an action to sort columns by name 

- *    Nicolas Guyomar (Mia-Software) - Bug 336482 - KeyBinding to edit element in Table : F2 

- *    Vincent Lorenzo (CEA-LIST) - Bug 341238 - We need to be able to specify which column have to be hidden/visible using the customization mechanism

- *    Gregoire Dupe (Mia-Software) - Bug 341238 - We need to be able to specify which column have to be hidden/visible using the customization mechanism

- *    Nicolas Guyomar (Mia-Software) - Bug 342451 - To be able to edit derived facet attributes and derived facet references in a table

- *    Vincent Lorenzo (CEA-LIST) - Bug 341238 - We need to be able to specify which column have to be hidden/visible using the customization mechanism

- *    Nicolas Guyomar (Mia-Software) - Bug 343411 - [Table] Create new elements does not support IJavaModelQuery anymore

- *    Gregoire Dupe (Mia-Software) - Bug 343811 - EMF Facet Regression : Created elements in a table are not serialized

- *    Vincent Lorenzo (CEA-LIST) - Bug 344125 - The API should provide a method selectRows(List<EObject> elementsToSelect)

- *    Nicolas Guyomar (Mia-Software) - Bug 344274 - SWT BOT fail on Hudson

- *    Nicolas Guyomar (Mia-Software) - Bug 344475 - To be able to select a cell by EStructuralFeature in the table

- *    Nicolas Guyomar (Mia-Software) - Bug 342028 - Field can be edited even if they are marked as N/A

- *    Nicolas Guyomar (Mia-Software) - Bug 344413 - Facet Columns are never created when we begin with an empty table

- *    Gregoire Dupe (Mia-Software) - Bug 343859 - The local customizations are not applied when we reopen a table

- *    Nicolas Guyomar (Mia-Software) - Bug 344670 - Problems with the columns creation : very slow + scrollbar blinked

- *    Vincent Lorenzo (CEA LIST) - Bug 341238 - We need to be able to specify which column have to be hidden/visible using the customization mechanism

- *    Nicolas Guyomar (Mia-Software) - Bug 344925 - Undo/Redo after the action Show Columns

- *    Gregoire Dupe (Mia-Software) - Bug 344925 - Undo/Redo after the action Show Columns - Regression fix

- *    Nicolas Guyomar (Mia-Software) - Bug 345665 - Columns are duplicated when you drop many elements in the same time

- *    Nicolas Guyomar (Mia-Software) - Bug 346465 - [EMF Facet Table] Remove line does not remove obsolete column

- *    Gregoire Dupe (Mia-Software) - Bug 345730 - Deleting an element in the model breaks the table

- *    Gregoire Dupe (Mia-Software) - Bug 354224 - mutually exclusive Facets

- *    Grégoire Dupé (Mia-Software) - Bug 356795 - [Unit Test Failure][0.2/4.2][0.2/3.8] org.eclipse.emf.facet.widgets.nattable.tests.Bug344413Test.testBug344413

- *    Gregoire Dupe (Mia-Software) - Bug 366804 - [Restructuring] Table widget upgrade

- *    Gregoire Dupe (Mia-Software) - Bug 367613 - Table widget refactoring

- *    Gregoire Dupe (Mia-Software) - Bug 367700 - [Unit Test Failure][0.2/3.8] org.eclipse.emf.facet.widgets.table.tests.internal.v0_2.swtbot.NatTableUITests.testOpenLoadCustomizationDialog

- *    Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

- *    Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning

- *    Gregoire Dupe (Mia-Software) - Bug 375087 - [Table] ITableWidget.addColumn(List<ETypedElement>, List<FacetSet>)

- *    Gregoire Dupe (Mia-Software) - Bug 372626 - Aggregates

- *    Gregoire Dupe (Mia-Software) - Bug 376158 - [Table] Unexpected columns when customizations are loaded

- *    Nicolas Bros (Mia-Software) - Bug 378475 - unit test failures after table refactoring

- *    Olivier Remaud (Soft-Maint) - Bug 378499 - optimizing table opening

- *    Gregoire Dupe (Mia-Software) - Bug 387008 - [Table] Papyrus needs methods provided by TableInstanceCommandFactory

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

-package org.eclipse.papyrus.infra.table.efacet.nestededitor.internal.copy;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-

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

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

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

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

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

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

-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization;

-import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.EClassCustomization;

-import org.eclipse.emf.facet.custom.ui.internal.exported.ICustomizationCommandFactory;

-import org.eclipse.emf.facet.custom.ui.internal.exported.ICustomizationCommandFactoryFactory;

-import org.eclipse.emf.facet.efacet.core.FacetUtils;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.IsOneOfQuery;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryFactory;

-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.QueryPackage;

-import org.eclipse.emf.facet.util.emf.core.command.ICommandFactoryResult;

-import org.eclipse.emf.facet.util.emf.core.command.ICommandFactoryResultFactory;

-import org.eclipse.emf.facet.widgets.celleditors.ICommandFactoriesRegistry;

-import org.eclipse.emf.facet.widgets.celleditors.ICommandFactory;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.FeatureColumn;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Table;

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.TablePackage;

-import org.eclipse.emf.facet.widgets.table.ui.internal.exported.ITableWidgetInternal;

-

-//TODO duplicated and adapted code from EMF-Facet

-//EMF-Facet should provides a best way to hide columns

-public final class TableInstanceCommandFactory {

-

-

-	/**

-	 * 

-	 * @param column

-	 *        a column

-	 * @param isHidden

-	 *        the new feature value for this column

-	 * @param customizedFeatureName

-	 *        the customized feature name

-	 * @return

-	 */

-	public static Command createHideColumnCommand(final ITableWidgetInternal widgetController, final EditingDomain domain, final Table table, final Collection<ETypedElement> featuresToHide) {

-		final FacetOperation isVisibleProperty = widgetController.getCustomPropertiesHandler().getIsVisible();

-		final CompoundCommand resultCmd = new CompoundCommand("Show/hide column"); //$NON-NLS-1$

-		final EditingDomain editingDomain = domain;

-		final ICommandFactory commandFactory = ICommandFactoriesRegistry.INSTANCE.getCommandFactoryFor(editingDomain);

-		//		final EStructuralFeature featureOfTheColumn = featureColumn

-		//				.getFeature();

-		//		EObject packageLevel = featureOfTheColumn.eContainer().eContainer();

-		//		if (!(packageLevel instanceof EPackage)) {

-		//			throw new IllegalStateException(

-		//					"Unexpected feature container type " + packageLevel + " found. (EPackage is execpected)"); //$NON-NLS-1$ //$NON-NLS-2$

-		//		}

-		//		final EPackage customizedEPackage = (EPackage) packageLevel;

-		// 1 we look for the corresponding customization

-		final List<Customization> localCustomizations = table.getLocalCustomizations();

-		Customization customization = null;

-		if(!localCustomizations.isEmpty()) {

-			customization = localCustomizations.get(0);

-		}

-		final ICustomizationCommandFactory customCmdFactory = ICustomizationCommandFactoryFactory.DEFAULT.createCustomizationCommandFactory(editingDomain, commandFactory);

-		// If the wanted customization does not exist then we create it.

-		if(customization == null) {

-			//			final TableCommandFactory factory = new TableCommandFactory(table, domain, commandFactory, null);

-			final ICommandFactoryResult<Customization> cmdFactoryResult = createCreateLocalCustom(editingDomain, commandFactory, table, EcorePackage.eINSTANCE);

-			customization = cmdFactoryResult.getResult();

-			resultCmd.append(cmdFactoryResult.getCommand());

-		}

-		Facet typeCustomization = CustomizationUtils.findFacetByExtendedMetaclass(FacetUtils.getFacets(customization), EcorePackage.eINSTANCE.getETypedElement());

-		IsOneOfQuery conformanceQuery;

-		if(typeCustomization == null) {

-			conformanceQuery = QueryFactory.eINSTANCE.createIsOneOfQuery();

-			ICommandFactoryResult<EClassCustomization> createEClassCustom = customCmdFactory.createEClassCustomization(customization, EcorePackage.eINSTANCE.getETypedElement(), conformanceQuery);

-			typeCustomization = createEClassCustom.getResult();

-			resultCmd.append(createEClassCustom.getCommand());

-		} else {

-			if(!(typeCustomization instanceof EClassCustomization)) {

-				//				throw new TableWidgetRuntimeException("Unexpected type for the variable 'featureContainer'"); //$NON-NLS-1$

-				//TODO

-			}

-			DerivedTypedElement conformanceTE = (DerivedTypedElement)typeCustomization.getConformanceTypedElement();

-			conformanceQuery = (IsOneOfQuery)conformanceTE.getQuery();

-		}

-//		final HashSet<ETypedElement> featuresToHide = new HashSet<ETypedElement>();

-//		for(FeatureColumn column : featureColumns) {

-//			featuresToHide.add(column.getFeature());

-//		}

-		final Command initQuery = commandFactory.createSetCommand(editingDomain, conformanceQuery, QueryPackage.eINSTANCE.getIsOneOfQuery_ExpectedEObjects(), new ArrayList<ETypedElement>(featuresToHide));

-		resultCmd.append(initQuery);

-		final Query query = QueryFactory.eINSTANCE.createFalseLiteralQuery();

-		final ICommandFactoryResult<Facet> propConfigCmd = customCmdFactory.setPropertyConfig(typeCustomization, null, isVisibleProperty, query);

-		resultCmd.append(propConfigCmd.getCommand());

-		return resultCmd;

-	}

-

-	private TableInstanceCommandFactory() {

-		// Prevents instantiation

-	}

-

-

-	public static ICommandFactoryResult<Customization> createCreateLocalCustom(final EditingDomain editingDomain, final ICommandFactory commandFactory, final Table table, final EPackage ePackage) {

-		final ICustomizationCommandFactory customCmdFactory = ICustomizationCommandFactoryFactory.DEFAULT.createCustomizationCommandFactory(editingDomain, commandFactory);

-		final List<Command> cmdList = new CommandList();

-		final ICommandFactoryResult<Customization> cmdFactoryResult = customCmdFactory.createCustomization("Column hiding customization for " //$NON-NLS-1$

-			+ ePackage.getName());

-		final Customization customization = cmdFactoryResult.getResult();

-		cmdList.add(cmdFactoryResult.getCommand());

-		final Command addToLocalCmd = commandFactory.createAddCommand(editingDomain, table, TablePackage.eINSTANCE.getTable_LocalCustomizations(), customization);

-		cmdList.add(addToLocalCmd);

-		final Command addAllCmd = commandFactory.createAddCommand(editingDomain, table, TablePackage.eINSTANCE.getTable_Customizations(), customization);

-		cmdList.add(addAllCmd);

-		final Command cmd = createResult(cmdList, "Create a local custom."); //$NON-NLS-1$

-		return ICommandFactoryResultFactory.DEFAULT.createCommandFactoryResult(cmd, customization);

-

-	}

-

-	private static Command createResult(final List<Command> commandList, final String label) {

-		Command result = null;

-		while(commandList.contains(null)) {

-			commandList.remove(null);

-		}

-		if(!commandList.isEmpty()) {

-			result = new CompoundCommand(label, commandList);

-		}

-		return result;

-	}

-

-

-

-	//	/**

-	//	 * This method retruns an EMF command deleting the a collection of EObject

-	//	 * 

-	//	 * @param label

-	//	 *        This label will be visible in the menu 'Edit'.

-	//	 * @param eObjects

-	//	 * @param controller

-	//	 * @return

-	//	 */

-	//	public static Command delete(final String label, final Collection<? extends EObject> eObjects, final TableWidgetController controller) {

-	//		List<Command> cmdList = new ArrayList<Command>();

-	//		for(EObject eObject : eObjects) {

-	//			Command command = controller.getCommandFactory().createDeleteCommand(controller.getEditingDomain(), eObject);

-	//			cmdList.add(command);

-	//		}

-	//		Command result = null;

-	//		if(!cmdList.isEmpty()) {

-	//			result = new CompoundCommand(label, cmdList);

-	//		}

-	//		return result;

-	//	}

-	//

-	//	/**

-	//	 * This method create a command deleting use less row and columns.

-	//	 * 

-	//	 * @param controller

-	//	 * @return null if no action has to be performed.

-	//	 */

-	//	public static final Command createRemoveUselessRowsAndColumnsCommand(final TableWidgetController controller) {

-	//		List<Command> cmdList = new ArrayList<Command>();

-	//		List<Row> rowsToRemove = TableInstanceUtils.findUselessRow(controller.getTable());

-	//		if(TableWidgetController.DEBUG_REMOVE_USELESS_ROWS_AND_COLUMNS) {

-	//			DebugUtils.debug("Rows to be removed: " + rowsToRemove.size()); //$NON-NLS-1$

-	//		}

-	//		final Command deleteRows = TableInstanceCommandFactory.delete(Messages.TableWidgetController_DeleteUselessRows, rowsToRemove, controller);

-	//		if(deleteRows != null) {

-	//			cmdList.add(deleteRows);

-	//		}

-	//		final TableCommandFactory tableCmdFactory = new TableCommandFactory(controller.getTable(), controller.getEditingDomain(), controller.getCommandFactory(), null);

-	//		final Command removeColumnCommand = tableCmdFactory.createRemoveUselessColumnsCommand(rowsToRemove, null);

-	//		if(removeColumnCommand != null) {

-	//			if(!removeColumnCommand.canExecute()) {

-	//				throw new TableWidgetRuntimeException("Command cannot be executed"); //$NON-NLS-1$

-	//			}

-	//			cmdList.add(removeColumnCommand);

-	//		}

-	//		CompoundCommand command = null;

-	//		if(!cmdList.isEmpty()) {

-	//			command = new CompoundCommand(Messages.TableWidgetController_RemoveUselessRowsAndColumns, cmdList);

-	//		}

-	//		return command;

-	//	}

-	private static class CommandList extends LinkedList<Command> {

-

-		/**

-		 * 

-		 */

-		private static final long serialVersionUID = 4393120485370832319L;

-

-		@Override

-		public boolean add(final Command command) {

-			boolean result;

-			if(command == null) {

-				result = false;

-			} else {

-				result = super.add(command);

-			}

-			return result;

-		}

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/AbstractNestedEditorQuery.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/AbstractNestedEditorQuery.java
deleted file mode 100644
index 2351ba3e2bb..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/AbstractNestedEditorQuery.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.nestededitor.query;

-

-import java.util.Collections;

-

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

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

-import org.eclipse.emf.facet.query.java.core.IJavaQuery2;

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

-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.emf.utils.ServiceUtilsForResource;

-import org.eclipse.papyrus.infra.table.efacet.nestededitor.Activator;

-

-

-public abstract class AbstractNestedEditorQuery<T2> implements IJavaQuery2<EObject, T2> {

-

-	protected ServicesRegistry getServiceRegistry(final EObject object) {

-		ServicesRegistry serviceRegistry = null;

-		final Resource res = object.eResource();

-		if(res != null) {

-			try {

-				serviceRegistry = ServiceUtilsForResource.getInstance().getServiceRegistry(res);

-			} catch (ServiceException e) {

-				Activator.log.error("Service Registry not found!", e);

-			}

-		}

-		return serviceRegistry;

-	}

-

-	protected IPageMngr getPageMngr(final EObject object) {

-		IPageMngr pageManager = null;

-		final ServicesRegistry serviceRegistry = getServiceRegistry(object);

-

-		if(serviceRegistry != null) {

-			try {

-				pageManager = ServiceUtils.getInstance().getIPageMngr(serviceRegistry);

-			} catch (ServiceException e) {

-				Activator.log.error("PageManager not found", e);

-			}

-		}

-		return pageManager;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/GetAllNestedEditorsQuery.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/GetAllNestedEditorsQuery.java
deleted file mode 100644
index 1077a7ddf5e..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/GetAllNestedEditorsQuery.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.nestededitor.query;

-

-import java.util.Collections;

-import java.util.List;

-

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

-import org.eclipse.emf.facet.efacet.core.IFacetManager;

-import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;

-import org.eclipse.emf.facet.query.java.core.IParameterValueList2;

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

-

-public class GetAllNestedEditorsQuery extends AbstractNestedEditorQuery<Object> {

-

-	public List<Object> evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {

-		IPageMngr pageMngr = getPageMngr(source);

-		if(pageMngr != null) {

-			return pageMngr.allPages();

-		}

-		return Collections.emptyList();

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/GetEditorContextQuery.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/GetEditorContextQuery.java
deleted file mode 100644
index a24c6d60e19..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/GetEditorContextQuery.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.nestededitor.query;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

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

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

-import org.eclipse.emf.facet.efacet.core.IFacetManager;

-import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;

-import org.eclipse.emf.facet.query.java.core.IParameterValueList2;

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

-

-

-public class GetEditorContextQuery extends AbstractNestedEditorQuery<EObject> {

-

-	private static List<String> possibleContextFieldName = null;

-

-	public EObject evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {

-		EObject context = null;

-		if(source instanceof PapyrusTable) {

-			context = ((PapyrusTable)source).getTable().getContext();

-		} else {

-			if(possibleContextFieldName == null) {

-				initContextFieldName();

-			}

-			Iterator<String> iter = possibleContextFieldName.iterator();

-

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

-				final String currentName = iter.next();

-				final EStructuralFeature feature = source.eClass().getEStructuralFeature(currentName);

-				if(feature != null) {

-					context = (EObject)source.eGet(feature);

-				}

-

-			}

-		}

-		return context;

-	}

-

-	private static final void initContextFieldName() {

-		possibleContextFieldName = new ArrayList<String>();

-		possibleContextFieldName.add("context");

-		possibleContextFieldName.add("element");

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/GetEditorNameQuery.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/GetEditorNameQuery.java
deleted file mode 100644
index e9d6d0a34a8..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/GetEditorNameQuery.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.nestededitor.query;

-

-import java.lang.reflect.Field;

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

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

-import org.eclipse.emf.facet.efacet.core.IFacetManager;

-import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;

-import org.eclipse.emf.facet.query.java.core.IParameterValueList2;

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

-import org.eclipse.papyrus.infra.table.efacet.nestededitor.Activator;

-

-

-public class GetEditorNameQuery extends AbstractNestedEditorQuery<String> {

-

-	private static List<String> possibleNameFieldName = null;

-

-	public String evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {

-

-

-

-		String editorName = null;

-		if(source instanceof PapyrusTable) {

-			editorName = ((PapyrusTable)source).getName();

-		} else {

-			if(possibleNameFieldName == null) {

-				initContextFieldName();

-			}

-			final Iterator<String> iter = possibleNameFieldName.iterator();

-			Field contextField = null;

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

-				final String currentName = iter.next();

-				try {

-					contextField = source.getClass().getDeclaredField(currentName);

-				} catch (SecurityException e) {

-					Activator.log.error(e);

-				} catch (NoSuchFieldException e) {

-					Activator.log.error(e);

-				}

-			}

-			if(contextField != null) {

-				boolean oldAccessibilityValue = contextField.isAccessible();

-				contextField.setAccessible(true);

-				Object tmp = null;

-				try {

-					tmp = contextField.get(source);

-				} catch (IllegalArgumentException e) {

-					Activator.log.error(e);

-				} catch (IllegalAccessException e) {

-					Activator.log.error(e);

-				}

-				if(tmp instanceof String) {

-					editorName = (String)tmp;

-				}

-				contextField.setAccessible(oldAccessibilityValue);

-			}

-		}

-		return editorName;

-	}

-

-

-	private static final void initContextFieldName() {

-		possibleNameFieldName = new ArrayList<String>();

-		possibleNameFieldName.add("name");

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/GetOpenEditorStatusQuery.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/GetOpenEditorStatusQuery.java
deleted file mode 100644
index d577fe0c137..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/GetOpenEditorStatusQuery.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.nestededitor.query;

-

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

-import org.eclipse.emf.facet.efacet.core.IFacetManager;

-import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;

-import org.eclipse.emf.facet.query.java.core.IParameterValueList2;

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

-

-

-public class GetOpenEditorStatusQuery extends AbstractNestedEditorQuery<Boolean> {

-

-	public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {

-		IPageMngr pageMManager = getPageMngr(source);

-		return pageMManager.isOpen(source);

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/IsAllowedInNestedEditortableQuery.java b/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/IsAllowedInNestedEditortableQuery.java
deleted file mode 100644
index dd41950599a..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.efacet.nestededitor/src/org/eclipse/papyrus/infra/table/efacet/nestededitor/query/IsAllowedInNestedEditortableQuery.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.papyrus.infra.table.efacet.nestededitor.query;

-

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

-import org.eclipse.emf.facet.efacet.core.IFacetManager;

-import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;

-import org.eclipse.emf.facet.query.java.core.IParameterValueList2;

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

-

-//TOD0 currently this class is not used, we should complete the tableconfiguration (can be presented in the table)

-public class IsAllowedInNestedEditortableQuery extends AbstractNestedEditorQuery<Boolean> {

-

-	public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {

-		final IPageMngr pageManager = getPageMngr(source);

-		if(pageManager != null) {

-			return pageManager.allPages().contains(source);

-		}

-		return false;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/.classpath b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/.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/org.eclipse.papyrus.infra.table.modelexplorer/.project b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/.project
deleted file mode 100644
index db2442f94ec..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.table.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.pde.PluginNature</nature>

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

-	</natures>

-</projectDescription>

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.core.resources.prefs b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index c82fec208fa..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Nov 04 17:02:59 CET 2011

-eclipse.preferences.version=1

-encoding//src/org/eclipse/papyrus/infra/table/modelexplorer/messages/messages.properties=ISO-8859-1

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index eef3e01dddb..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Feb 18 14:48:14 CET 2011

-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/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
deleted file mode 100644
index acfac37c220..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",

- org.eclipse.emf.facet.infra.browser.custom.core,

- org.eclipse.papyrus.views.modelexplorer;bundle-version="0.9.0",

- org.eclipse.core.expressions,

- org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0",

- org.eclipse.papyrus.infra.table.instance;bundle-version="0.9.0",

- org.eclipse.uml2.uml,

- org.eclipse.emf.facet.infra.query.core,

- org.eclipse.core.runtime;bundle-version="3.7.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- com.google.guava;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.table.metamodel;bundle-version="0.9.0"

-Export-Package: org.eclipse.papyrus.infra.table.modelexplorer,

- org.eclipse.papyrus.infra.table.modelexplorer.handlers,

- org.eclipse.papyrus.infra.table.modelexplorer.messages,

- org.eclipse.papyrus.infra.table.modelexplorer.providers

-Bundle-Vendor: %pluginProvider

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.9.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.table.modelexplorer.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.table.modelexplorer;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/about.html b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.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/org.eclipse.papyrus.infra.table.modelexplorer/build.properties b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/build.properties
deleted file mode 100644
index 8f5a4c96094..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               resources/,\

-               plugin.properties,\

-               about.html,\

-               bin/,\

-               documentation.pdoc

-output.. = bin/

-src.includes = about.html

-source.. = src/

-bin.. = bin/

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/documentation.pdoc b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/documentation.pdoc
deleted file mode 100644
index e7a7257ea7e..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/documentation.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 contributes to the ModelExplorer View. It provides customization&#xD;&#xA;to display the Table in the ModelExplorer View + some other functionalities concerning the tables">

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

-</doc:Documentation>

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties
deleted file mode 100644
index 218c6567b7f..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.infra.table.modelexplorer

-pluginProvider = Eclipse Modeling Project

-pluginName = Table Customization For Model Explorer (Incubation)
\ No newline at end of file
diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/plugin.xml b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/plugin.xml
deleted file mode 100644
index 8e1f221427d..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/plugin.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<?eclipse version="3.4"?>

-

-<plugin>

- <!-- we provide a new navigator content for the tables. To be called, this navigator content should have an id beginning with org.eclipse.papyrus.views.modelexplorer.* -->

-   <extension point="org.eclipse.ui.handlers">

-      <handler class="org.eclipse.papyrus.infra.table.modelexplorer.handlers.DeleteTableHandler" commandId="org.eclipse.ui.edit.delete">

-         <activeWhen>

-            <or>

-               <with variable="selection">

-                  <and>

-                     <test forcePluginActivation="true" property="org.eclipse.papyrus.table.modelexplorer.tester.isTable" value="true">

-                     </test>

-                  </and>

-               </with>

-            </or>

-         </activeWhen>

-      </handler>

-         <handler class="org.eclipse.papyrus.infra.table.modelexplorer.handlers.DuplicateTableHandler" commandId="org.eclipse.papyrus.views.modelexplorer.duplicate.command">

-         <activeWhen>

-            <and>

-               <with variable="selection">

-                     <!-- We add these tests for : 
-                     	- force the refresh of the action in the menu edit  
-                     	- avoid have 2 handlers enabled in the same time 
-                     	-->

-                  <and>

-                     <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isDiagram" value="false">

-                     </test>

-                     <test forcePluginActivation="true" property="org.eclipse.papyrus.table.modelexplorer.tester.isTable" value="true">

-                     </test>

-                  </and>

-               </with>

-            </and>

-         </activeWhen>

-      </handler>

-            <handler class="org.eclipse.papyrus.infra.table.modelexplorer.handlers.RenameTableHandler" commandId="org.eclipse.ui.edit.rename">

-         <activeWhen>

-            <or>

-               <with variable="selection">

-                  <and>

-                     <count value="1">

-                     </count>

-                     <test forcePluginActivation="true" property="org.eclipse.papyrus.table.menu.providers.TableTester.isTable" value="true">

-                     </test>

-                     <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.view.isModelExplorer" value="true">

-                     </test>

-                  </and>

-               </with>

-            </or>

-         </activeWhen>

-      </handler>

-            <handler

-                  class="org.eclipse.papyrus.infra.table.modelexplorer.handlers.DeletePapyrusTableHandler"

-                  commandId="org.eclipse.ui.edit.delete">

-               <activeWhen>

-                  <or>

-                     <with

-                           variable="selection">

-                        <and>

-                           <test

-                                 forcePluginActivation="true"

-                                 property="org.eclipse.papyrus.table.modelexplorer.tester2.isTable"

-                                 value="true">

-                           </test>

-                        </and>

-                     </with>

-                  </or>

-               </activeWhen>

-            </handler>

-            <handler

-                  class="org.eclipse.papyrus.infra.table.modelexplorer.handlers.DuplicatePapyrusTableHandler"

-                  commandId="org.eclipse.papyrus.views.modelexplorer.duplicate.command">

-               <activeWhen>

-                  <and>

-                     <with

-                           variable="selection">

-                        <and>

-                           <test

-                                 forcePluginActivation="true"

-                                 property="org.eclipse.papyrus.table.modelexplorer.tester2.isTable"

-                                 value="true">

-                           </test>

-                        </and>

-                     </with>

-                  </and>

-               </activeWhen>

-            </handler>

-            <handler

-                  class="org.eclipse.papyrus.infra.table.modelexplorer.handlers.RenamePapyrusTableHandler"

-                  commandId="org.eclipse.ui.edit.rename">

-               <activeWhen>

-                  <or>

-                     <with

-                           variable="selection">

-                        <and>

-                           <test

-                                 forcePluginActivation="true"

-                                 property="org.eclipse.papyrus.table.modelexplorer.tester2.isTable"

-                                 value="true">

-                           </test>

-                        </and>

-                     </with>

-                  </or>

-               </activeWhen>

-            </handler>

-   </extension>

-   <extension point="org.eclipse.core.expressions.propertyTesters">

-      <propertyTester class="org.eclipse.papyrus.infra.table.modelexplorer.providers.TablePropertyTester" id="org.eclipse.papyrus.table.modelexplorer.tester" namespace="org.eclipse.papyrus.table.modelexplorer.tester" properties="isTable" type="org.eclipse.jface.viewers.IStructuredSelection">

-      </propertyTester>

-      <propertyTester

-            class="org.eclipse.papyrus.infra.table.modelexplorer.providers.PapyrusTablePropertyTester"

-            id="org.eclipse.papyrus.table.modelexplorer.tester2"

-            namespace="org.eclipse.papyrus.table.modelexplorer.tester2"

-            properties="isTable"

-            type="org.eclipse.jface.viewers.IStructuredSelection">

-      </propertyTester>

-   </extension>

-   <extension point="org.eclipse.emf.facet.infra.facet.registration">

-      <facetset file="resources/PapyrusTableFacet.facetSet"/>

-   </extension>

-   <extension point="org.eclipse.emf.facet.infra.query.registration">

-      <modelqueryset file="resources/PapyrusTableQuery.querySet"/>

-   </extension>

-   <extension point="org.eclipse.emf.facet.infra.browser.custom.core.registration">

-      <browserCustomization file="resources/PapyrusTableFacetCustomization.uiCustom" loadByDefault="true"/>

-   </extension>

-   <extension point="org.eclipse.emf.facet.infra.browser.custom.core.registration">

-      <browserCustomization file="resources/PapyrusTableInstanceCustomization.uiCustom" loadByDefault="true"/>

-   </extension>

-   <extension

-         point="org.eclipse.emf.facet.infra.browser.custom.core.registration">

-      <browserCustomization

-            file="resources/PapyrusTableCustomization.uiCustom"

-            loadByDefault="true">

-      </browserCustomization>

-   </extension>
-</plugin>

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableCustomization.uiCustom b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableCustomization.uiCustom
deleted file mode 100644
index 8aff7b461f9..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableCustomization.uiCustom
+++ /dev/null
@@ -1,33 +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://www.eclipse.org/Papyrus/PapyrusTable/0.9.0/papyrustable">

-  <types metaclassName="papyrustable.PapyrusTable">

-    <customizedFeatures customizedFeature="label">

-      <defaultValue xsi:type="uicustom:DerivedFeatureValue">

-        <valueCalculator xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTableQuery#GetPapyrusTableName"/>

-      </defaultValue>

-    </customizedFeatures>

-    <customizedFeatures customizedFeature="icon">

-      <defaultValue xsi:type="uicustom:DerivedFeatureValue">

-        <valueCalculator xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTableQuery#GetPapyrusTableIcon"/>

-      </defaultValue>

-    </customizedFeatures>

-    <customizedFeatures customizedFeature="hideMetaclassName">

-      <defaultValue xsi:type="uicustom:StaticFeatureValue" value="true"/>

-    </customizedFeatures>

-    <references referenceName="table">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-    <references referenceName="feature">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-    <references referenceName="queries">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-  </types>

-</uicustom:MetamodelView>

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacet.facetSet b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacet.facetSet
deleted file mode 100644
index ed6c48cb863..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacet.facetSet
+++ /dev/null
@@ -1,20 +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="PapyrusTableFacet" nsURI="http://org.eclipse.org/papyrus/modelExplorer/PapyrusTableFacet" nsPrefix="PapyrusTableFacet">

-  <eClassifiers xsi:type="facet:Facet" name="FacetTableContainer" abstract="true">

-    <eSuperTypes href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>

-    <eStructuralFeatures xsi:type="facet:FacetReference" name="tables" upperBound="-1" volatile="true" unsettable="true">

-      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#//PapyrusTableInstance"/>

-      <valueQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTableQuery#GetContainedTables"/>

-    </eStructuralFeatures>

-    <conditionQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTableQuery#IsTableContainer"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="facet:Facet" name="FacetPapyrusTableContainer" abstract="true">

-    <eSuperTypes href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>

-    <eStructuralFeatures xsi:type="facet:FacetReference" name="tables" upperBound="-1" volatile="true" unsettable="true">

-      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/Papyrus/PapyrusTable/0.9.0/papyrustable#//PapyrusTable"/>

-      <valueQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTableQuery#GetContainedPapyrusTables"/>

-    </eStructuralFeatures>

-    <conditionQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTableQuery#IsPapyrusTableContainer"/>

-  </eClassifiers>

-  <extendedPackage href="http://www.eclipse.org/uml2/4.0.0/UML#/"/>

-</facet:FacetSet>

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacetCustomization.uiCustom b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacetCustomization.uiCustom
deleted file mode 100644
index 9547b428a38..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacetCustomization.uiCustom
+++ /dev/null
@@ -1,31 +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/modelExplorer/PapyrusTableFacet">

-  <types metaclassName="PapyrusTableFacet.FacetTableContainer">

-    <references referenceName="tables">

-      <customizedFeatures>

-        <valueCases>

-          <value xsi:type="uicustom:StaticFeatureValue" value="false"/>

-          <condition xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTableQuery#IsTableContainer"/>

-        </valueCases>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-      <customizedFeatures customizedFeature="collapseLink">

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="true"/>

-      </customizedFeatures>

-    </references>

-  </types>

-  <types metaclassName="PapyrusTableFacet.FacetPapyrusTableContainer">

-    <references referenceName="tables">

-      <customizedFeatures>

-        <valueCases>

-          <value xsi:type="uicustom:StaticFeatureValue" value="false"/>

-          <condition xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTableQuery#IsPapyrusTableContainer"/>

-        </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/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableInstanceCustomization.uiCustom b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableInstanceCustomization.uiCustom
deleted file mode 100644
index 6f012ca143a..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableInstanceCustomization.uiCustom
+++ /dev/null
@@ -1,31 +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://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance">

-  <types metaclassName="papyrustableinstance.PapyrusTableInstance">

-    <customizedFeatures customizedFeature="icon">

-      <defaultValue xsi:type="uicustom:DerivedFeatureValue">

-        <valueCalculator xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTableQuery#GetTableIcon"/>

-      </defaultValue>

-    </customizedFeatures>

-    <customizedFeatures customizedFeature="hideMetaclassName">

-      <defaultValue xsi:type="uicustom:StaticFeatureValue" value="true"/>

-    </customizedFeatures>

-    <customizedFeatures customizedFeature="label">

-      <defaultValue xsi:type="uicustom:DerivedFeatureValue">

-        <valueCalculator xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTableQuery#GetTableName"/>

-      </defaultValue>

-    </customizedFeatures>

-    <customizedFeatures customizedFeature="struckthrough">

-      <defaultValue xsi:type="uicustom:StaticFeatureValue" value="true"/>

-    </customizedFeatures>

-    <references referenceName="fillingQueries">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-    <references referenceName="table">

-      <customizedFeatures>

-        <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>

-      </customizedFeatures>

-    </references>

-  </types>

-</uicustom:MetamodelView>

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet
deleted file mode 100644
index d5a9e5db1d0..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet
+++ /dev/null
@@ -1,40 +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="PapyrusTableQuery">

-  <associatedMetamodels href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#/"/>

-  <associatedMetamodels href="http://www.eclipse.org/Papyrus/PapyrusTable/0.9.0/papyrustable#/"/>

-  <associatedMetamodels href="http://www.eclipse.org/emf/2002/Ecore#/"/>

-  <associatedMetamodels href="http://www.eclipse.org/uml2/4.0.0/UML#/"/>

-  <associatedMetamodels href="http://www.eclipse.org/uml2/4.0.0/Types#/"/>

-  <queries xsi:type="query:JavaModelQuery" name="IsTableContainer" description="Returns true if the element contains a Table" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.IsTableContainer">

-    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>

-    <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>

-  </queries>

-  <queries xsi:type="query:JavaModelQuery" name="GetContainedTables" description="Get the collection of all contained tables" upperBound="-1" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.GetContainedTables">

-    <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#//PapyrusTableInstance"/>

-    <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>

-  </queries>

-  <queries xsi:type="query:JavaModelQuery" name="GetTableIcon" description="Return the path to the icon of the corresponding table" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.GetTableIcon">

-    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-    <scope href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#//PapyrusTableInstance"/>

-  </queries>

-  <queries xsi:type="query:JavaModelQuery" name="GetTableName" description="Return the name for the table" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.GetTableName">

-    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-    <scope href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#//PapyrusTableInstance"/>

-  </queries>

-  <queries xsi:type="query:JavaModelQuery" name="IsPapyrusTableContainer" description="Returns true if the element contains a Table" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.IsPapyrusTableContainer">

-    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>

-    <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>

-  </queries>

-  <queries xsi:type="query:JavaModelQuery" name="GetContainedPapyrusTables" description="Get the collection of all contained tables" upperBound="-1" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.GetContainedPapyrusTables">

-    <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/Papyrus/PapyrusTable/0.9.0/papyrustable#//PapyrusTable"/>

-    <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>

-  </queries>

-  <queries xsi:type="query:JavaModelQuery" name="GetPapyrusTableIcon" description="Return the path to the icon of the corresponding table" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.GetPapyrusTableIcon">

-    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-    <scope href="http://www.eclipse.org/Papyrus/PapyrusTable/0.9.0/papyrustable#//PapyrusTable"/>

-  </queries>

-  <queries xsi:type="query:JavaModelQuery" name="GetPapyrusTableName" description="Return the name for the table" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.GetPapyrusTableName">

-    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-    <scope href="http://www.eclipse.org/Papyrus/PapyrusTable/0.9.0/papyrustable#//PapyrusTable"/>

-  </queries>

-</query:ModelQuerySet>

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/Activator.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/Activator.java
deleted file mode 100644
index e7433ff7ace..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/Activator.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.table.modelexplorer;

-

-import java.util.List;

-

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

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

-import org.eclipse.emf.edit.EMFEditPlugin;

-import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;

-import org.eclipse.emf.facet.infra.browser.custom.core.CustomizationsCatalog;

-import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;

-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.table.modelexplorer"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/** the customization manager */

-	private CustomizationManager fCustomizationManager;

-

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

-		EMFEditPlugin.getComposedAdapterFactoryDescriptorRegistry();

-	}

-

-	/*

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

-	}

-

-	/**

-	 * 

-	 * @return the customization manager in charge to adapt element in modisco

-	 */

-	public CustomizationManager getCustomizationManager() {

-		if(this.fCustomizationManager == null) {

-			this.fCustomizationManager = new CustomizationManager();

-			init(this.fCustomizationManager);

-		}

-		return this.fCustomizationManager;

-	}

-

-	/**

-	 * 

-	 * @param customizationManager

-	 *        the customization manager to init

-	 */

-	private void init(final CustomizationManager customizationManager) {

-		// the appearance can be customized here:

-

-		customizationManager.setShowDerivedLinks(true);

-

-		try {

-

-			// load customizations defined as default through the customization

-			// extension

-			List<MetamodelView> registryDefaultCustomizations = CustomizationsCatalog.getInstance().getRegistryDefaultCustomizations();

-			for(MetamodelView metamodelView : registryDefaultCustomizations) {

-				customizationManager.registerCustomization(metamodelView);

-			}

-			customizationManager.loadCustomizations();

-

-		} catch (Throwable e) {

-			Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error initializing customizations", e)); //$NON-NLS-1$

-		}

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/AbstractPapyrusTableModelExplorerHandler.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/AbstractPapyrusTableModelExplorerHandler.java
deleted file mode 100644
index 78cc7b4b285..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/AbstractPapyrusTableModelExplorerHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.table.modelexplorer.handlers;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

-import org.eclipse.papyrus.infra.table.metamodel.papyrustable.PapyrusTable;

-import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;

-import org.eclipse.ui.PlatformUI;

-

-public abstract class AbstractPapyrusTableModelExplorerHandler extends AbstractCommandHandler {

-

-	/**

-	 * Returns the list of selected tables

-	 * 

-	 * @return the list of selected tables

-	 */

-	protected List<PapyrusTable> getSelectedTables() {

-		List<PapyrusTable> tables = new ArrayList<PapyrusTable>();

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

-				if(current instanceof IAdaptable) {

-					EObject table = (EObject)((IAdaptable)current).getAdapter(EObject.class);

-					if(table instanceof PapyrusTable) {

-						tables.add((PapyrusTable)table);

-					}

-				}

-			}

-		}

-		return tables;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java
deleted file mode 100644
index 60684acc9ac..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.table.modelexplorer.handlers;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

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

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

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

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

-import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;

-import org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * @deprecated Papyrus changes its table metamodel. This class is used to managed the old table metamodel.

- * for details see : 371616: [Table Editor] Tabular Editor should be rewritten to use the new EMF-Facet Metamodels

- *

- */

-@Deprecated

-public abstract class AbstractTableModelExplorerHandler extends AbstractCommandHandler {

-

-	/**

-	 * Returns the list of selected tables

-	 * 

-	 * @return

-	 *         the list of selected tables

-	 */

-	protected List<PapyrusTableInstance> getSelectedTables() {

-		List<PapyrusTableInstance> tables = new ArrayList<PapyrusTableInstance>();

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

-				if(current instanceof IAdaptable){

-					EObject table = (EObject)((IAdaptable)current).getAdapter(EObject.class);

-					if(table instanceof PapyrusTableInstance){

-						tables.add((PapyrusTableInstance)table);

-					}

-				}

-			}

-		}

-		return tables;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DeletePapyrusTableHandler.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DeletePapyrusTableHandler.java
deleted file mode 100644
index b066f3a0963..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DeletePapyrusTableHandler.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.table.modelexplorer.handlers;

-

-import java.util.List;

-

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

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

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

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

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

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

-import org.eclipse.papyrus.commands.DestroyElementPapyrusCommand;

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

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

-import org.eclipse.papyrus.infra.table.metamodel.papyrustable.PapyrusTable;

-

-/**

- * Handler for the delete Table action

- * 

- * 

- * 

- */

-public class DeletePapyrusTableHandler extends AbstractPapyrusTableModelExplorerHandler {

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler#getCommand()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected Command getCommand() {

-		TransactionalEditingDomain editingDomain = getEditingDomain();

-		final IPageMngr pageMngr = getPageManager();

-

-		List<PapyrusTable> tables = getSelectedTables();

-

-		if(editingDomain != null && pageMngr != null && !tables.isEmpty()) {

-			CompoundCommand command = new CompoundCommand();

-

-			for(final PapyrusTable table : tables) {

-				Command sashRemoveComd = new RecordingCommand(editingDomain) {

-

-					@Override

-					protected void doExecute() {

-						if(pageMngr.isOpen(table)) {

-							pageMngr.closePage(table);

-						}

-					}

-				};

-				// the destroy element command is a good way to destroy the cross reference

-				command.append(sashRemoveComd);

-				command.append(new GMFtoEMFCommandWrapper(new DestroyElementPapyrusCommand(new DestroyElementRequest(table, false))));

-			}

-			return command.isEmpty() ? UnexecutableCommand.INSTANCE : command;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DeleteTableHandler.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DeleteTableHandler.java
deleted file mode 100644
index a644200de5a..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DeleteTableHandler.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.table.modelexplorer.handlers;

-

-import java.util.List;

-

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

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

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

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

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

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

-import org.eclipse.papyrus.commands.DestroyElementPapyrusCommand;

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

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

-import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;

-

-

-/**

- * Handler for the delete Table action

- * 

- * @deprecated Papyrus changes its table metamodel. This class is used to managed the old table metamodel.

- *             for details see : 371616: [Table Editor] Tabular Editor should be rewritten to use the new EMF-Facet Metamodels

- * 

- */

-@Deprecated

-public class DeleteTableHandler extends AbstractTableModelExplorerHandler {

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler#getCommand()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected Command getCommand() {

-		TransactionalEditingDomain editingDomain = getEditingDomain();

-		final IPageMngr pageMngr = getPageManager();

-

-		List<PapyrusTableInstance> tables = getSelectedTables();

-

-		if(editingDomain != null && pageMngr != null && !tables.isEmpty()) {

-			CompoundCommand command = new CompoundCommand();

-

-			for(final PapyrusTableInstance table : tables) {

-				Command sashRemoveComd = new RecordingCommand(editingDomain) {

-

-					@Override

-					protected void doExecute() {

-						if(pageMngr.isOpen(table)) {

-							pageMngr.closePage(table);

-						}

-					}

-				};

-				// the destroy element command is a good way to destroy the cross reference

-				command.append(sashRemoveComd);

-				command.append(new GMFtoEMFCommandWrapper(new DestroyElementPapyrusCommand(new DestroyElementRequest(table, false))));

-			}

-			return command.isEmpty() ? UnexecutableCommand.INSTANCE : command;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DuplicatePapyrusTableHandler.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DuplicatePapyrusTableHandler.java
deleted file mode 100644
index 080c2892e89..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DuplicatePapyrusTableHandler.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.table.modelexplorer.handlers;

-

-import java.util.List;

-

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.table.metamodel.papyrustable.PapyrusTable;

-import org.eclipse.papyrus.infra.table.modelexplorer.messages.Messages;

-

-/**

- * This handler provides the duplicate action for the tables

- * 

- * 

- * 

- */

-public class DuplicatePapyrusTableHandler extends AbstractPapyrusTableModelExplorerHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler#getCommand()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected Command getCommand() {

-		TransactionalEditingDomain editingDomain = getEditingDomain();

-		final IPageMngr pageManager = getPageManager();

-		List<PapyrusTable> tables = getSelectedTables();

-

-		if(editingDomain != null && pageManager != null && !tables.isEmpty()) {

-			CompoundCommand command = new CompoundCommand();

-			for(PapyrusTable table : tables) {

-

-				// Clone the current table

-				final PapyrusTable newTable = EcoreUtil.copy(table);

-

-				// Give a new name

-				newTable.setName(Messages.DuplicateTableHandler_CopyOf + newTable.getName());

-

-				//we duplicate parameters and rename the new table!

-

-

-				Command addGmfDiagramCmd = new AddCommand(editingDomain, table.eResource().getContents(), newTable);

-				//				EMFCommandOperation operation = new EMFCommandOperation(editingDomain, addGmfDiagramCmd);

-

-				Command sashOpenCmd = new RecordingCommand(editingDomain) {

-

-					@Override

-					protected void doExecute() {

-						pageManager.openPage(newTable);

-					}

-				};

-				//

-				//				// TODO : synchronize with Cedric

-				//				command.append(operation.getCommand());

-				command.append(addGmfDiagramCmd);

-				command.append(sashOpenCmd);

-			}

-			return command.isEmpty() ? UnexecutableCommand.INSTANCE : command;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DuplicateTableHandler.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DuplicateTableHandler.java
deleted file mode 100644
index 4ceb296af8a..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DuplicateTableHandler.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * 

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.table.modelexplorer.handlers;

-

-import java.util.List;

-

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;

-import org.eclipse.papyrus.infra.table.modelexplorer.messages.Messages;

-

-/**

- * This handler provides the duplicate action for the tables

- *  @deprecated Papyrus changes its table metamodel. This class is used to managed the old table metamodel.

- * for details see : 371616: [Table Editor] Tabular Editor should be rewritten to use the new EMF-Facet Metamodels

- * 

- * 

- */

-@Deprecated

-public class DuplicateTableHandler extends AbstractTableModelExplorerHandler {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler#getCommand()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected Command getCommand() {

-		TransactionalEditingDomain editingDomain = getEditingDomain();

-		final IPageMngr pageManager = getPageManager();

-		List<PapyrusTableInstance> tables = getSelectedTables();

-

-		if(editingDomain != null && pageManager != null && !tables.isEmpty()) {

-			CompoundCommand command = new CompoundCommand();

-			for(PapyrusTableInstance table : tables) {

-

-				// Clone the current table

-				final PapyrusTableInstance newTable = EcoreUtil.copy(table);

-

-				// Give a new name

-				newTable.setName(Messages.DuplicateTableHandler_CopyOf + newTable.getName());

-

-				//we duplicate parameters and rename the new table!

-

-

-				Command addGmfDiagramCmd = new AddCommand(editingDomain, table.eResource().getContents(), newTable);

-				//				EMFCommandOperation operation = new EMFCommandOperation(editingDomain, addGmfDiagramCmd);

-

-				Command sashOpenCmd = new RecordingCommand(editingDomain) {

-

-					@Override

-					protected void doExecute() {

-						pageManager.openPage(newTable);

-					}

-				};

-				//

-				//				// TODO : synchronize with Cedric

-				//				command.append(operation.getCommand());

-				command.append(addGmfDiagramCmd);

-				command.append(sashOpenCmd);

-			}

-			return command.isEmpty() ? UnexecutableCommand.INSTANCE : command;

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/RenamePapyrusTableHandler.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/RenamePapyrusTableHandler.java
deleted file mode 100644
index e6a34876f79..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/RenamePapyrusTableHandler.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.table.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.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.table.metamodel.papyrustable.PapyrusTable;

-import org.eclipse.papyrus.infra.table.modelexplorer.messages.Messages;

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

-

-/**

- * This handler provides the method to rename a Table

- * 

- * 

- * 

- */

-public class RenamePapyrusTableHandler extends AbstractPapyrusTableModelExplorerHandler {

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler#getCommand()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected Command getCommand() {

-		TransactionalEditingDomain editingDomain = getEditingDomain();

-		List<PapyrusTable> tables = getSelectedTables();

-		if(editingDomain != null && tables.size() == 1) {

-

-			final PapyrusTable 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(final IProgressMonitor monitor, final IAdaptable info) {

-						InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), Messages.RenameTableHandler_RenameAnExistingTable_Title, Messages.RenameTableHandler_NewNameMessage, 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 GMFtoEMFCommandWrapper(cmd);

-			}

-

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-

-

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/RenameTableHandler.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/RenameTableHandler.java
deleted file mode 100644
index 8c8756d4c69..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/RenameTableHandler.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.table.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.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;

-import org.eclipse.papyrus.infra.table.modelexplorer.messages.Messages;

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

-

-/**

- * This handler provides the method to rename a Table

- * 

- *  @deprecated Papyrus changes its table metamodel. This class is used to managed the old table metamodel.

- * for details see : 371616: [Table Editor] Tabular Editor should be rewritten to use the new EMF-Facet Metamodels

- * 

- */

-@Deprecated

-public class RenameTableHandler extends AbstractTableModelExplorerHandler {

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.views.modelexplorer.handler.AbstractCommandHandler#getCommand()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected Command getCommand() {

-		TransactionalEditingDomain editingDomain = getEditingDomain();

-		List<PapyrusTableInstance> tables = getSelectedTables();

-		if(editingDomain != null && tables.size() == 1) {

-

-			final PapyrusTableInstance 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(final IProgressMonitor monitor, final IAdaptable info) {

-						InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), Messages.RenameTableHandler_RenameAnExistingTable_Title, Messages.RenameTableHandler_NewNameMessage, 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 GMFtoEMFCommandWrapper(cmd);

-			}

-

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-

-

-

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/Messages.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/Messages.java
deleted file mode 100644
index 7fe4c99c629..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/Messages.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.table.modelexplorer.messages;

-

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

-

-public class Messages extends NLS {

-

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

-

-	public static String DuplicateTableHandler_CopyOf;

-

-	public static String RenameTableHandler_NewNameMessage;

-

-	public static String RenameTableHandler_RenameAnExistingTable_Title;

-	static {

-		// initialize resource bundle

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

-	}

-

-	private Messages() {

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/messages.properties b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/messages.properties
deleted file mode 100644
index c5ff485ad7f..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-DuplicateTableHandler_CopyOf=Copy of

-RenameTableHandler_NewNameMessage=New name

-RenameTableHandler_RenameAnExistingTable_Title=Rename an existing table

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/PapyrusTablePropertyTester.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/PapyrusTablePropertyTester.java
deleted file mode 100644
index be635976ccd..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/PapyrusTablePropertyTester.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.table.modelexplorer.providers;

-

-import java.util.Iterator;

-

-import org.eclipse.core.expressions.PropertyTester;

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

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Table;

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

-import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;

-import org.eclipse.papyrus.infra.table.metamodel.papyrustable.PapyrusTable;

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

-	 */

-	private boolean isTable(final 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 table = NavigatorUtils.getElement(next, EObject.class);

-				if(!(table instanceof PapyrusTable)) {

-					return false;

-				}

-			}

-			return true;

-		}

-		return false;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/TablePropertyTester.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/TablePropertyTester.java
deleted file mode 100644
index e4119f15e0d..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/TablePropertyTester.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.infra.table.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.table.instance.papyrustableinstance.PapyrusTableInstance;

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

- * 

- *  @deprecated Papyrus changes its table metamodel. This class is used to managed the old table metamodel.

- * for details see : 371616: [Table Editor] Tabular Editor should be rewritten to use the new EMF-Facet Metamodels

- * FIXME : i think this class is not yet used

- */

-@Deprecated

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

-	 * 

-	 * @param selection

-	 * @return

-	 *         <code>true</code> if the selection is composed by {@link TableInstance}

-	 */

-	private boolean isTable(final 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 table = NavigatorUtils.getElement(next, EObject.class);

-				if(!(table instanceof PapyrusTableInstance)) {

-					return false;

-				}

-			}

-			return true;

-		}

-		return false;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetContainedPapyrusTables.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetContainedPapyrusTables.java
deleted file mode 100644
index 2117f44deb4..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetContainedPapyrusTables.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.table.modelexplorer.queries;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.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.emf.ecore.util.EcoreUtil;
-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.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableinstancePackage;
-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Table;
-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.TablePackage;
-import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;
-import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
-import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;
-import org.eclipse.papyrus.infra.core.utils.PapyrusEcoreUtils;
-import org.eclipse.papyrus.infra.table.metamodel.papyrustable.PapyrusTable;
-import org.eclipse.papyrus.infra.table.metamodel.papyrustable.PapyrustablePackage;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-
-/** Get the collection of all contained tables */
-//FIXME this query is declared using Element in the querySet -> change into EObject when the EMF-Facet bug will be corrected 365744
-public class GetContainedPapyrusTables extends AbstractEditorContainerQuery implements IJavaModelQuery<EObject, Collection<PapyrusTable>> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Collection<PapyrusTable> evaluate(final EObject context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		Predicate<EStructuralFeature.Setting> p = new Predicate<EStructuralFeature.Setting>() {
-
-			public boolean apply(EStructuralFeature.Setting setting) {
-				return setting.getEObject() instanceof Table && setting.getEStructuralFeature() == TablePackage.Literals.TABLE__CONTEXT;
-			}
-		};
-		Function<EStructuralFeature.Setting, PapyrusTable> f = new Function<EStructuralFeature.Setting, PapyrusTable>() {
-
-			public PapyrusTable apply(EStructuralFeature.Setting setting) {
-				if(setting.getEObject() instanceof Table) {
-					Collection<Setting> references = PapyrusEcoreUtils.getUsages(((Table)setting.getEObject()).eContainer());
-					Predicate<Setting> p2 = new Predicate<EStructuralFeature.Setting>() {
-
-						public boolean apply(Setting setting) {
-							return ((PageRef)setting.getEObject()).getEmfPageIdentifier() instanceof PapyrusTable && DiPackage.Literals.PAGE_REF__EMF_PAGE_IDENTIFIER == setting.getEStructuralFeature();
-						}
-					};
-					Iterator<Setting> iterator = Iterables.filter(references, p2).iterator();
-					if(iterator.hasNext()) {
-						Setting next = iterator.next();
-						if(next.getEObject() instanceof PageRef) {
-							PageRef current = (PageRef)next.getEObject();
-							return (PapyrusTable)current.getEmfPageIdentifier();
-						}
-					}
-				}
-				return null;
-			}
-
-		};
-
-		Iterable<PapyrusTable> transform = Iterables.transform(Iterables.filter(PapyrusEcoreUtils.getUsages(context), p), f);
-		transform = Iterables.filter(transform, new Predicate<PapyrusTable>() {
-
-			public boolean apply(PapyrusTable table) {
-				return table != null;
-			}
-		});
-		return Sets.newHashSet(transform);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetContainedTables.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetContainedTables.java
deleted file mode 100644
index b9f5d7ed764..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetContainedTables.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.table.modelexplorer.queries;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-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.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableinstancePackage;
-import org.eclipse.papyrus.infra.core.utils.PapyrusEcoreUtils;
-import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrustableinstancePackage;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-
-/**
- * Get the collection of all contained tables
- * 
- * @deprecated Papyrus changes its table metamodel. This class is used to managed the old table metamodel.
- *             for details see : 371616: [Table Editor] Tabular Editor should be rewritten to use the new EMF-Facet Metamodels
- * */
-@Deprecated
-//FIXME this query is declared using Element in the querySet -> change into EObject when the EMF-Facet bug will be corrected 365744
-public class GetContainedTables extends AbstractEditorContainerQuery implements IJavaModelQuery<EObject, Collection<PapyrusTableInstance>> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Collection<PapyrusTableInstance> evaluate(final EObject context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		Predicate<EStructuralFeature.Setting> p = new Predicate<EStructuralFeature.Setting>() {
-
-			public boolean apply(EStructuralFeature.Setting setting) {
-				return setting.getEObject() instanceof TableInstance && setting.getEStructuralFeature() == TableinstancePackage.Literals.TABLE_INSTANCE__CONTEXT;
-			}
-		};
-		Function<EStructuralFeature.Setting, PapyrusTableInstance> f = new Function<EStructuralFeature.Setting, PapyrusTableInstance>() {
-
-			public PapyrusTableInstance apply(EStructuralFeature.Setting setting) {
-				Collection<Setting> references = PapyrusEcoreUtils.getUsages(setting.getEObject());
-				Predicate<Setting> p2 = new Predicate<EStructuralFeature.Setting>() {
-
-					public boolean apply(Setting setting) {
-						return setting.getEObject() instanceof PapyrusTableInstance && PapyrustableinstancePackage.Literals.PAPYRUS_TABLE_INSTANCE__TABLE == setting.getEStructuralFeature();
-					}
-				};
-				Iterator<Setting> iterator = Iterables.filter(references, p2).iterator();
-				if(iterator.hasNext()) {
-					return (PapyrusTableInstance)iterator.next().getEObject();
-				}
-				return null;
-			}
-
-		};
-
-		Iterable<PapyrusTableInstance> transform = Iterables.transform(Iterables.filter(PapyrusEcoreUtils.getUsages(context), p), f);
-		transform = Iterables.filter(transform, new Predicate<PapyrusTableInstance>() {
-
-			public boolean apply(PapyrusTableInstance table) {
-				return table != null;
-			}
-		});
-		return Sets.newHashSet(transform);
-	}
-
-}
diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetPapyrusTableIcon.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetPapyrusTableIcon.java
deleted file mode 100644
index acace028157..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetPapyrusTableIcon.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.table.modelexplorer.queries;
-
-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.core.editorsfactory.IPageIconsRegistryExtended;
-import org.eclipse.papyrus.infra.table.metamodel.papyrustable.PapyrusTable;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractGetEditorIconQuery;
-
-/** Return the path to the icon of the corresponding table */
-public class GetPapyrusTableIcon extends AbstractGetEditorIconQuery implements IJavaModelQuery<PapyrusTable, String> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String evaluate(final PapyrusTable context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		return "/" + ((IPageIconsRegistryExtended)getEditorRegistry()).getEditorURLIcon(context); //$NON-NLS-1$
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetPapyrusTableName.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetPapyrusTableName.java
deleted file mode 100644
index e4c92a9ea0d..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetPapyrusTableName.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.table.modelexplorer.queries;
-
-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.table.metamodel.papyrustable.PapyrusTable;
-
-
-/** Return the name for the table */
-public class GetPapyrusTableName implements IJavaModelQuery<PapyrusTable, String> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String evaluate(final PapyrusTable context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		return context.getName();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableIcon.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableIcon.java
deleted file mode 100644
index 93778825bd8..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableIcon.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.table.modelexplorer.queries;
-
-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.core.editorsfactory.IPageIconsRegistryExtended;
-import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractGetEditorIconQuery;
-
-/**
- * Return the path to the icon of the corresponding table
- * 
- * @deprecated Papyrus changes its table metamodel. This class is used to managed the old table metamodel.
- *             for details see : 371616: [Table Editor] Tabular Editor should be rewritten to use the new EMF-Facet Metamodels
- */
-@Deprecated
-public class GetTableIcon extends AbstractGetEditorIconQuery implements IJavaModelQuery<PapyrusTableInstance, String> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String evaluate(final PapyrusTableInstance context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		return "/" + ((IPageIconsRegistryExtended)getEditorRegistry()).getEditorURLIcon(context); //$NON-NLS-1$
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableName.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableName.java
deleted file mode 100644
index 1ce8bc03c2b..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableName.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.table.modelexplorer.queries;
-
-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.table.instance.papyrustableinstance.PapyrusTableInstance;
-
-/** Return the name for the table 
- *  @deprecated Papyrus changes its table metamodel. This class is used to managed the old table metamodel.
- * for details see : 371616: [Table Editor] Tabular Editor should be rewritten to use the new EMF-Facet Metamodels 
- */
-@Deprecated
-public class GetTableName implements IJavaModelQuery<PapyrusTableInstance, String> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String evaluate(final PapyrusTableInstance context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		return context.getName();
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/IsPapyrusTableContainer.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/IsPapyrusTableContainer.java
deleted file mode 100644
index 3009ea20f15..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/IsPapyrusTableContainer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.table.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.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableinstancePackage;
-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Table;
-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.TablePackage;
-import org.eclipse.papyrus.infra.table.metamodel.papyrustable.PapyrusTable;
-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
-
-import com.google.common.base.Predicate;
-
-/** Returns true if the element contains a Table */
-//FIXME this query is declared using Element in the querySet -> change into EObject when the EMF-Facet bug will be corrected 365744
-public class IsPapyrusTableContainer extends AbstractEditorContainerQuery implements IJavaModelQuery<EObject, Boolean> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	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 && arg0.getEStructuralFeature() == TablePackage.Literals.TABLE__CONTEXT;
-			}
-		};
-		boolean answer = NavigatorUtils.find(context, p);
-		return NavigatorUtils.find(context, p);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/IsTableContainer.java b/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/IsTableContainer.java
deleted file mode 100644
index 75a8ca58c20..00000000000
--- a/sandbox/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/IsTableContainer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.table.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.emf.facet.widgets.nattable.instance.tableinstance.TableInstance;
-import org.eclipse.emf.facet.widgets.nattable.instance.tableinstance.TableinstancePackage;
-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
-
-import com.google.common.base.Predicate;
-
-/** Returns true if the element contains a Table 
- * @deprecated Papyrus changes its table metamodel. This class is used to managed the old table metamodel.
- * for details see : 371616: [Table Editor] Tabular Editor should be rewritten to use the new EMF-Facet Metamodels 
- */
-@Deprecated
-//FIXME this query is declared using Element in the querySet -> change into EObject when the EMF-Facet bug will be corrected 365744
-public class IsTableContainer extends AbstractEditorContainerQuery implements IJavaModelQuery<EObject, Boolean> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public Boolean evaluate(EObject context, ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		Predicate<Setting> p = new Predicate<Setting>() {
-
-			public boolean apply(Setting arg0) {
-				return arg0.getEObject() instanceof TableInstance && arg0.getEStructuralFeature() == TableinstancePackage.Literals.TABLE_INSTANCE__CONTEXT;
-			}
-		};
-		return NavigatorUtils.find(context, p);
-	}
-}
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/.classpath b/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/.classpath
deleted file mode 100644
index 45f024e850e..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/.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/org.eclipse.papyrus.profile.facets.configuration.edit/.project b/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/.project
deleted file mode 100644
index 5331f84c200..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.profile.facets.configuration.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/org.eclipse.papyrus.profile.facets.configuration.edit/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index 0dd07fd9535..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.profile.facets.configuration.edit;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Activator: org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.provider.ProfileToFacetConfigurationModelEditPlugin$Implementation

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.provider

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

- org.eclipse.papyrus.profile.facets.configuration;visibility:=reexport,

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

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

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

- org.eclipse.uml2.uml;visibility:=reexport,

- org.eclipse.uml2.uml.edit;visibility:=reexport

-Bundle-ActivationPolicy: lazy

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/build.properties b/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/build.properties
deleted file mode 100644
index 400b20ae286..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties

-jars.compile.order = .

-source.. = src/

-output.. = bin/

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/icons/full/obj16/ProfileToFacetsConfiguration.gif b/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/icons/full/obj16/ProfileToFacetsConfiguration.gif
deleted file mode 100644
index 5a9bc7514fa..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/icons/full/obj16/ProfileToFacetsConfiguration.gif
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/plugin.properties b/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/plugin.properties
deleted file mode 100644
index 4189920a7aa..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/plugin.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-pluginName = ProfileToFacetConfigurationModel Edit Support

-providerName = www.example.org

-

-_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_ProfileToFacetsConfiguration_type = Profile To Facets Configuration

-_UI_Unknown_type = Object

-

-_UI_Unknown_datatype= Value

-

-_UI_ProfileToFacetsConfiguration_header_feature = Header

-_UI_ProfileToFacetsConfiguration_profile_feature = Profile

-_UI_ProfileToFacetsConfiguration_basePackage_feature = Base Package

-_UI_Unknown_feature = Unspecified

-

-_UI_ProfileToFacetsConfiguration_headerFilePath_feature = Header File Path

-_UI_ProfileToFacetsConfiguration_javaSourceFolderName_feature = Java Source Folder Name

-_UI_ProfileToFacetsConfiguration_modelFolder_feature = Model Folder

-_UI_ProfileToFacetsConfiguration_javaFolder_feature = Java Folder

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/plugin.xml b/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/plugin.xml
deleted file mode 100644
index 9a8766a2ed9..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- <copyright>

- </copyright>

-

- $Id$

--->

-

-<plugin>

-

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

-      <factory

-            uri="http://www.eclipse.org/Papyrus/profileToFacetsConfiguration"

-            class="org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.provider.ProfileToFacetsConfigurationItemProviderAdapterFactory"

-            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/org.eclipse.papyrus.profile.facets.configuration.edit/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/provider/ProfileToFacetConfigurationModelEditPlugin.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/provider/ProfileToFacetConfigurationModelEditPlugin.java
deleted file mode 100644
index 93929203cf9..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/provider/ProfileToFacetConfigurationModelEditPlugin.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

-

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

-

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-

-import org.eclipse.uml2.uml.edit.UMLEditPlugin;

-

-/**

- * This is the central singleton for the ProfileToFacetConfigurationModel edit plugin.

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

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

- * @generated

- */

-public final class ProfileToFacetConfigurationModelEditPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

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

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

-	 * @generated

-	 */

-	public static final ProfileToFacetConfigurationModelEditPlugin INSTANCE = new ProfileToFacetConfigurationModelEditPlugin();

-

-	/**

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

-		super

-		  (new ResourceLocator [] {

-		     EcoreEditPlugin.INSTANCE,

-		     UMLEditPlugin.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/org.eclipse.papyrus.profile.facets.configuration.edit/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/provider/ProfileToFacetsConfigurationItemProvider.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/provider/ProfileToFacetsConfigurationItemProvider.java
deleted file mode 100644
index 2c28aed7994..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/provider/ProfileToFacetsConfigurationItemProvider.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.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.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration;

-import org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration} object.

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

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

- * @generated

- */

-public class ProfileToFacetsConfigurationItemProvider

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

-

-			addProfilePropertyDescriptor(object);

-			addBasePackagePropertyDescriptor(object);

-			addHeaderPropertyDescriptor(object);

-			addJavaFolderPropertyDescriptor(object);

-			addModelFolderPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Profile feature.

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

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

-	 * @generated

-	 */

-	protected void addProfilePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

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

-				 getResourceLocator(),

-				 getString("_UI_ProfileToFacetsConfiguration_profile_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_ProfileToFacetsConfiguration_profile_feature", "_UI_ProfileToFacetsConfiguration_type"),

-				 ProfileToFacetsConfigurationPackage.Literals.PROFILE_TO_FACETS_CONFIGURATION__PROFILE,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Base Package feature.

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

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

-	 * @generated

-	 */

-	protected void addBasePackagePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

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

-				 getResourceLocator(),

-				 getString("_UI_ProfileToFacetsConfiguration_basePackage_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_ProfileToFacetsConfiguration_basePackage_feature", "_UI_ProfileToFacetsConfiguration_type"),

-				 ProfileToFacetsConfigurationPackage.Literals.PROFILE_TO_FACETS_CONFIGURATION__BASE_PACKAGE,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Header feature.

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

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

-	 * @generated

-	 */

-	protected void addHeaderPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

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

-				 getResourceLocator(),

-				 getString("_UI_ProfileToFacetsConfiguration_header_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_ProfileToFacetsConfiguration_header_feature", "_UI_ProfileToFacetsConfiguration_type"),

-				 ProfileToFacetsConfigurationPackage.Literals.PROFILE_TO_FACETS_CONFIGURATION__HEADER,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Java Folder feature.

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

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

-	 * @generated

-	 */

-	protected void addJavaFolderPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

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

-				 getResourceLocator(),

-				 getString("_UI_ProfileToFacetsConfiguration_javaFolder_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_ProfileToFacetsConfiguration_javaFolder_feature", "_UI_ProfileToFacetsConfiguration_type"),

-				 ProfileToFacetsConfigurationPackage.Literals.PROFILE_TO_FACETS_CONFIGURATION__JAVA_FOLDER,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Model Folder feature.

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

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

-	 * @generated

-	 */

-	protected void addModelFolderPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

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

-				 getResourceLocator(),

-				 getString("_UI_ProfileToFacetsConfiguration_modelFolder_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_ProfileToFacetsConfiguration_modelFolder_feature", "_UI_ProfileToFacetsConfiguration_type"),

-				 ProfileToFacetsConfigurationPackage.Literals.PROFILE_TO_FACETS_CONFIGURATION__MODEL_FOLDER,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns ProfileToFacetsConfiguration.gif.

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

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

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ProfileToFacetsConfiguration"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

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

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

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ProfileToFacetsConfiguration)object).getBasePackage();

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

-			getString("_UI_ProfileToFacetsConfiguration_type") :

-			getString("_UI_ProfileToFacetsConfiguration_type") + " " + label;

-	}

-

-	/**

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

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__BASE_PACKAGE:

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__HEADER:

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__JAVA_FOLDER:

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__MODEL_FOLDER:

-				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 ProfileToFacetConfigurationModelEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/provider/ProfileToFacetsConfigurationItemProviderAdapterFactory.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/provider/ProfileToFacetsConfigurationItemProviderAdapterFactory.java
deleted file mode 100644
index f1c18fb9cbd..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.edit/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/provider/ProfileToFacetsConfigurationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.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.profile.facets.configuration.profileToFacetsConfiguration.util.ProfileToFacetsConfigurationAdapterFactory;

-

-/**

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

-		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.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration} instances.

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

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

-	 * @generated

-	 */

-	protected ProfileToFacetsConfigurationItemProvider profileToFacetsConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration}.

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

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

-	 * @generated

-	 */

-	@Override

-	public Adapter createProfileToFacetsConfigurationAdapter() {

-		if (profileToFacetsConfigurationItemProvider == null) {

-			profileToFacetsConfigurationItemProvider = new ProfileToFacetsConfigurationItemProvider(this);

-		}

-

-		return profileToFacetsConfigurationItemProvider;

-	}

-

-	/**

-	 * 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 (profileToFacetsConfigurationItemProvider != null) profileToFacetsConfigurationItemProvider.dispose();

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/.classpath b/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/.classpath
deleted file mode 100644
index 45f024e850e..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/.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/org.eclipse.papyrus.profile.facets.configuration.editor/.project b/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/.project
deleted file mode 100644
index 19612dc0967..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.profile.facets.configuration.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/org.eclipse.papyrus.profile.facets.configuration.editor/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index 79c8dce2c1b..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.profile.facets.configuration.editor;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Activator: org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.presentation.ProfileToFacetConfigurationModelEditorPlugin$Implementation

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.presentation

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

- org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.profile.facets.configuration.edit;visibility:=reexport,

- 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.uml2.uml.edit;visibility:=reexport

-Bundle-ActivationPolicy: lazy

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/build.properties b/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/build.properties
deleted file mode 100644
index db715c27319..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties

-jars.compile.order = .

-source.. = src/

-output.. = bin

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/icons/full/obj16/ProfileToFacetsConfigurationModelFile.gif b/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/icons/full/obj16/ProfileToFacetsConfigurationModelFile.gif
deleted file mode 100644
index f33d349a793..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/icons/full/obj16/ProfileToFacetsConfigurationModelFile.gif
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/icons/full/wizban/NewProfileToFacetsConfiguration.gif b/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/icons/full/wizban/NewProfileToFacetsConfiguration.gif
deleted file mode 100644
index 0ff8c5d5fca..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/icons/full/wizban/NewProfileToFacetsConfiguration.gif
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/icons/profileToFacets.png b/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/icons/profileToFacets.png
deleted file mode 100644
index 2f45b451b59..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/icons/profileToFacets.png
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/plugin.properties b/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/plugin.properties
deleted file mode 100644
index dfd6f1f2185..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/plugin.properties
+++ /dev/null
@@ -1,57 +0,0 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-pluginName = ProfileToFacetConfigurationModel Editor

-providerName = www.example.org

-

-_UI_ProfileToFacetsConfigurationEditor_menu = &ProfileToFacetsConfiguration 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_ProfileToFacetsConfigurationModelWizard_label = ProfileToFacetsConfiguration Model

-_UI_ProfileToFacetsConfigurationModelWizard_description = Create a new ProfileToFacetsConfiguration model

-

-_UI_ProfileToFacetsConfigurationEditor_label = ProfileToFacetsConfiguration Model Editor

-

-_UI_ProfileToFacetsConfigurationEditorFilenameDefaultBase = My

-_UI_ProfileToFacetsConfigurationEditorFilenameExtensions = profiletofacetsconfiguration

-

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

-

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/plugin.xml b/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/plugin.xml
deleted file mode 100644
index 4a4569567f0..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/plugin.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- <copyright>

- </copyright>

-

- $Id$

--->

-

-<plugin>

-

-   <extension point="org.eclipse.ui.newWizards">

-      <category

-            id="org.eclipse.emf.ecore.Wizard.category.ID"

-            name="%_UI_Wizard_category"/>

-      <wizard

-            id="org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.presentation.ProfileToFacetsConfigurationModelWizardID"

-            name="%_UI_ProfileToFacetsConfigurationModelWizard_label"

-            class="org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.presentation.ProfileToFacetsConfigurationModelWizard"

-            category="org.eclipse.emf.ecore.Wizard.category.ID"

-            icon="icons/profileToFacets.png">

-         <description>%_UI_ProfileToFacetsConfigurationModelWizard_description</description>

-         <selection class="org.eclipse.core.resources.IResource"/>

-      </wizard>

-   </extension>

-

-   <extension point="org.eclipse.ui.editors">

-      <editor

-            id="org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.presentation.ProfileToFacetsConfigurationEditorID"

-            name="%_UI_ProfileToFacetsConfigurationEditor_label"

-            icon="icons/profileToFacets.png"

-            extensions="profiletofacetsconfiguration"

-            class="org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.presentation.ProfileToFacetsConfigurationEditor"

-            contributorClass="org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.presentation.ProfileToFacetsConfigurationActionBarContributor">

-      </editor>

-   </extension>

-   <extension

-         point="org.eclipse.ui.newWizards">

-      <wizard

-            category="org.eclipse.papyrus.wizards.category"

-            class="org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.presentation.ProfileToFacetsConfigurationModelWizard"

-            icon="icons/profileToFacets.png"

-            id="org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.presentation.ProfileToFacetsConfigurationModelWizardID"

-            name="%_UI_ProfileToFacetsConfigurationModelWizard_label">

-         <description>

-            %_UI_ProfileToFacetsConfigurationModelWizard_description

-         </description>

-         <selection

-               class="org.eclipse.core.resources.IResource">

-         </selection>

-      </wizard>

-   </extension>

-

-</plugin>

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/presentation/ProfileToFacetConfigurationModelEditorPlugin.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/presentation/ProfileToFacetConfigurationModelEditorPlugin.java
deleted file mode 100644
index 7203c95be2e..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/presentation/ProfileToFacetConfigurationModelEditorPlugin.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.presentation;

-

-import org.eclipse.emf.common.EMFPlugin;

-

-import org.eclipse.emf.common.ui.EclipseUIPlugin;

-

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

-

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-

-import org.eclipse.uml2.uml.edit.UMLEditPlugin;

-

-/**

- * This is the central singleton for the ProfileToFacetConfigurationModel editor plugin.

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

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

- * @generated

- */

-public final class ProfileToFacetConfigurationModelEditorPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

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

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

-	 * @generated

-	 */

-	public static final ProfileToFacetConfigurationModelEditorPlugin INSTANCE = new ProfileToFacetConfigurationModelEditorPlugin();

-	

-	/**

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

-		super

-			(new ResourceLocator [] {

-				EcoreEditPlugin.INSTANCE,

-				UMLEditPlugin.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/org.eclipse.papyrus.profile.facets.configuration.editor/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/presentation/ProfileToFacetsConfigurationActionBarContributor.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/presentation/ProfileToFacetsConfigurationActionBarContributor.java
deleted file mode 100644
index 38a0dd6bb10..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/presentation/ProfileToFacetsConfigurationActionBarContributor.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.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 ProfileToFacetsConfiguration model editor.

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

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

- * @generated

- */

-public class ProfileToFacetsConfigurationActionBarContributor

-	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(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet");

-				}

-				catch (PartInitException exception) {

-					ProfileToFacetConfigurationModelEditorPlugin.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(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {

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

-		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("profiletofacetsconfiguration-settings"));

-		toolBarManager.add(new Separator("profiletofacetsconfiguration-additions"));

-	}

-

-	/**

-	 * 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(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_ProfileToFacetsConfigurationEditor_menu"), "org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfigurationMenuID");

-		menuManager.insertAfter("additions", submenuManager);

-		submenuManager.add(new Separator("settings"));

-		submenuManager.add(new Separator("actions"));

-		submenuManager.add(new Separator("additions"));

-		submenuManager.add(new Separator("additions-end"));

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		submenuManager.insertBefore("additions", createChildMenuManager);

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		submenuManager.insertBefore("additions", createSiblingMenuManager);

-

-		// 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(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-

-		submenuManager = new MenuManager(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-	}

-

-	/**

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

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction);

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction);

-

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

-	}

-

-}
\ No newline at end of file
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/presentation/ProfileToFacetsConfigurationEditor.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/presentation/ProfileToFacetsConfigurationEditor.java
deleted file mode 100644
index 9da52f2cc93..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/presentation/ProfileToFacetsConfigurationEditor.java
+++ /dev/null
@@ -1,1822 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.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.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.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.swt.SWT;

-

-import org.eclipse.swt.custom.CTabFolder;

-

-import org.eclipse.swt.dnd.DND;

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

-

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

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

-

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

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

-

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

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

-

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

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

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

-

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

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

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

-

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-

-import org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.provider.ProfileToFacetsConfigurationItemProviderAdapterFactory;

-

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;

-

-

-/**

- * This is an example of a ProfileToFacetsConfiguration model editor.

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

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

- * @generated

- */

-public class ProfileToFacetsConfigurationEditor

-	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 PropertySheetPage 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(ProfileToFacetsConfigurationEditor.this);

-

-						setCurrentViewer(contentOutlineViewer);

-					}

-				}

-				else if (p instanceof PropertySheet) {

-					if (((PropertySheet)p).getCurrentPage() == propertySheetPage) {

-						getActionBarContributor().setActiveEditor(ProfileToFacetsConfigurationEditor.this);

-						handleActivate();

-					}

-				}

-				else if (p == ProfileToFacetsConfigurationEditor.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);

-			}

-		};

-

-	/**

-	 * 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 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(ProfileToFacetsConfigurationEditor.this, false);

-									 }

-								 }

-							 });

-					}

-

-					if (!visitor.getChangedResources().isEmpty()) {

-						getSite().getShell().getDisplay().asyncExec

-							(new Runnable() {

-								 public void run() {

-									 changedResources.addAll(visitor.getChangedResources());

-									 if (getSite().getPage().getActiveEditor() == ProfileToFacetsConfigurationEditor.this) {

-										 handleActivate();

-									 }

-								 }

-							 });

-					}

-				}

-				catch (CoreException exception) {

-					ProfileToFacetConfigurationModelEditorPlugin.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(ProfileToFacetsConfigurationEditor.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.profile.facets.configuration.editor",

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

-					ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(diagnostic);

-					}

-					catch (CoreException exception) {

-						ProfileToFacetConfigurationModelEditorPlugin.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"),

-				 getString("_WARN_FileConflict"));

-	}

-

-	/**

-	 * This creates a model editor.

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

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

-	 * @generated

-	 */

-	public ProfileToFacetsConfigurationEditor() {

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

-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new UMLItemProviderAdapterFactory());

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

-								  }

-								  if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {

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

-		contextMenu.add(new Separator("additions"));

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

-		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.profile.facets.configuration.editor",

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()),

-					 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.profile.facets.configuration.editor",

-					 0,

-					 getString("_UI_CreateModelError_message", resource.getURI()),

-					 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(), ProfileToFacetsConfigurationEditor.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"));

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), ProfileToFacetsConfigurationEditor.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"));

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), ProfileToFacetsConfigurationEditor.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"));

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), ProfileToFacetsConfigurationEditor.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"));

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), ProfileToFacetsConfigurationEditor.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"));

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label"));

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String [] {"a", "b"});

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label"));

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-					new ViewerPane(getSite().getPage(), ProfileToFacetsConfigurationEditor.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"));

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label"));

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"});

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));

-			}

-

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

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

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

-		if (propertySheetPage == null) {

-			propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						ProfileToFacetsConfigurationEditor.this.setSelectionToViewer(selection);

-						ProfileToFacetsConfigurationEditor.this.setFocus();

-					}

-

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

-			propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		}

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

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

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

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

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

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

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

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

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

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-

-		// 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 : editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream. 

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

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

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

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

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

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

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

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

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public void gotoMarker(IMarker marker) {

-		try {

-			if (marker.getType().equals(EValidator.MARKER)) {

-				String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);

-				if (uriAttribute != null) {

-					URI uri = URI.createURI(uriAttribute);

-					EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);

-					if (eObject != null) {

-					  setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));

-					}

-				}

-			}

-		}

-		catch (CoreException exception) {

-			ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.log(exception);

-		}

-	}

-

-	/**

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

-						break;

-					}

-					case 1: {

-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));

-						break;

-					}

-					default: {

-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));

-						break;

-					}

-				}

-			}

-			else {

-				statusLineManager.setMessage("");

-			}

-		}

-	}

-

-	/**

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

-		}

-

-		if (propertySheetPage != null) {

-			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/org.eclipse.papyrus.profile.facets.configuration.editor/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/presentation/ProfileToFacetsConfigurationModelWizard.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/presentation/ProfileToFacetsConfigurationModelWizard.java
deleted file mode 100644
index db93321d20d..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration.editor/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/presentation/ProfileToFacetsConfigurationModelWizard.java
+++ /dev/null
@@ -1,632 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.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.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationFactory;

-import org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage;

-import org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.provider.ProfileToFacetConfigurationModelEditPlugin;

-

-

-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 ProfileToFacetsConfigurationModelWizard 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(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_ProfileToFacetsConfigurationEditorFilenameExtensions").split("\\s*,\\s*")));

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

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

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

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-		ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_ProfileToFacetsConfigurationEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

-

-	/**

-	 * This caches an instance of the model package.

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

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

-	 * @generated

-	 */

-	protected ProfileToFacetsConfigurationPackage profileToFacetsConfigurationPackage = ProfileToFacetsConfigurationPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

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

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

-	 * @generated

-	 */

-	protected ProfileToFacetsConfigurationFactory profileToFacetsConfigurationFactory = profileToFacetsConfigurationPackage.getProfileToFacetsConfigurationFactory();

-

-	/**

-	 * This is the file creation page.

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

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

-	 * @generated

-	 */

-	protected ProfileToFacetsConfigurationModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

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

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

-	 * @generated

-	 */

-	protected ProfileToFacetsConfigurationModelWizardInitialObjectCreationPage 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(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getImage("full/wizban/NewProfileToFacetsConfiguration")));

-	}

-

-	/**

-	 * 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 : profileToFacetsConfigurationPackage.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)profileToFacetsConfigurationPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = profileToFacetsConfigurationFactory.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) {

-							ProfileToFacetConfigurationModelEditorPlugin.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(), ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

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

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

-	 * @generated

-	 */

-	public class ProfileToFacetsConfigurationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

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

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

-		 * @generated

-		 */

-		public ProfileToFacetsConfigurationModelWizardNewFileCreationPage(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";

-					setErrorMessage(ProfileToFacetConfigurationModelEditorPlugin.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 ProfileToFacetsConfigurationModelWizardInitialObjectCreationPage 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 ProfileToFacetsConfigurationModelWizardInitialObjectCreationPage(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(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_ModelObject"));

-

-				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(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));

-

-				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 ProfileToFacetConfigurationModelEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");

-			}

-			catch(MissingResourceException mre) {

-				ProfileToFacetConfigurationModelEditorPlugin.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(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {

-					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 ProfileToFacetsConfigurationModelWizardNewFileCreationPage("Whatever", selection);

-		newFileCreationPage.setTitle(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_ProfileToFacetsConfigurationModelWizard_label"));

-		newFileCreationPage.setDescription(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_ProfileToFacetsConfigurationModelWizard_description"));

-		newFileCreationPage.setFileName(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_ProfileToFacetsConfigurationEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));

-		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 = ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_ProfileToFacetsConfigurationEditorFilenameDefaultBase");

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;

-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new ProfileToFacetsConfigurationModelWizardInitialObjectCreationPage("Whatever2");

-		initialObjectCreationPage.setTitle(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_ProfileToFacetsConfigurationModelWizard_label"));

-		initialObjectCreationPage.setDescription(ProfileToFacetConfigurationModelEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));

-		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/org.eclipse.papyrus.profile.facets.configuration/.classpath b/sandbox/org.eclipse.papyrus.profile.facets.configuration/.classpath
deleted file mode 100644
index 45f024e850e..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/.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/org.eclipse.papyrus.profile.facets.configuration/.project b/sandbox/org.eclipse.papyrus.profile.facets.configuration/.project
deleted file mode 100644
index 34a809f575c..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.profile.facets.configuration</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/org.eclipse.papyrus.profile.facets.configuration/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.profile.facets.configuration/META-INF/MANIFEST.MF
deleted file mode 100644
index 526f5c74c0a..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.papyrus.profile.facets.configuration;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Bundle-ClassPath: .

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration,

- org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.impl,

- org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.util

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

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

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

- org.eclipse.uml2.uml;visibility:=reexport

-Bundle-ActivationPolicy: lazy

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/build.properties b/sandbox/org.eclipse.papyrus.profile.facets.configuration/build.properties
deleted file mode 100644
index 1a3a48b2220..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-bin.includes = .,\

-               model/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties

-jars.compile.order = .

-source.. = src/

-output.. = bin/

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/model/profileToFacetConfigurationModel.ecore b/sandbox/org.eclipse.papyrus.profile.facets.configuration/model/profileToFacetConfigurationModel.ecore
deleted file mode 100644
index 4aa2d267478..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/model/profileToFacetConfigurationModel.ecore
+++ /dev/null
@@ -1,18 +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="profileToFacetsConfiguration"

-    nsURI="http://www.eclipse.org/Papyrus/profileToFacetsConfiguration" nsPrefix="profileToFacetsConfiguration">

-  <eClassifiers xsi:type="ecore:EClass" name="ProfileToFacetsConfiguration">

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

-        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Profile"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="basePackage" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="header" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaFolder" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral="src-gen"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="modelFolder" lowerBound="1"

-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"

-        defaultValueLiteral="resources"/>

-  </eClassifiers>

-</ecore:EPackage>

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/model/profileToFacetConfigurationModel.genmodel b/sandbox/org.eclipse.papyrus.profile.facets.configuration/model/profileToFacetConfigurationModel.genmodel
deleted file mode 100644
index fcf89bdf8fe..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/model/profileToFacetConfigurationModel.genmodel
+++ /dev/null
@@ -1,17 +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" modelDirectory="/org.eclipse.papyrus.profile.facets.configuration/src"

-    modelPluginID="org.eclipse.papyrus.profile.facets.configuration" modelName="ProfileToFacetConfigurationModel"

-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"

-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">

-  <foreignModel>profileToFacetConfigurationModel.ecore</foreignModel>

-  <genPackages prefix="ProfileToFacetsConfiguration" basePackage="org.eclipse.papyrus.profile.facets.configuration"

-      resource="XML" disposableProviderFactory="true" ecorePackage="profileToFacetConfigurationModel.ecore#/">

-    <genClasses ecoreClass="profileToFacetConfigurationModel.ecore#//ProfileToFacetsConfiguration">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute profileToFacetConfigurationModel.ecore#//ProfileToFacetsConfiguration/header"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference profileToFacetConfigurationModel.ecore#//ProfileToFacetsConfiguration/profile"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute profileToFacetConfigurationModel.ecore#//ProfileToFacetsConfiguration/basePackage"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/plugin.properties b/sandbox/org.eclipse.papyrus.profile.facets.configuration/plugin.properties
deleted file mode 100644
index bc39bc77639..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/plugin.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

-pluginName = ProfileToFacetConfigurationModel Model

-providerName = www.example.org

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/plugin.xml b/sandbox/org.eclipse.papyrus.profile.facets.configuration/plugin.xml
deleted file mode 100644
index ebb8d7b0f22..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

- <copyright>

- </copyright>

-

- $Id$

--->

-

-<plugin>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <package

-            uri="http://www.eclipse.org/Papyrus/profileToFacetsConfiguration"

-            class="org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage"

-            genModel="model/profileToFacetConfigurationModel.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.extension_parser">

-      <parser

-            type="profiletofacetsconfiguration"

-            class="org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.util.ProfileToFacetsConfigurationResourceFactoryImpl"/>

-   </extension>

-

-</plugin>

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/ProfileToFacetsConfiguration.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/ProfileToFacetsConfiguration.java
deleted file mode 100644
index d0456a3a0ef..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/ProfileToFacetsConfiguration.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration;

-

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

-

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

-

-/**

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

- * A representation of the model object '<em><b>Profile To Facets Configuration</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getProfile <em>Profile</em>}</li>

- *   <li>{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getBasePackage <em>Base Package</em>}</li>

- *   <li>{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getHeader <em>Header</em>}</li>

- *   <li>{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getJavaFolder <em>Java Folder</em>}</li>

- *   <li>{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getModelFolder <em>Model Folder</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage#getProfileToFacetsConfiguration()

- * @model

- * @generated

- */

-public interface ProfileToFacetsConfiguration extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Profile</b></em>' reference.

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

-	 * <p>

-	 * If the meaning of the '<em>Profile</em>' reference isn't clear,

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

-	 * </p>

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

-	 * @return the value of the '<em>Profile</em>' reference.

-	 * @see #setProfile(Profile)

-	 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage#getProfileToFacetsConfiguration_Profile()

-	 * @model required="true"

-	 * @generated

-	 */

-	Profile getProfile();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getProfile <em>Profile</em>}' reference.

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

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

-	 * @param value the new value of the '<em>Profile</em>' reference.

-	 * @see #getProfile()

-	 * @generated

-	 */

-	void setProfile(Profile value);

-

-	/**

-	 * Returns the value of the '<em><b>Base Package</b></em>' attribute.

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

-	 * <p>

-	 * If the meaning of the '<em>Base Package</em>' attribute isn't clear,

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

-	 * </p>

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

-	 * @return the value of the '<em>Base Package</em>' attribute.

-	 * @see #setBasePackage(String)

-	 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage#getProfileToFacetsConfiguration_BasePackage()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getBasePackage();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getBasePackage <em>Base Package</em>}' attribute.

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

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

-	 * @param value the new value of the '<em>Base Package</em>' attribute.

-	 * @see #getBasePackage()

-	 * @generated

-	 */

-	void setBasePackage(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Header</b></em>' attribute.

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

-	 * <p>

-	 * If the meaning of the '<em>Header</em>' attribute isn't clear,

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

-	 * </p>

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

-	 * @return the value of the '<em>Header</em>' attribute.

-	 * @see #setHeader(String)

-	 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage#getProfileToFacetsConfiguration_Header()

-	 * @model

-	 * @generated

-	 */

-	String getHeader();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getHeader <em>Header</em>}' attribute.

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

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

-	 * @param value the new value of the '<em>Header</em>' attribute.

-	 * @see #getHeader()

-	 * @generated

-	 */

-	void setHeader(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Java Folder</b></em>' attribute.

-	 * The default value is <code>"src-gen"</code>.

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

-	 * <p>

-	 * If the meaning of the '<em>Java Folder</em>' attribute isn't clear,

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

-	 * </p>

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

-	 * @return the value of the '<em>Java Folder</em>' attribute.

-	 * @see #setJavaFolder(String)

-	 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage#getProfileToFacetsConfiguration_JavaFolder()

-	 * @model default="src-gen" required="true"

-	 * @generated

-	 */

-	String getJavaFolder();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getJavaFolder <em>Java Folder</em>}' attribute.

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

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

-	 * @param value the new value of the '<em>Java Folder</em>' attribute.

-	 * @see #getJavaFolder()

-	 * @generated

-	 */

-	void setJavaFolder(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Model Folder</b></em>' attribute.

-	 * The default value is <code>"resources"</code>.

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

-	 * <p>

-	 * If the meaning of the '<em>Model Folder</em>' attribute isn't clear,

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

-	 * </p>

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

-	 * @return the value of the '<em>Model Folder</em>' attribute.

-	 * @see #setModelFolder(String)

-	 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage#getProfileToFacetsConfiguration_ModelFolder()

-	 * @model default="resources" required="true"

-	 * @generated

-	 */

-	String getModelFolder();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getModelFolder <em>Model Folder</em>}' attribute.

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

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

-	 * @param value the new value of the '<em>Model Folder</em>' attribute.

-	 * @see #getModelFolder()

-	 * @generated

-	 */

-	void setModelFolder(String value);

-

-} // ProfileToFacetsConfiguration

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/ProfileToFacetsConfigurationFactory.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/ProfileToFacetsConfigurationFactory.java
deleted file mode 100644
index 206c6a829a8..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/ProfileToFacetsConfigurationFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration;

-

-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.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage

- * @generated

- */

-public interface ProfileToFacetsConfigurationFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

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

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

-	 * @generated

-	 */

-	ProfileToFacetsConfigurationFactory eINSTANCE = org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.impl.ProfileToFacetsConfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Profile To Facets Configuration</em>'.

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

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

-	 * @return a new object of class '<em>Profile To Facets Configuration</em>'.

-	 * @generated

-	 */

-	ProfileToFacetsConfiguration createProfileToFacetsConfiguration();

-

-	/**

-	 * Returns the package supported by this factory.

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

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

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	ProfileToFacetsConfigurationPackage getProfileToFacetsConfigurationPackage();

-

-} //ProfileToFacetsConfigurationFactory

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/ProfileToFacetsConfigurationPackage.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/ProfileToFacetsConfigurationPackage.java
deleted file mode 100644
index 80b28db9bcb..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/ProfileToFacetsConfigurationPackage.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration;

-

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

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

-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 enum,</li>

- *   <li>and each data type</li>

- * </ul>

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

- * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationFactory

- * @model kind="package"

- * @generated

- */

-public interface ProfileToFacetsConfigurationPackage extends EPackage {

-	/**

-	 * The package name.

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

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

-	 * @generated

-	 */

-	String eNAME = "profileToFacetsConfiguration";

-

-	/**

-	 * The package namespace URI.

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

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

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/Papyrus/profileToFacetsConfiguration";

-

-	/**

-	 * The package namespace name.

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

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

-	 * @generated

-	 */

-	String eNS_PREFIX = "profileToFacetsConfiguration";

-

-	/**

-	 * The singleton instance of the package.

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

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

-	 * @generated

-	 */

-	ProfileToFacetsConfigurationPackage eINSTANCE = org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.impl.ProfileToFacetsConfigurationPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.impl.ProfileToFacetsConfigurationImpl <em>Profile To Facets Configuration</em>}' class.

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

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

-	 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.impl.ProfileToFacetsConfigurationImpl

-	 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.impl.ProfileToFacetsConfigurationPackageImpl#getProfileToFacetsConfiguration()

-	 * @generated

-	 */

-	int PROFILE_TO_FACETS_CONFIGURATION = 0;

-

-	/**

-	 * The feature id for the '<em><b>Profile</b></em>' reference.

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

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

-	 * @generated

-	 * @ordered

-	 */

-	int PROFILE_TO_FACETS_CONFIGURATION__PROFILE = 0;

-

-	/**

-	 * The feature id for the '<em><b>Base Package</b></em>' attribute.

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

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

-	 * @generated

-	 * @ordered

-	 */

-	int PROFILE_TO_FACETS_CONFIGURATION__BASE_PACKAGE = 1;

-

-	/**

-	 * The feature id for the '<em><b>Header</b></em>' attribute.

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

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

-	 * @generated

-	 * @ordered

-	 */

-	int PROFILE_TO_FACETS_CONFIGURATION__HEADER = 2;

-

-	/**

-	 * The feature id for the '<em><b>Java Folder</b></em>' attribute.

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

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

-	 * @generated

-	 * @ordered

-	 */

-	int PROFILE_TO_FACETS_CONFIGURATION__JAVA_FOLDER = 3;

-

-	/**

-	 * The feature id for the '<em><b>Model Folder</b></em>' attribute.

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

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

-	 * @generated

-	 * @ordered

-	 */

-	int PROFILE_TO_FACETS_CONFIGURATION__MODEL_FOLDER = 4;

-

-	/**

-	 * The number of structural features of the '<em>Profile To Facets Configuration</em>' class.

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

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

-	 * @generated

-	 * @ordered

-	 */

-	int PROFILE_TO_FACETS_CONFIGURATION_FEATURE_COUNT = 5;

-

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration <em>Profile To Facets Configuration</em>}'.

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

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

-	 * @return the meta object for class '<em>Profile To Facets Configuration</em>'.

-	 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration

-	 * @generated

-	 */

-	EClass getProfileToFacetsConfiguration();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getProfile <em>Profile</em>}'.

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

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

-	 * @return the meta object for the reference '<em>Profile</em>'.

-	 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getProfile()

-	 * @see #getProfileToFacetsConfiguration()

-	 * @generated

-	 */

-	EReference getProfileToFacetsConfiguration_Profile();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getBasePackage <em>Base Package</em>}'.

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

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

-	 * @return the meta object for the attribute '<em>Base Package</em>'.

-	 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getBasePackage()

-	 * @see #getProfileToFacetsConfiguration()

-	 * @generated

-	 */

-	EAttribute getProfileToFacetsConfiguration_BasePackage();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getHeader <em>Header</em>}'.

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

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

-	 * @return the meta object for the attribute '<em>Header</em>'.

-	 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getHeader()

-	 * @see #getProfileToFacetsConfiguration()

-	 * @generated

-	 */

-	EAttribute getProfileToFacetsConfiguration_Header();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getJavaFolder <em>Java Folder</em>}'.

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

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

-	 * @return the meta object for the attribute '<em>Java Folder</em>'.

-	 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getJavaFolder()

-	 * @see #getProfileToFacetsConfiguration()

-	 * @generated

-	 */

-	EAttribute getProfileToFacetsConfiguration_JavaFolder();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getModelFolder <em>Model Folder</em>}'.

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

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

-	 * @return the meta object for the attribute '<em>Model Folder</em>'.

-	 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration#getModelFolder()

-	 * @see #getProfileToFacetsConfiguration()

-	 * @generated

-	 */

-	EAttribute getProfileToFacetsConfiguration_ModelFolder();

-

-	/**

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

-	 */

-	ProfileToFacetsConfigurationFactory getProfileToFacetsConfigurationFactory();

-

-	/**

-	 * <!-- 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 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.profile.facets.configuration.profileToFacetsConfiguration.impl.ProfileToFacetsConfigurationImpl <em>Profile To Facets Configuration</em>}' class.

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

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

-		 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.impl.ProfileToFacetsConfigurationImpl

-		 * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.impl.ProfileToFacetsConfigurationPackageImpl#getProfileToFacetsConfiguration()

-		 * @generated

-		 */

-		EClass PROFILE_TO_FACETS_CONFIGURATION = eINSTANCE.getProfileToFacetsConfiguration();

-

-		/**

-		 * The meta object literal for the '<em><b>Profile</b></em>' reference feature.

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

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

-		 * @generated

-		 */

-		EReference PROFILE_TO_FACETS_CONFIGURATION__PROFILE = eINSTANCE.getProfileToFacetsConfiguration_Profile();

-

-		/**

-		 * The meta object literal for the '<em><b>Base Package</b></em>' attribute feature.

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

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

-		 * @generated

-		 */

-		EAttribute PROFILE_TO_FACETS_CONFIGURATION__BASE_PACKAGE = eINSTANCE.getProfileToFacetsConfiguration_BasePackage();

-

-		/**

-		 * The meta object literal for the '<em><b>Header</b></em>' attribute feature.

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

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

-		 * @generated

-		 */

-		EAttribute PROFILE_TO_FACETS_CONFIGURATION__HEADER = eINSTANCE.getProfileToFacetsConfiguration_Header();

-

-		/**

-		 * The meta object literal for the '<em><b>Java Folder</b></em>' attribute feature.

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

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

-		 * @generated

-		 */

-		EAttribute PROFILE_TO_FACETS_CONFIGURATION__JAVA_FOLDER = eINSTANCE.getProfileToFacetsConfiguration_JavaFolder();

-

-		/**

-		 * The meta object literal for the '<em><b>Model Folder</b></em>' attribute feature.

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

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

-		 * @generated

-		 */

-		EAttribute PROFILE_TO_FACETS_CONFIGURATION__MODEL_FOLDER = eINSTANCE.getProfileToFacetsConfiguration_ModelFolder();

-

-	}

-

-} //ProfileToFacetsConfigurationPackage

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/impl/ProfileToFacetsConfigurationFactoryImpl.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/impl/ProfileToFacetsConfigurationFactoryImpl.java
deleted file mode 100644
index 700db1386ab..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/impl/ProfileToFacetsConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.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.profile.facets.configuration.profileToFacetsConfiguration.*;

-

-/**

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

- * An implementation of the model <b>Factory</b>.

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

- * @generated

- */

-public class ProfileToFacetsConfigurationFactoryImpl extends EFactoryImpl implements ProfileToFacetsConfigurationFactory {

-	/**

-	 * Creates the default factory implementation.

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

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

-	 * @generated

-	 */

-	public static ProfileToFacetsConfigurationFactory init() {

-		try {

-			ProfileToFacetsConfigurationFactory theProfileToFacetsConfigurationFactory = (ProfileToFacetsConfigurationFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/Papyrus/profileToFacetsConfiguration"); 

-			if (theProfileToFacetsConfigurationFactory != null) {

-				return theProfileToFacetsConfigurationFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new ProfileToFacetsConfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

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

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

-	 * @generated

-	 */

-	public ProfileToFacetsConfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION: return createProfileToFacetsConfiguration();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public ProfileToFacetsConfiguration createProfileToFacetsConfiguration() {

-		ProfileToFacetsConfigurationImpl profileToFacetsConfiguration = new ProfileToFacetsConfigurationImpl();

-		return profileToFacetsConfiguration;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public ProfileToFacetsConfigurationPackage getProfileToFacetsConfigurationPackage() {

-		return (ProfileToFacetsConfigurationPackage)getEPackage();

-	}

-

-	/**

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

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

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static ProfileToFacetsConfigurationPackage getPackage() {

-		return ProfileToFacetsConfigurationPackage.eINSTANCE;

-	}

-

-} //ProfileToFacetsConfigurationFactoryImpl

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/impl/ProfileToFacetsConfigurationImpl.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/impl/ProfileToFacetsConfigurationImpl.java
deleted file mode 100644
index 52b69fd4a41..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/impl/ProfileToFacetsConfigurationImpl.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.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.emf.ecore.impl.EObjectImpl;

-

-import org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration;

-import org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage;

-

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

-

-/**

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

- * An implementation of the model object '<em><b>Profile To Facets Configuration</b></em>'.

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

- * <p>

- * The following features are implemented:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.impl.ProfileToFacetsConfigurationImpl#getProfile <em>Profile</em>}</li>

- *   <li>{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.impl.ProfileToFacetsConfigurationImpl#getBasePackage <em>Base Package</em>}</li>

- *   <li>{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.impl.ProfileToFacetsConfigurationImpl#getHeader <em>Header</em>}</li>

- *   <li>{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.impl.ProfileToFacetsConfigurationImpl#getJavaFolder <em>Java Folder</em>}</li>

- *   <li>{@link org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.impl.ProfileToFacetsConfigurationImpl#getModelFolder <em>Model Folder</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class ProfileToFacetsConfigurationImpl extends EObjectImpl implements ProfileToFacetsConfiguration {

-	/**

-	 * The cached value of the '{@link #getProfile() <em>Profile</em>}' reference.

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

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

-	 * @see #getProfile()

-	 * @generated

-	 * @ordered

-	 */

-	protected Profile profile;

-

-	/**

-	 * The default value of the '{@link #getBasePackage() <em>Base Package</em>}' attribute.

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

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

-	 * @see #getBasePackage()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String BASE_PACKAGE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getBasePackage() <em>Base Package</em>}' attribute.

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

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

-	 * @see #getBasePackage()

-	 * @generated

-	 * @ordered

-	 */

-	protected String basePackage = BASE_PACKAGE_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getHeader() <em>Header</em>}' attribute.

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

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

-	 * @see #getHeader()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String HEADER_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getHeader() <em>Header</em>}' attribute.

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

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

-	 * @see #getHeader()

-	 * @generated

-	 * @ordered

-	 */

-	protected String header = HEADER_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getJavaFolder() <em>Java Folder</em>}' attribute.

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

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

-	 * @see #getJavaFolder()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String JAVA_FOLDER_EDEFAULT = "src-gen";

-

-	/**

-	 * The cached value of the '{@link #getJavaFolder() <em>Java Folder</em>}' attribute.

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

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

-	 * @see #getJavaFolder()

-	 * @generated

-	 * @ordered

-	 */

-	protected String javaFolder = JAVA_FOLDER_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getModelFolder() <em>Model Folder</em>}' attribute.

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

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

-	 * @see #getModelFolder()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String MODEL_FOLDER_EDEFAULT = "resources";

-

-	/**

-	 * The cached value of the '{@link #getModelFolder() <em>Model Folder</em>}' attribute.

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

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

-	 * @see #getModelFolder()

-	 * @generated

-	 * @ordered

-	 */

-	protected String modelFolder = MODEL_FOLDER_EDEFAULT;

-

-	/**

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

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

-	 * @generated

-	 */

-	protected ProfileToFacetsConfigurationImpl() {

-		super();

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return ProfileToFacetsConfigurationPackage.Literals.PROFILE_TO_FACETS_CONFIGURATION;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public Profile getProfile() {

-		if (profile != null && profile.eIsProxy()) {

-			InternalEObject oldProfile = (InternalEObject)profile;

-			profile = (Profile)eResolveProxy(oldProfile);

-			if (profile != oldProfile) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__PROFILE, oldProfile, profile));

-			}

-		}

-		return profile;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public Profile basicGetProfile() {

-		return profile;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public void setProfile(Profile newProfile) {

-		Profile oldProfile = profile;

-		profile = newProfile;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__PROFILE, oldProfile, profile));

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public String getBasePackage() {

-		return basePackage;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public void setBasePackage(String newBasePackage) {

-		String oldBasePackage = basePackage;

-		basePackage = newBasePackage;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__BASE_PACKAGE, oldBasePackage, basePackage));

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public String getHeader() {

-		return header;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public void setHeader(String newHeader) {

-		String oldHeader = header;

-		header = newHeader;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__HEADER, oldHeader, header));

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public String getJavaFolder() {

-		return javaFolder;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public void setJavaFolder(String newJavaFolder) {

-		String oldJavaFolder = javaFolder;

-		javaFolder = newJavaFolder;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__JAVA_FOLDER, oldJavaFolder, javaFolder));

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public String getModelFolder() {

-		return modelFolder;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public void setModelFolder(String newModelFolder) {

-		String oldModelFolder = modelFolder;

-		modelFolder = newModelFolder;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__MODEL_FOLDER, oldModelFolder, modelFolder));

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__PROFILE:

-				if (resolve) return getProfile();

-				return basicGetProfile();

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__BASE_PACKAGE:

-				return getBasePackage();

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__HEADER:

-				return getHeader();

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__JAVA_FOLDER:

-				return getJavaFolder();

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__MODEL_FOLDER:

-				return getModelFolder();

-		}

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

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__PROFILE:

-				setProfile((Profile)newValue);

-				return;

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__BASE_PACKAGE:

-				setBasePackage((String)newValue);

-				return;

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__HEADER:

-				setHeader((String)newValue);

-				return;

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__JAVA_FOLDER:

-				setJavaFolder((String)newValue);

-				return;

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__MODEL_FOLDER:

-				setModelFolder((String)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__PROFILE:

-				setProfile((Profile)null);

-				return;

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__BASE_PACKAGE:

-				setBasePackage(BASE_PACKAGE_EDEFAULT);

-				return;

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__HEADER:

-				setHeader(HEADER_EDEFAULT);

-				return;

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__JAVA_FOLDER:

-				setJavaFolder(JAVA_FOLDER_EDEFAULT);

-				return;

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__MODEL_FOLDER:

-				setModelFolder(MODEL_FOLDER_EDEFAULT);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__PROFILE:

-				return profile != null;

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__BASE_PACKAGE:

-				return BASE_PACKAGE_EDEFAULT == null ? basePackage != null : !BASE_PACKAGE_EDEFAULT.equals(basePackage);

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__HEADER:

-				return HEADER_EDEFAULT == null ? header != null : !HEADER_EDEFAULT.equals(header);

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__JAVA_FOLDER:

-				return JAVA_FOLDER_EDEFAULT == null ? javaFolder != null : !JAVA_FOLDER_EDEFAULT.equals(javaFolder);

-			case ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION__MODEL_FOLDER:

-				return MODEL_FOLDER_EDEFAULT == null ? modelFolder != null : !MODEL_FOLDER_EDEFAULT.equals(modelFolder);

-		}

-		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(" (basePackage: ");

-		result.append(basePackage);

-		result.append(", header: ");

-		result.append(header);

-		result.append(", javaFolder: ");

-		result.append(javaFolder);

-		result.append(", modelFolder: ");

-		result.append(modelFolder);

-		result.append(')');

-		return result.toString();

-	}

-

-} //ProfileToFacetsConfigurationImpl

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/impl/ProfileToFacetsConfigurationPackageImpl.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/impl/ProfileToFacetsConfigurationPackageImpl.java
deleted file mode 100644
index f70d0030821..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/impl/ProfileToFacetsConfigurationPackageImpl.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.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.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration;

-import org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationFactory;

-import org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage;

-

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

-

-/**

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

- * An implementation of the model <b>Package</b>.

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

- * @generated

- */

-public class ProfileToFacetsConfigurationPackageImpl extends EPackageImpl implements ProfileToFacetsConfigurationPackage {

-	/**

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

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

-	 * @generated

-	 */

-	private EClass profileToFacetsConfigurationEClass = 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.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private ProfileToFacetsConfigurationPackageImpl() {

-		super(eNS_URI, ProfileToFacetsConfigurationFactory.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 ProfileToFacetsConfigurationPackage#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 ProfileToFacetsConfigurationPackage init() {

-		if (isInited) return (ProfileToFacetsConfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(ProfileToFacetsConfigurationPackage.eNS_URI);

-

-		// Obtain or create and register package

-		ProfileToFacetsConfigurationPackageImpl theProfileToFacetsConfigurationPackage = (ProfileToFacetsConfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ProfileToFacetsConfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ProfileToFacetsConfigurationPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		UMLPackage.eINSTANCE.eClass();

-

-		// Create package meta-data objects

-		theProfileToFacetsConfigurationPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theProfileToFacetsConfigurationPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theProfileToFacetsConfigurationPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(ProfileToFacetsConfigurationPackage.eNS_URI, theProfileToFacetsConfigurationPackage);

-		return theProfileToFacetsConfigurationPackage;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public EClass getProfileToFacetsConfiguration() {

-		return profileToFacetsConfigurationEClass;

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public EReference getProfileToFacetsConfiguration_Profile() {

-		return (EReference)profileToFacetsConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public EAttribute getProfileToFacetsConfiguration_BasePackage() {

-		return (EAttribute)profileToFacetsConfigurationEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public EAttribute getProfileToFacetsConfiguration_Header() {

-		return (EAttribute)profileToFacetsConfigurationEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public EAttribute getProfileToFacetsConfiguration_JavaFolder() {

-		return (EAttribute)profileToFacetsConfigurationEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public EAttribute getProfileToFacetsConfiguration_ModelFolder() {

-		return (EAttribute)profileToFacetsConfigurationEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

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

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

-	 * @generated

-	 */

-	public ProfileToFacetsConfigurationFactory getProfileToFacetsConfigurationFactory() {

-		return (ProfileToFacetsConfigurationFactory)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

-		profileToFacetsConfigurationEClass = createEClass(PROFILE_TO_FACETS_CONFIGURATION);

-		createEReference(profileToFacetsConfigurationEClass, PROFILE_TO_FACETS_CONFIGURATION__PROFILE);

-		createEAttribute(profileToFacetsConfigurationEClass, PROFILE_TO_FACETS_CONFIGURATION__BASE_PACKAGE);

-		createEAttribute(profileToFacetsConfigurationEClass, PROFILE_TO_FACETS_CONFIGURATION__HEADER);

-		createEAttribute(profileToFacetsConfigurationEClass, PROFILE_TO_FACETS_CONFIGURATION__JAVA_FOLDER);

-		createEAttribute(profileToFacetsConfigurationEClass, PROFILE_TO_FACETS_CONFIGURATION__MODEL_FOLDER);

-	}

-

-	/**

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

-		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-

-		// Initialize classes and features; add operations and parameters

-		initEClass(profileToFacetsConfigurationEClass, ProfileToFacetsConfiguration.class, "ProfileToFacetsConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getProfileToFacetsConfiguration_Profile(), theUMLPackage.getProfile(), null, "profile", null, 1, 1, ProfileToFacetsConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getProfileToFacetsConfiguration_BasePackage(), ecorePackage.getEString(), "basePackage", null, 1, 1, ProfileToFacetsConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getProfileToFacetsConfiguration_Header(), theEcorePackage.getEString(), "header", null, 0, 1, ProfileToFacetsConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getProfileToFacetsConfiguration_JavaFolder(), ecorePackage.getEString(), "javaFolder", "src-gen", 1, 1, ProfileToFacetsConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getProfileToFacetsConfiguration_ModelFolder(), theEcorePackage.getEString(), "modelFolder", "resources", 1, 1, ProfileToFacetsConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} //ProfileToFacetsConfigurationPackageImpl

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationAdapterFactory.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationAdapterFactory.java
deleted file mode 100644
index 433fa0674c3..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationAdapterFactory.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.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.profile.facets.configuration.profileToFacetsConfiguration.*;

-

-/**

- * <!-- 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.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage

- * @generated

- */

-public class ProfileToFacetsConfigurationAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

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

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

-	 * @generated

-	 */

-	protected static ProfileToFacetsConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

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

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

-	 * @generated

-	 */

-	public ProfileToFacetsConfigurationAdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = ProfileToFacetsConfigurationPackage.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 ProfileToFacetsConfigurationSwitch<Adapter> modelSwitch =

-		new ProfileToFacetsConfigurationSwitch<Adapter>() {

-			@Override

-			public Adapter caseProfileToFacetsConfiguration(ProfileToFacetsConfiguration object) {

-				return createProfileToFacetsConfigurationAdapter();

-			}

-			@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.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration <em>Profile To Facets 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.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration

-	 * @generated

-	 */

-	public Adapter createProfileToFacetsConfigurationAdapter() {

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

-	}

-

-} //ProfileToFacetsConfigurationAdapterFactory

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationResourceFactoryImpl.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationResourceFactoryImpl.java
deleted file mode 100644
index 0123250296b..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationResourceFactoryImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.util;

-

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

-

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

-

-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

-

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-/**

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

- * The <b>Resource Factory</b> associated with the package.

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

- * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.util.ProfileToFacetsConfigurationResourceImpl

- * @generated

- */

-public class ProfileToFacetsConfigurationResourceFactoryImpl extends ResourceFactoryImpl {

-	/**

-	 * Creates an instance of the resource factory.

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

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

-	 * @generated

-	 */

-	public ProfileToFacetsConfigurationResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

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

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

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		XMLResource result = new ProfileToFacetsConfigurationResourceImpl(uri);

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

-

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);

-

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

-		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

-

-		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);

-		return result;

-	}

-

-} //ProfileToFacetsConfigurationResourceFactoryImpl

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationResourceImpl.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationResourceImpl.java
deleted file mode 100644
index 8978b845897..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationResourceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.util;

-

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

-

-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

-

-/**

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

- * The <b>Resource </b> associated with the package.

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

- * @see org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.util.ProfileToFacetsConfigurationResourceFactoryImpl

- * @generated

- */

-public class ProfileToFacetsConfigurationResourceImpl extends XMLResourceImpl {

-	/**

-	 * Creates an instance of the resource.

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

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

-	 * @param uri the URI of the new resource.

-	 * @generated

-	 */

-	public ProfileToFacetsConfigurationResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} //ProfileToFacetsConfigurationResourceImpl

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationSwitch.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationSwitch.java
deleted file mode 100644
index 186d6eebcde..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationSwitch.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.util;

-

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

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

-

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

-

-import org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.*;

-

-/**

- * <!-- 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.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage

- * @generated

- */

-public class ProfileToFacetsConfigurationSwitch<T> extends Switch<T> {

-	/**

-	 * The cached model package

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

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

-	 * @generated

-	 */

-	protected static ProfileToFacetsConfigurationPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

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

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

-	 * @generated

-	 */

-	public ProfileToFacetsConfigurationSwitch() {

-		if (modelPackage == null) {

-			modelPackage = ProfileToFacetsConfigurationPackage.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 ProfileToFacetsConfigurationPackage.PROFILE_TO_FACETS_CONFIGURATION: {

-				ProfileToFacetsConfiguration profileToFacetsConfiguration = (ProfileToFacetsConfiguration)theEObject;

-				T result = caseProfileToFacetsConfiguration(profileToFacetsConfiguration);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			default: return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Profile To Facets 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>Profile To Facets Configuration</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseProfileToFacetsConfiguration(ProfileToFacetsConfiguration 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;

-	}

-

-} //ProfileToFacetsConfigurationSwitch

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationXMLProcessor.java b/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationXMLProcessor.java
deleted file mode 100644
index 02a5df19cf3..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.configuration/src/org/eclipse/papyrus/profile/facets/configuration/profileToFacetsConfiguration/util/ProfileToFacetsConfigurationXMLProcessor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**

- * <copyright>

- * </copyright>

- *

- * $Id$

- */

-package org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.util;

-

-import java.util.Map;

-

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

-

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

-

-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

-

-import org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfigurationPackage;

-

-/**

- * This class contains helper methods to serialize and deserialize XML documents

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

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

- * @generated

- */

-public class ProfileToFacetsConfigurationXMLProcessor extends XMLProcessor {

-

-	/**

-	 * Public constructor to instantiate the helper.

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

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

-	 * @generated

-	 */

-	public ProfileToFacetsConfigurationXMLProcessor() {

-		super((EPackage.Registry.INSTANCE));

-		ProfileToFacetsConfigurationPackage.eINSTANCE.eClass();

-	}

-	

-	/**

-	 * Register for "*" and "xml" file extensions the ProfileToFacetsConfigurationResourceFactoryImpl factory.

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

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

-	 * @generated

-	 */

-	@Override

-	protected Map<String, Resource.Factory> getRegistrations() {

-		if (registrations == null) {

-			super.getRegistrations();

-			registrations.put(XML_EXTENSION, new ProfileToFacetsConfigurationResourceFactoryImpl());

-			registrations.put(STAR_EXTENSION, new ProfileToFacetsConfigurationResourceFactoryImpl());

-		}

-		return registrations;

-	}

-

-} //ProfileToFacetsConfigurationXMLProcessor

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/.classpath b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/.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/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/.project b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/.project
deleted file mode 100644
index f95d19edab2..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.profile.facets.generation.acceleo.ui</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/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/.settings/org.eclipse.core.resources.prefs b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index c70fa79ab83..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Jun 06 14:24:28 CEST 2011

-eclipse.preferences.version=1

-encoding//src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/messages/messages.properties=ISO-8859-1

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 394868dcd9a..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon May 23 10:21:17 CEST 2011

-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/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index f3473879ea1..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.profile.facets.generation.acceleo.ui;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.profile.facets.generation.acceleo.ui.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.expressions,
- org.eclipse.core.expressions,
- org.eclipse.papyrus.properties,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.core.resources,
- org.eclipse.papyrus.profile.facets.configuration;bundle-version="1.0.0",
- org.eclipse.papyrus.log,
- org.eclipse.jdt.core,
- org.eclipse.emf.facet.infra.query,
- org.eclipse.m2m.qvt.oml,
- org.eclipse.papyrus.profile.facets.generation.acceleo,
- org.eclipse.emf.facet.infra.facet,
- org.eclipse.papyrus.profile.facets.generation,
- org.eclipse.acceleo.engine;bundle-version="3.1.0",
- org.eclipse.jdt.ui,
- org.eclipse.papyrus.diagram.common,
- org.eclipse.emf.facet.infra.facet.core,
- org.eclipse.emf.facet.infra.query.core,
- org.eclipse.papyrus.eclipse.project.editors;bundle-version="0.8.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/about.html b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/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/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/build.properties b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/build.properties
deleted file mode 100644
index 6f20375d6c7..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/icons/profileToFacets.png b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/icons/profileToFacets.png
deleted file mode 100644
index 2f45b451b59..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/icons/profileToFacets.png
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/plugin.xml b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/plugin.xml
deleted file mode 100644
index 8484023f649..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/plugin.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.ui.popup.any">

-         <command

-               commandId="org.eclipse.papyrus.profile.facets.generation.acceleo.ui.generate.facets.from.profile"

-               icon="icons/profileToFacets.png"

-               label="Generate Facets From UML Profile"

-               mnemonic="G"

-               style="push"

-               tooltip="Generate the facets from the UML Profile">

-            <visibleWhen

-                  checkEnabled="true">

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commands">

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Generate the facets from a UML profile"

-            id="org.eclipse.papyrus.profile.facets.generation.acceleo.ui.generate.facets.from.profile"

-            name="Generate Facets From UML Profile">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.papyrus.profile.facets.generation.acceleo.ui.handler.GenerateFacetsHandler"

-            commandId="org.eclipse.papyrus.profile.facets.generation.acceleo.ui.generate.facets.from.profile">

-         <activeWhen>

-            <with

-                  variable="selection">

-               <test

-                     forcePluginActivation="true"

-                     property="org.eclipse.papyrus.profile.facets.generation.acceleo.ui.handler.propertyTester.isProfileToFacetsConfigurationFile"

-                     value="true">

-               </test>

-            </with>

-         </activeWhen>

-      </handler>

-   </extension>

-   <extension

-         point="org.eclipse.core.expressions.propertyTesters">

-      <propertyTester

-            class="org.eclipse.papyrus.profile.facets.generation.acceleo.ui.handler.tester.HandlerPropertyTester"

-            id="org.eclipse.papyrus.profile.facets.generation.acceleo.ui.handler.propertyTester"

-            namespace="org.eclipse.papyrus.profile.facets.generation.acceleo.ui.handler.propertyTester"

-            properties="isProfileToFacetsConfigurationFile"

-            type="org.eclipse.jface.viewers.ISelection">

-      </propertyTester>

-   </extension>

-   <extension

-         point="org.eclipse.emf.facet.infra.facet.registration">

-      <facetset

-            file="org.eclipse.papyrus.profile.facets.generation.acceleo.ui.facetset2">

-      </facetset>

-   </extension>

-   <extension

-         point="org.eclipse.emf.facet.infra.query.registration">

-      <modelqueryset

-            file="src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/handler/GenerateFacetsHandler.java">

-      </modelqueryset>

-   </extension>

-

-</plugin>

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/Activator.java b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/Activator.java
deleted file mode 100644
index 0dd8666fad7..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/Activator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.profile.facets.generation.acceleo.ui;

-

-import org.eclipse.papyrus.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.profile.facets.generation.acceleo.ui"; //$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(final 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(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/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/handler/FacetGenerator.java b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/handler/FacetGenerator.java
deleted file mode 100644
index 880ba60110c..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/handler/FacetGenerator.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.profile.facets.generation.acceleo.ui.handler;

-

-import java.io.File;

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Set;

-

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

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

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

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

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

-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.facet.infra.facet.FacetSet;

-import org.eclipse.emf.facet.infra.query.ModelQuery;

-import org.eclipse.emf.facet.infra.query.ModelQuerySet;

-import org.eclipse.m2m.qvt.oml.BasicModelExtent;

-import org.eclipse.m2m.qvt.oml.ExecutionContextImpl;

-import org.eclipse.m2m.qvt.oml.ExecutionDiagnostic;

-import org.eclipse.m2m.qvt.oml.ModelExtent;

-import org.eclipse.m2m.qvt.oml.TransformationExecutor;

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

-import org.eclipse.papyrus.profile.facets.generation.acceleo.Generate;

-import org.eclipse.papyrus.profile.facets.generation.postgeneration.FacetSetSplitter;

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

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

-

-/**

- * 

- * This generator is used to "transform" a UML profile in EMF-Facet Facets. Its allows to generate the following files :

- * <ul>

- * <li>facetSet</li>

- * <li>QuerySet</li>

- * <li>java source</li>

- * </ul>

- * 

- */

-public class FacetGenerator {

-

-	/** the profile used to generate the facets */

-	private final Profile profile;

-

-	/** the base name for the java package */

-	private final String basePackageName;

-

-	/** the uri of the model folder */

-	private  URI targetModelFolder;

-

-	/** the java source folder */

-	private File javaTargetFolder;

-

-	/** the header for the java source */

-	private String header;

-

-	/** the list owning the generated ModelQuerySet */

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

-

-	/** the list owning the generated FacetSet */

-	private final List<FacetSet> generatedFacetSet = new ArrayList<FacetSet>();

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param profile

-	 *        the profile to transform into facet

-	 * @param basePackageName

-	 *        the base name for the java package generation

-	 */

-	public FacetGenerator(final Profile profile, final String basePackageName) {

-		this.profile = profile;

-		this.basePackageName = basePackageName;

-	}

-

-	/**

-	 * Setter for {@link #targetModelFolder}

-	 * 

-	 * @param targetModelURI

-	 *        the URI of the model folder

-	 * 

-	 */

-	public void setQVTTransformationParameters(final URI targetModelURI){

-		this.targetModelFolder = targetModelURI;

-	}

-

-	/**

-	 * 

-	 * @param header

-	 *        the header for the java generation

-	 * @param javaTargetFolderPath

-	 *        the folder for the java source

-	 */

-	public void setAcceleoTransformationParameter(final String header, final String javaTargetFolderPath){

-		this.javaTargetFolder = new File(javaTargetFolderPath);

-		this.header = header;

-	}

-

-	/**

-	 * this method allows to generate the facetSet, the querySet and the required java source

-	 */

-	public void generate() {

-		runQVTTransformation(this.profile, this.targetModelFolder, this.basePackageName);

-		runAcceleoTransformation(this.javaTargetFolder);

-	}

-

-	/**

-	 * 

-	 * @param sourceProfile

-	 *        the source profile

-	 * @param targetURI

-	 *        the target folder for the generated files

-	 * @param packageName

-	 *        the package name

-	 */

-	private void runQVTTransformation(final Profile sourceProfile, final URI targetURI, final String packageName) {

-		URI transformationURI = URI.createPlatformPluginURI("/org.eclipse.papyrus.profile.facets.generation/transforms/ProfileToFacetSet.qvto", true); //$NON-NLS-1$

-		TransformationExecutor executor = new TransformationExecutor(transformationURI);

-

-		//Transformation input

-		ModelExtent sourceProfileExtent = new BasicModelExtent(Collections.singletonList(sourceProfile));

-		ModelExtent umlEcoreExtent = new BasicModelExtent(Collections.singletonList(UMLPackage.eINSTANCE));

-		ModelExtent ecoreExtent = new BasicModelExtent(Collections.singletonList(EcorePackage.eINSTANCE));

-

-		//Transformation output

-		ModelExtent facetSetsExtent = new BasicModelExtent();

-		ModelExtent querySetExtent = new BasicModelExtent();

-

-		ModelExtent[] extents = new ModelExtent[]{ sourceProfileExtent, umlEcoreExtent, ecoreExtent, facetSetsExtent, querySetExtent };

-

-		ExecutionContextImpl context = new ExecutionContextImpl();

-		context.setConfigProperty("keepModeling", true); //$NON-NLS-1$

-		context.setConfigProperty("packageName", packageName); //$NON-NLS-1$

-		//context.setLog(new WriterLog(new OutputStreamWriter(System.out)));

-

-		ExecutionDiagnostic result = executor.execute(context, extents);

-

-

-

-		if(result.getSeverity() == org.eclipse.emf.common.util.Diagnostic.OK) {

-			List<EObject> querySet = querySetExtent.getContents();

-			EObject querySetResult = querySet.get(0);

-

-			if(querySetResult instanceof ModelQuerySet) {

-				ModelQuerySet resultQuerySet = (ModelQuerySet)querySetResult;

-				ResourceSet resourceSet = new ResourceSetImpl();

-

-				URI queriesURI = URI.createURI("queries/" + resultQuerySet.getName() + ".querySet").resolve(targetURI); //$NON-NLS-1$ //$NON-NLS-2$

-				Resource querySetResource = resourceSet.createResource(queriesURI);

-				querySetResource.getContents().addAll(querySet);

-				this.generatedModelQuerySet.addAll(querySet);

-				try {

-					querySetResource.save(null);

-				} catch (IOException ex) {

-					ex.printStackTrace(System.err);

-				}

-			}

-

-			List<EObject> facetSets = facetSetsExtent.getContents();

-			EObject facetSetResult = facetSets.get(0);

-			if(facetSetResult instanceof FacetSet) {

-				FacetSet resultFacetSet = (FacetSet)facetSetResult;

-				ResourceSet resourceSet = new ResourceSetImpl();

-				Resource facetSetResource = resourceSet.createResource(URI.createURI("facets/" + resultFacetSet.getName() + ".facetSet").resolve(targetURI)); //$NON-NLS-1$ //$NON-NLS-2$

-				facetSetResource.getContents().add(resultFacetSet);

-

-				//				repairURI(resultFacetSet); //TODO

-

-				try {

-					facetSetResource.save(null);

-				} catch (IOException ex) {

-					ex.printStackTrace(System.err);

-				}

-

-				runFacetSetSplit(resultFacetSet);

-			}

-		} else {

-			IStatus status = BasicDiagnostic.toIStatus(result);

-			//Activator.getDefault().getLog().log(status);

-			System.err.println(status);

-		}

-		//return null;

-	}

-

-	public void repairURI2() {

-		for(int i = 0; i < this.generatedFacetSet.size(); i++) {

-			repairURI(this.generatedFacetSet.get(i));

-			try {

-				this.generatedFacetSet.get(i).eResource().save(null);

-			} catch (IOException e) {

-				// TODO Auto-generated catch block

-				e.printStackTrace();

-			}

-		}

-	}

-	private void repairURI(final FacetSet facetSet) {

-		if(facetSet.getFacets().isEmpty()) {

-			if(!facetSet.getESubpackages().isEmpty()) {

-				for(EPackage subPackage : facetSet.getESubpackages()) {

-					if(subPackage instanceof FacetSet) {

-						repairURI((FacetSet)subPackage);

-						break;

-					}

-				}

-

-			}

-		} else {

-			ModelQuery query = facetSet.getFacets().get(0).getConditionQuery();

-			Resource queryResource = query.eResource();

-			URI queryURI = queryResource.getURI();

-

-			System.out.print("Replacing " + queryURI + " by "); //$NON-NLS-1$ //$NON-NLS-2$

-

-			URI newURI = URI.createURI("emffacet:/query/" + queryURI.lastSegment().replace(".querySet", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-			queryResource.setURI(newURI);

-			System.out.println(newURI);

-			System.out.println();

-		}

-	}

-

-	private void runFacetSetSplit(final FacetSet facetSet) {

-		Set<Resource> resources = FacetSetSplitter.instance.splitFacetSet(facetSet);

-		List<EObject> contents = new ArrayList<EObject>();

-		Iterator<Resource> iter = resources.iterator();

-		while(iter.hasNext()) {

-			contents.addAll(iter.next().getContents());

-		}

-

-		for(int i = 0; i < contents.size(); i++) {

-			if(contents.get(i) instanceof FacetSet) {

-				this.generatedFacetSet.add((FacetSet)contents.get(i));

-			}

-		}

-	}

-

-	/**

-	 * generate the java source

-	 * 

-	 * @param targetFolder

-	 *        the target folder for the java source

-	 */

-	private void runAcceleoTransformation(  final File targetFolder) {

-		try {

-			//			targetFolder = new File("D:\\runtime-Neptune-New_configuration(1)\\tutu\\src-gen");

-			Generate generate = new Generate(this.profile, targetFolder, Collections.EMPTY_LIST);

-			//TODO a tester!

-			//			generate.addPropertiesFile(propertiesFile)

-			generate.setHeader(this.header);

-			//			generate.setHeader("");

-			generate.setPackageName(this.basePackageName);

-			//			generate.setPackageName("");

-			//			generate.setPackageName("oep.test");

-			generate.doGenerate(null);

-		} catch (IOException ex) {

-			ex.printStackTrace(System.err);

-		}

-	}

-

-	/**

-	 * Getter for {@link #generatedFacetSet}

-	 * 

-	 * @return

-	 *         the generated facetSet

-	 */

-	public List<FacetSet> getGeneratedFacetSet() {

-		return this.generatedFacetSet;

-	}

-

-	/**

-	 * Getter for {@link #getGeneratedQuerySet()}

-	 * 

-	 * @return

-	 *         the generated querySet

-	 */

-	public List<EObject> getGeneratedQuerySet() {

-		return this.generatedModelQuerySet;

-

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/handler/GenerateFacetsHandler.java b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/handler/GenerateFacetsHandler.java
deleted file mode 100644
index 27398ee9d3b..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/handler/GenerateFacetsHandler.java
+++ /dev/null
@@ -1,655 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.profile.facets.generation.acceleo.ui.handler;

-

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Set;

-

-import javax.xml.parsers.ParserConfigurationException;

-

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

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

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

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

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

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

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

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

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

-import org.eclipse.jdt.core.ICompilationUnit;

-import org.eclipse.jdt.core.IImportDeclaration;

-import org.eclipse.jdt.core.IJavaElement;

-import org.eclipse.jdt.core.IJavaProject;

-import org.eclipse.jdt.core.IPackageFragment;

-import org.eclipse.jdt.core.IPackageFragmentRoot;

-import org.eclipse.jdt.core.JavaCore;

-import org.eclipse.jdt.core.JavaModelException;

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

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

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

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

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

-import org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor;

-import org.eclipse.papyrus.eclipse.project.editors.project.EMFFacetProjectEditor;

-import org.eclipse.papyrus.profile.facets.configuration.profileToFacetsConfiguration.ProfileToFacetsConfiguration;

-import org.eclipse.papyrus.profile.facets.generation.acceleo.ui.Activator;

-import org.eclipse.papyrus.profile.facets.generation.acceleo.ui.messages.Messages;

-import org.eclipse.papyrus.properties.util.EMFHelper;

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

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

-import org.eclipse.ui.ISelectionService;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.handlers.HandlerUtil;

-import org.eclipse.uml2.common.util.UML2Util;

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

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

-import org.xml.sax.SAXException;

-

-/**

- * 

- * This handler provides the action to generate the facet from a UML Profile

- * 

- */

-public class GenerateFacetsHandler extends AbstractHandler {

-

-

-	/** the extension of the configuration file */

-	public static final String CONFIGURATION_FILE_EXTENSION = "profiletofacetsconfiguration"; //$NON-NLS-1$

-

-	/** the Java Source Folder for generated code */

-	private static final String JAVA_SOURCE_FOLDER = "src-gen"; //$NON-NLS-1$

-

-	/** the name of the extension point for the facet registration */

-	private static final String FACET_REGISTRATION = "org.eclipse.emf.facet.infra.facet.registration"; //$NON-NLS-1$

-

-	/** the name of the extension point for the query registration */

-	private static final String QUERY_REGISTRATION = "org.eclipse.emf.facet.infra.query.registration"; //$NON-NLS-1$

-

-	/** the image used for the dialog */

-	private static Image im = org.eclipse.papyrus.diagram.common.Activator.getImage("/icons/papyrus/PapyrusLogo16x16.gif"); //$NON-NLS-1$

-

-	/** a space */

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

-

-	private static final String FACET_SET = "facetset"; //$NON-NLS-1$

-

-	private static final String FILE = "file"; //$NON-NLS-1$

-

-	private static final String QUERY_SET = "modelqueryset"; //$NON-NLS-1$

-

-	/** the configuration for the generator */

-	private ProfileToFacetsConfiguration configuration = null;

-

-	/** the project owning the configuration */

-	private IProject project = null;

-

-	/**

-	 * Initialize the field {@link #project} and {@link #configuration}

-	 * 

-	 * @param file

-	 *        the configuration file

-	 */

-	private void init(final IFile file) {

-		this.project = file.getProject();

-		URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true);

-		try {

-			this.configuration = (ProfileToFacetsConfiguration)EMFHelper.loadEMFModel(null, uri);

-		} catch (IOException e) {

-			Activator.log.error(uri.toString() + "not found", e); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 * 

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

-	 * 

-	 *      {@inheritDoc}

-	 */

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

-		ISelection selection = HandlerUtil.getCurrentSelection(event);

-		if(!selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Object firstElement = ((IStructuredSelection)selection).getFirstElement();

-			IFile file = null;

-			if(firstElement instanceof IFile) {

-				file = (IFile)firstElement;

-				if(file.getFileExtension().equals(CONFIGURATION_FILE_EXTENSION)) {

-					init(file);

-					Assert.isNotNull(this.project);

-					Assert.isNotNull(this.configuration);

-

-

-					EMFFacetProjectEditor editor = null;

-					try {

-						editor = new EMFFacetProjectEditor(this.project);

-						editor.init();

-					} catch (IOException e2) {

-						// TODO Auto-generated catch block

-						e2.printStackTrace();

-					} catch (CoreException e2) {

-						// TODO Auto-generated catch block

-						e2.printStackTrace();

-					} catch (ParserConfigurationException e2) {

-						// TODO Auto-generated catch block

-						e2.printStackTrace();

-					} catch (SAXException e2) {

-						// TODO Auto-generated catch block

-						e2.printStackTrace();

-					}

-					if(editor != null) {

-						Set<String> missingNatures = editor.getMissingNature();

-						Set<String> missingFiles = editor.getMissingFiles();

-						Set<String> missingBuildCommand = editor.getMissingBuildCommand();

-						int result = Dialog.OK;

-						//TODO : ask for the build command

-						if(missingNatures.size() != 0 || missingFiles.size() != 0 || missingBuildCommand.size() != 0) {

-							String message = "The current project doesn't allow to generate the required files. \n We need to transform your project in EMF-Facet Project : ";

-							message += "The following natures will be added to your project :\n";

-							Iterator<String> iter = missingNatures.iterator();

-							while(iter.hasNext()) {

-								message += SPACE_WITH_DASH + iter.next() + "\n";

-							}

-							message += "\n\n";

-							message += "The following files will be created :\n";

-

-							iter = missingFiles.iterator();

-							while(iter.hasNext()) {

-								message += SPACE_WITH_DASH + iter.next() + "\n";

-							}

-

-							MessageDialog dialog = new MessageDialog(Display.getCurrent().getActiveShell(), "Change the project configuration", im, message, MessageDialog.QUESTION_WITH_CANCEL, new String[]{ "Accept", "Cancel" }, Dialog.OK);

-							result = dialog.open();

-							if(result != Dialog.OK) {

-								return null; //nothing to do

-							}

-							editor.create();

-							try {

-								editor.save();

-							} catch (Throwable e) {

-								// TODO Auto-generated catch block

-								e.printStackTrace();

-							}

-						}

-

-						/*

-						 * we prepare the generation

-						 */

-						editor.addToBuild(getModelTargetFolderName() + "/");

-						editor.addJavaSourceFolder(getJavaSourceFolderName());

-

-						try {

-							editor.save();

-						} catch (Throwable e2) {

-							Activator.log.error(e2);

-						}

-						/*

-						 * we generate the files

-						 */

-						FacetGenerator gen = new FacetGenerator(this.configuration.getProfile(), this.configuration.getBasePackage());

-						gen.setQVTTransformationParameters(getModelTargetURI());

-						gen.setAcceleoTransformationParameter(this.configuration.getHeader(), getJavaSourceFolderPath());

-						gen.generate();

-						//

-						//

-						editor.registerFacetSets(gen.getGeneratedFacetSet());

-						editor.registerQuerySets(gen.getGeneratedQuerySet());

-						gen.repairURI2();

-						//we refresh the workspace

-						try {

-							this.project.refreshLocal(IProject.DEPTH_INFINITE, new NullProgressMonitor());

-						} catch (CoreException e) {

-							Activator.log.error(e);

-						}

-						//						ManifestEditor manEditor = null;

-						//						try {

-						//							//							manEditor = new ManifestEditor(this.project);

-						//							//							manEditor.init();

-						//						} catch (IOException e2) {

-						//							// TODO Auto-generated catch block

-						//							e2.printStackTrace();

-						//						} catch (CoreException e2) {

-						//							// TODO Auto-generated catch block

-						//							e2.printStackTrace();

-						//						}

-						//						if(!manEditor.exists()){

-						//							//							manEditor.create();

-						//						}

-						Set<String> dependencies = getDependencies();

-						Iterator<String> iter = dependencies.iterator();

-						while(iter.hasNext()) {

-							//							break;

-							editor.addDependency(iter.next());

-							//							manEditor.addDependency(iter.next());

-						}

-

-

-						try {

-

-							editor.save();

-							//							manEditor.save();

-						} catch (Throwable e1) {

-							// TODO Auto-generated catch block

-							e1.printStackTrace();

-						}

-

-						//we refresh the workspace

-						try {

-							this.project.refreshLocal(IProject.DEPTH_INFINITE, new NullProgressMonitor());

-						} catch (CoreException e) {

-							Activator.log.error(e);

-						}

-						manageDatatypes();

-					}

-				}

-			}

-		}

-

-

-		return null;

-	}

-

-	//	private boolean isEMFFacetProject(final IProject project) {

-	//		ProjectEditor editor = new ProjectEditor(project);

-	//		return editor.hasNature(EMF_FACET_NATURE);

-	//	}

-	private void registerDependencies(final ManifestEditor manifestEditor) {

-		//register the dependencies

-		IJavaProject proj = JavaCore.create(this.project);

-		IJavaElement[] children = null;

-		try {

-			children = proj.getChildren();

-		} catch (JavaModelException e1) {

-			Activator.log.error(e1);

-			e1.printStackTrace();

-		}

-		IPackageFragmentRoot sourceFolder=null;

-		//we look for the source folder

-		String sourceFolderName = getJavaSourceFolderName();

-		for(int i = 0; i < children.length; i++) {

-			IJavaElement el = children[i];

-			if(el instanceof IPackageFragmentRoot && el.getElementName().equals(sourceFolderName)) {

-				sourceFolder = (IPackageFragmentRoot)el;

-				break;	

-			}

-		}

-

-		if(sourceFolder!=null){

-			try {

-				children = sourceFolder.getChildren();

-				List<IImportDeclaration> iImportDeclaration = new ArrayList<IImportDeclaration>();

-				for(int i = 0; i < children.length; i++) {

-					if(children[i] instanceof IPackageFragment) {

-						ICompilationUnit[] units;

-						units = ((IPackageFragment)children[i]).getCompilationUnits();

-						for(int j = 0; j < units.length; j++) {

-							ICompilationUnit unit = units[j];

-							iImportDeclaration.addAll(Arrays.asList(unit.getImports()));

-						}

-					}

-				}

-

-				Iterator<IImportDeclaration> iter = iImportDeclaration.iterator();

-				while(iter.hasNext()) {

-					manifestEditor.addDependency(iter.next().getElementName());

-				}

-			} catch (JavaModelException e) {

-				Activator.log.error(e);

-			}

-		}

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the dependencies to register

-	 */

-	private Set<String> getDependencies() {

-		//register the dependencies

-		Set<String> dependencies = new HashSet<String>();

-		IJavaProject proj = JavaCore.create(this.project);

-		IJavaElement[] children = null;

-		try {

-			children = proj.getChildren();

-		} catch (JavaModelException e1) {

-			Activator.log.error(e1);

-		}

-		IPackageFragmentRoot sourceFolder = null;

-		//we look for the source folder

-		String sourceFolderName = getJavaSourceFolderName();

-		for(int i = 0; i < children.length; i++) {

-			IJavaElement el = children[i];

-			if(el instanceof IPackageFragmentRoot && el.getElementName().equals(sourceFolderName)) {

-				sourceFolder = (IPackageFragmentRoot)el;

-				break;

-			}

-		}

-

-		if(sourceFolder != null) {

-			try {

-				children = sourceFolder.getChildren();

-				List<IImportDeclaration> iImportDeclaration = new ArrayList<IImportDeclaration>();

-				for(int i = 0; i < children.length; i++) {

-					if(children[i] instanceof IPackageFragment) {

-						ICompilationUnit[] units;

-						units = ((IPackageFragment)children[i]).getCompilationUnits();

-						for(int j = 0; j < units.length; j++) {

-							ICompilationUnit unit = units[j];

-							iImportDeclaration.addAll(Arrays.asList(unit.getImports()));

-						}

-					}

-				}

-

-				Iterator<IImportDeclaration> iter = iImportDeclaration.iterator();

-				while(iter.hasNext()) {

-					dependencies.add(iter.next().getElementName());

-				}

-			} catch (JavaModelException e) {

-				Activator.log.error(e);

-			}

-		}

-		return dependencies;

-	}

-

-

-

-

-	private String getJavaSourceFolderName() {

-		String folderName = this.configuration.getJavaFolder();

-		if(folderName.equals("")) { //$NON-NLS-1$

-			folderName = JAVA_SOURCE_FOLDER;

-		}

-

-

-		if(folderName.charAt(0) == '/') {

-			folderName = folderName.substring(1);

-		}

-		if(folderName.charAt(folderName.length() - 1) == '/') {

-			folderName = folderName.substring(0, folderName.length() - 1);

-		}

-

-		return folderName;

-	}

-

-	///**

-	// * Register the FacetSets if they are not already registered

-	// * 

-	// * @param editor

-	// *        the plugin editor

-	// * @param facetSets

-	// *        the querySets to register

-	// */

-	//private void registerFacetSets(final PluginEditor pluginEditor, final List<FacetSet> facetSets) {

-	//	for(int i = 0; i < facetSets.size(); i++) {

-	//		FacetSet set = facetSets.get(i);

-	//		String filepath = this.configuration.getModelFolder() + "/" + "facets" + "/";

-	//		filepath += set.getName() + ".facetSet"; //$NON-NLS-1$

-	//		boolean registered = false;

-	//		//we test if the file is already registered

-	//		List<Node> extensions = pluginEditor.getExtensions(FACET_REGISTRATION);

-	//		Iterator<Node> iter = extensions.iterator();

-	//		while(iter.hasNext()) {

-	//			Node current = iter.next();

-	//			Node child = current.getFirstChild();

-	//			if(child != null) {

-	//				NamedNodeMap attributes = child.getAttributes();

-	//				Node node = attributes.getNamedItem(FILE);

-	//				if(node != null) {

-	//					String path = node.getNodeValue();

-	//					registered = filepath.equals(path);

-	//

-	//				}

-	//			}

-	//		}

-	//

-	//		if(!registered) {

-	//			Element extension = pluginEditor.addExtension(FACET_REGISTRATION);

-	//			Element facetSet = pluginEditor.addChild(extension, FACET_SET);

-	//			pluginEditor.setAttribute(facetSet, FILE, filepath);

-	//		}

-	//	}

-	//}

-

-	///**

-	// * Register the QuerySet if they are not already registered

-	// * 

-	// * @param editor

-	// *        the plugin editor

-	// * @param querySets

-	// *        the querySets to register

-	// */

-	//private void registerQuerySets(final PluginEditor editor, final List<EObject> querySets) {

-	//	for(int i = 0; i < querySets.size(); i++) {

-	//		ModelQuerySet set = (ModelQuerySet)querySets.get(i);

-	//		String filepath = this.configuration.getModelFolder() + "/" + "queries" + "/";//TODO is there another way to find the path of the query? //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-	//		filepath += set.getName() + ".querySet"; //$NON-NLS-1$

-	//		boolean registered = false;

-	//		//we test if the file is already registered

-	//		List<Node> extensions = editor.getExtensions(QUERY_REGISTRATION);

-	//		Iterator<Node> iter = extensions.iterator();

-	//		while(iter.hasNext() && registered == false) {

-	//			Node current = iter.next();

-	//			Node child = current.getFirstChild();

-	//			if(child != null) {

-	//				NamedNodeMap attributes = child.getAttributes();

-	//				Node node = attributes.getNamedItem(FILE);

-	//				if(node != null) {

-	//					String path = node.getNodeValue();

-	//					registered = filepath.equals(path);

-	//

-	//				}

-	//			}

-	//		}

-	//

-	//		if(!registered) {

-	//			Element extension = editor.addExtension(QUERY_REGISTRATION);

-	//			Element queySet = editor.addChild(extension, QUERY_SET);

-	//			editor.setAttribute(queySet, FILE, filepath);

-	//		}

-	//	}

-	//}

-

-

-	/**

-	 * This method open a dialog to inform the user that the datatype are not handled by the generator

-	 */

-	private void manageDatatypes() {

-		List<DataType> datatypes = new ArrayList<DataType>();

-		Profile profile = this.configuration.getProfile();

-		if(profile != null) {

-			TreeIterator<Object> contents = UML2Util.getAllContents(profile, true, false);

-			while(contents.hasNext()) {

-				Object next = contents.next();

-				if(next instanceof DataType) {

-					datatypes.add((DataType)next);

-				}

-			}

-		}

-		if(datatypes.isEmpty()) {

-			String message = Messages.GenerateFacetsHandler_message_datatype_are_not_handled;

-			for(int i = 0; i < datatypes.size(); i++) {

-				message += SPACE_WITH_DASH + datatypes.get(i).getName() + "\n"; //$NON-NLS-1$ 

-			}

-			MessageDialog dialog = new MessageDialog(Display.getCurrent().getActiveShell(), Messages.GenerateFacetsHandler_Title_Problem_during_facets_generation, im, message, MessageDialog.INFORMATION, new String[]{ IDialogConstants.OK_LABEL }, 0);

-			dialog.open();

-		}

-	}

-

-

-	//		/**

-	//		 * Returns the missing nature for the project

-	//		 * 

-	//		 * @param project

-	//		 *        the project

-	//		 * @return

-	//		 *         the missing natures of the project

-	//		 */

-	//		private String[] getMissingNatures(final IProject project) {

-	//			ProjectEditor editor = new ProjectEditor(project);

-	//			List<String> missingNatures = new ArrayList<String>();

-	//			for(int i = 0; i < REQUIRED_NATURES.length; i++) {

-	//				if(!editor.hasNature(REQUIRED_NATURES[i])) {

-	//					missingNatures.add(REQUIRED_NATURES[i]);

-	//				}

-	//			}

-	//			return missingNatures.toArray(new String[missingNatures.size()]);

-	//		}

-

-	//	/**

-	//	 * Adds the missing natures to the project

-	//	 * 

-	//	 * @param project

-	//	 *        the project

-	//	 * @param missingNature

-	//	 *        the natures to add to the project

-	//	 */

-	//	private void addRequiredNatures(final IProject project, final String[] missingNature) {

-	//		ProjectEditor editor = new ProjectEditor(project);

-	//		for(int i = 0; i < missingNature.length; i++) {

-	//			editor.addNature(missingNature[i]);

-	//			//the associated build command seems to be automatically added!

-	//		}

-	//		try {

-	//			editor.save();

-	//		} catch (Exception e) {

-	//			Activator.log.error(e);

-	//		}

-	//

-	//	}

-

-	/**

-	 * 

-	 * 

-	 * @return the path for the java source folder

-	 */

-	private String getJavaSourceFolderPath() {

-		String folder = getJavaSourceFolderName();

-

-		//we create the wanted source folder

-		IFolder iFolder = this.project.getFolder(folder);

-		if(!iFolder.exists()) {

-			try {

-				iFolder.create(true, false, new NullProgressMonitor());

-			} catch (CoreException e) {

-				Activator.log.error(e);

-			}

-		}

-		//		//TODO change that!

-		//		JavaProjectEditor javaEditor = new JavaProjectEditor(this.project);

-		//		javaEditor.addJavaSourceFolder(folder);

-		//		try {

-		//			javaEditor.save();

-		//		} catch (Exception e) {

-		//			Activator.log.error(e);

-		//		} catch (Throwable e) {

-		//			// TODO Auto-generated catch block

-		//			e.printStackTrace();

-		//		}

-		String path = iFolder.getLocation().toOSString();

-

-		String basePackage = this.configuration.getBasePackage();

-		basePackage = basePackage.replace(".", "/"); //$NON-NLS-1$ //$NON-NLS-2$

-		path += "/" + basePackage; //$NON-NLS-1$

-		return path;

-

-	}

-

-	//	private String getJavaSourceFolder() {

-	//		String folder = getJavaSourceFolderName();

-	//

-	//		if(folder.charAt(0) == '/') {

-	//			folder = folder.substring(1);

-	//		}

-	//		if(folder.charAt(folder.length() - 1) == '/') {

-	//			folder = folder.substring(0, folder.length() - 1);

-	//		}

-	//		return folder;

-	//	}

-	/**

-	 * 

-	 * @return the URI for the target model folder

-	 */

-	private URI getModelTargetURI() {

-		String folder = this.configuration.getModelFolder();

-		java.net.URI uri1 = this.project.getLocationURI();

-		String path = uri1.getPath();

-

-		path += getModelTargetFolder();

-		return URI.createFileURI(path);

-	}

-

-	private String getModelTargetFolder() {

-		String folder = this.configuration.getModelFolder();

-		if(folder.charAt(0) != '/') {

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

-		}

-		if(folder.charAt(folder.length() - 1) != '/') {

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

-		}

-		return folder;

-	}

-

-	private String getModelTargetFolderName() {

-		String folder = this.configuration.getModelFolder();

-		if(folder.charAt(0) == '/') {

-			folder = folder.substring(0);

-		}

-		if(folder.charAt(folder.length() - 1) == '/') {

-			folder = folder.substring(0, folder.length() - 2);

-		}

-		return folder;

-	}

-

-	//	/**

-	//	 * 

-	//	 * @param project

-	//	 *        the current project

-	//	 * @return

-	//	 *         <code>true</code> if the current project is a JavaProject

-	//	 */

-	//	private boolean isJavaProject(final IProject project) {

-	//		IJavaProject javaProject = JavaCore.create(project);

-	//		return javaProject.exists();

-	//	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.core.commands.AbstractHandler#isEnabled()

-	 * 

-	 *      {@inheritDoc}

-	 */

-	@Override

-	public boolean isEnabled() {

-		ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

-		ISelection selection = selectionService.getSelection();

-		if(selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object firstElement = ((IStructuredSelection)selection).getFirstElement();

-			if(firstElement instanceof IFile) {

-				IFile file = (IFile)firstElement;

-				String fileExtension = file.getFileExtension();

-				return CONFIGURATION_FILE_EXTENSION.equals(fileExtension);

-			}

-		}

-		return false;

-	}

-

-

-}

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/handler/tester/HandlerPropertyTester.java b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/handler/tester/HandlerPropertyTester.java
deleted file mode 100644
index cf39bba1a22..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/handler/tester/HandlerPropertyTester.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.profile.facets.generation.acceleo.ui.handler.tester;

-

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

-import org.eclipse.core.expressions.PropertyTester;

-import org.eclipse.papyrus.profile.facets.generation.acceleo.ui.handler.GenerateFacetsHandler;

-

-/**

- * 

- * property tester for actions in the popup menu

- *

- */

-public class HandlerPropertyTester extends PropertyTester{

-

-	/**property to test for the Facets generation*/

-	public static final String PROFILE_TO_FACETS_CONFIGURATION_FILE = "isProfileToFacetsConfigurationFile"; //$NON-NLS-1$

-

-	/**

-	 * 

-	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)

-	 *

-	 *  {@inheritDoc}

-	 */

-	public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {

-		if(PROFILE_TO_FACETS_CONFIGURATION_FILE.equals(property)){

-			if(expectedValue instanceof Boolean){

-				AbstractHandler handler = new GenerateFacetsHandler();

-				return handler.isEnabled()==((Boolean)expectedValue).booleanValue();

-			}

-		}

-		return false;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/messages/Messages.java b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/messages/Messages.java
deleted file mode 100644
index 9b34e0c31f3..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/messages/Messages.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.profile.facets.generation.acceleo.ui.messages;

-

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

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.profile.facets.generation.acceleo.ui.messages"; //$NON-NLS-1$

-

-	public static String GenerateFacetsHandler_message_add_nature;

-

-	public static String GenerateFacetsHandler_message_datatype_are_not_handled;

-

-	public static String GenerateFacetsHandler_message_missing_nature;

-

-	public static String GenerateFacetsHandler_message_not_a_java_project;

-

-	public static String GenerateFacetsHandler_Title_Problem_during_facets_generation;

-	static {

-		// initialize resource bundle

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

-	}

-

-	private Messages() {

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/messages/messages.properties b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/messages/messages.properties
deleted file mode 100644
index bf03e25c1b4..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo.ui/src/org/eclipse/papyrus/profile/facets/generation/acceleo/ui/messages/messages.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-GenerateFacetsHandler_message_add_nature=\nAdd these natures? If not the generation will be cancelled.

-GenerateFacetsHandler_message_datatype_are_not_handled=The Datatypes are not handled by this generator. You should manage the following elements yourself : \n

-GenerateFacetsHandler_message_missing_nature=The following natures should be added to your project : \n

-GenerateFacetsHandler_message_not_a_java_project=The project is not a plugin project. I can't generate the facets.

-GenerateFacetsHandler_Title_Problem_during_facets_generation=Problem during Facets Generation

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/.classpath b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/.classpath
deleted file mode 100644
index abfee048d70..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/.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/org.eclipse.papyrus.profile.facets.generation.acceleo/.project b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/.project
deleted file mode 100644
index f5697949d95..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.profile.facets.generation.acceleo</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>

-		<buildCommand>

-			<name>org.eclipse.acceleo.ide.ui.acceleoBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature>

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

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

-	</natures>

-</projectDescription>

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6cbd2a772e8..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-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/org.eclipse.papyrus.profile.facets.generation.acceleo/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/META-INF/MANIFEST.MF
deleted file mode 100644
index 352a771b321..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Acceleo Acceleo Module Runtime Plug-in
-Bundle-SymbolicName: org.eclipse.papyrus.profile.facets.generation.acceleo
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.profile.facets.generation.acceleo.Activator
-Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.ocl,
- org.eclipse.ocl.ecore,
- org.eclipse.acceleo.model,
- org.eclipse.acceleo.engine,
- org.eclipse.uml2.uml;bundle-version="3.2.0",
- org.eclipse.emf.facet.infra.query.core;bundle-version="0.1.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.papyrus.profile.facets.generation.acceleo
-
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/build.acceleo b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/build.acceleo
deleted file mode 100644
index e9e744aaf41..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/build.acceleo
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- ===================================================================== -->
-<!-- Custom targets.                                                       -->
-<!-- Set customBuildCallbacks = build.acceleo in your build.properties.    -->
-<!-- ===================================================================== -->
-<project name="Build Acceleo Module" default="noDefault">    
-    <!-- ================================================================= -->
-    <!-- Default target                                                    -->
-    <!-- ================================================================= -->
-    <target name="noDefault">
-        <echo message="This file must be called with explicit targets" />
-    </target>
-
-    <!-- ================================================================= -->
-    <!-- This will be called automatically after the compilation of each   -->
-    <!-- Bundle... in dependency order.                                    -->
-    <!-- ================================================================= -->
-    <target name="post.compile.@dot">
-        <acceleoCompiler 
-            sourceFolder="${target.folder}" 
-            dependencies="${target.folder}/../../org.eclipse.ocl;${target.folder}/../../org.eclipse.ocl.ecore;"
-            binaryResource="true">
-        </acceleoCompiler>
-    </target>    
-</project>
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/build.properties b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/build.properties
deleted file mode 100644
index a7eaec6b4e7..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
-customBuildCallbacks = build.acceleo
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/buildstandalone.xml b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/buildstandalone.xml
deleted file mode 100644
index 7cd5f348a06..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/buildstandalone.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="compile" name="org.eclipse.papyrus.profile.facets.generation.acceleo">
-    
-    <property name="ECLIPSE_HOME" value="../../EclipseIndigo3.7M6a/eclipse"/>
-    <property name="ECLIPSE_WORKSPACE" value=".."/>
-
-<!-- 
-Start of user code to add new properties

--->

-    <!-- You can add new properties here but do not touch the previous and following comments.-->

-    <property name="SOURCE_FOLDER" value="${basedir}/src/"/>    

-    <property name="OUTPUT_FOLDER" value="${basedir}/bin/"/>

-<!-- 

-End of user code
--->
-
-
-
-    <!--
-         If deleted, this file will be recreated with a full build (Project -> Clean...).
-    -->
-
-
-    <!-- The classpath with only the dependencies used by the project -->
-    <path id="org.eclipse.papyrus.profile.facets.generation.acceleo.libraryclasspath">
-        <pathelement location="${ECLIPSE_WORKSPACE}/org.eclipse.papyrus.profile.facets.generation.acceleo/bin"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime_3.7.0.v20110110.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.osgi_3.7.0.v20110304.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.common_3.6.0.v20110110.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.jobs_3.5.100.v20110214.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.runtime.compatibility.registry_3.3.100.v20101108/runtime_registry_compatibility.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.registry_3.5.100.v20110207.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.preferences_3.4.0.v20110124-0830.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.contenttype_3.4.100.v20110207.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.equinox.app_1.3.100.v20110214.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore_2.7.0.v20110429-2014.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.common_2.7.0.v20110429-2014.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.ecore.xmi_2.7.0.v20110411-2239.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/lpg.runtime.java_2.0.17.v201004271640.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.model_3.1.0.v20110503-0405.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.engine_3.1.0.v20110503-0405.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.common_3.1.0.v20110503-0405.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.acceleo.profiler_3.1.0.v20110503-0405.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen.ecore_2.7.0.v20110502-1136.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.codegen_2.6.0.v20110502-1136.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.uml_3.2.0.v201101271655.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.uml2.common_1.5.0.v201005031530.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.facet.infra.query.core_0.1.0.v201105171123.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.emf.facet.infra.query_0.1.0.v201105171123.jar"/>
-        <pathelement location="${ECLIPSE_HOME}/plugins/org.eclipse.core.resources_3.7.100.v20110228.jar"/>
-    </path>
-
-
-    <path id="org.eclipse.papyrus.profile.facets.generation.acceleo.classpath">
-        <path refid="org.eclipse.papyrus.profile.facets.generation.acceleo.libraryclasspath" />
-    </path>
-    
-    <taskdef id="acceleoCompiler" name="acceleoCompiler" classname="org.eclipse.acceleo.parser.compiler.AcceleoCompiler" classpathref="org.eclipse.papyrus.profile.facets.generation.acceleo.classpath" >
-    </taskdef>
-
-    <!-- Change the value of the property SOURCE_FOLDERS to match the configuration of your project. -->
-    <target name="compile">
-        <acceleoCompiler sourceFolder="${SOURCE_FOLDER}"
-                         outputFolder="${OUTPUT_FOLDER}"
-                         dependencies=""
-                         binaryResource="true">
-        </acceleoCompiler>
-    </target>
-
-
-<!-- 
-Start of user code to add new targets

--->

-    <!-- You can add new targets here but do not touch the previous and following comments.-->

-<!-- 

-End of user code
--->
-
-</project>
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/pom.xml b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/pom.xml
deleted file mode 100644
index c93bd35a08b..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/pom.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <!--
-         This file will only be created once by Acceleo, it will not be modified after that by Acceleo.
-         If you want Acceleo to recreate this file, delete it and rebuild your project.
-    -->
-
-    <groupId>acceleo</groupId>
-    <artifactId>org.eclipse.papyrus.profile.facets.generation.acceleo</artifactId>
-    <version>1.0.0.SNAPSHOT</version>
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>  
-                    <groupId>org.codehaus.mojo</groupId>  
-                    <artifactId>exec-maven-plugin</artifactId>  
-                    <version>1.1.1</version>  
-                    <executions>  
-                        <execution>  
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>java</goal>
-                            </goals>
-                            <configuration>
-                                <!--
-                                    Calls the AcceleoMainCompiler to launch the compilation.
-                                -->
-                                <mainClass>org.eclipse.acceleo.parser.compiler.AcceleoMainCompiler</mainClass>  
-                                <arguments>  
-                                    <argument>${basedir}/src/main/java</argument>   <!-- input folder -->
-                                    <argument>${basedir}/target/classes/</argument> <!-- output folder -->
-                                    <argument>true</argument>   <!-- use binary resources -->
-                                    <argument></argument>  <!-- dependencies with other projects -->
-                                </arguments>  
-                            </configuration>  
-                        </execution>  
-                    </executions>  
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-    <profiles>
-        <profile>
-            <id>acceleo-compilation</id>
-            <build>
-                <plugins>
-                    <plugin>  
-                        <groupId>org.codehaus.mojo</groupId>  
-                        <artifactId>exec-maven-plugin</artifactId>  
-                        <version>1.1.1</version>  
-                        <executions>  
-                            <execution>  
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>java</goal>
-                                </goals>
-                                <configuration>
-                                    <!--
-                                        Calls the AcceleoMainCompiler to launch the compilation.
-                                    -->
-                                    <mainClass>org.eclipse.acceleo.parser.compiler.AcceleoMainCompiler</mainClass>  
-                                    <arguments>  
-                                        <argument>${basedir}/src/main/java</argument>  <!-- input folder -->
-                                        <argument>${basedir}/target/classes/</argument>  <!-- output folder -->
-                                        <argument>true</argument> <!-- use binary resources -->
-                                        <argument></argument> <!-- dependencies with other projects -->  
-                                    </arguments>  
-                                </configuration>  
-                            </execution>  
-                        </executions>  
-                    </plugin>
-                </plugins>
-            </build>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-    </profiles>
-    <dependencies>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.core.runtime</artifactId>
-            <version>3.7.0.v20110110</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.core.runtime_3.7.0.v20110110.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-            <version>3.7.0.v20110427</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.osgi_3.7.0.v20110427.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.equinox.common</artifactId>
-            <version>3.6.0.v20110427</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.equinox.common_3.6.0.v20110427.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.core.jobs</artifactId>
-            <version>3.5.100.v20110404</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.core.jobs_3.5.100.v20110404.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.core.runtime.compatibility.registry</artifactId>
-            <version>3.3.100.v20110420/runtime_registry_compatibility</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.core.runtime.compatibility.registry_3.3.100.v20110420/runtime_registry_compatibility.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.equinox.registry</artifactId>
-            <version>3.5.100.v20110321</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.equinox.registry_3.5.100.v20110321.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.equinox.preferences</artifactId>
-            <version>3.4.0.v20110328</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.equinox.preferences_3.4.0.v20110328.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.core.contenttype</artifactId>
-            <version>3.4.100.v20110423-0524</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.equinox.app</artifactId>
-            <version>1.3.100.v20110321</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.equinox.app_1.3.100.v20110321.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.emf.ecore</artifactId>
-            <version>2.7.0.v20110429-2014</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.emf.ecore_2.7.0.v20110429-2014.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.emf.common</artifactId>
-            <version>2.7.0.v20110429-2014</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.emf.common_2.7.0.v20110429-2014.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
-            <version>2.7.0.v20110411-2239</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.emf.ecore.xmi_2.7.0.v20110411-2239.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.ocl</artifactId>
-            <version>3.1.0.v20110502-1445</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.ocl_3.1.0.v20110502-1445.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>lpg.runtime.java</artifactId>
-            <version>2.0.17.v201004271640</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/lpg.runtime.java_2.0.17.v201004271640.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.ocl.ecore</artifactId>
-            <version>3.1.0.v20110501-2031</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.ocl.ecore_3.1.0.v20110501-2031.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.acceleo.model</artifactId>
-            <version>3.1.0.v20110503-0405</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.acceleo.model_3.1.0.v20110503-0405.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.acceleo.engine</artifactId>
-            <version>3.1.0.v20110503-0405</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.acceleo.engine_3.1.0.v20110503-0405.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.acceleo.common</artifactId>
-            <version>3.1.0.v20110503-0405</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.acceleo.common_3.1.0.v20110503-0405.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.acceleo.profiler</artifactId>
-            <version>3.1.0.v20110503-0405</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.acceleo.profiler_3.1.0.v20110503-0405.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.emf.codegen.ecore</artifactId>
-            <version>2.7.0.v20110502-1136</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.emf.codegen.ecore_2.7.0.v20110502-1136.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.emf.codegen</artifactId>
-            <version>2.6.0.v20110502-1136</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.emf.codegen_2.6.0.v20110502-1136.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.uml2.uml</artifactId>
-            <version>3.2.0.v201101271655</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.uml2.uml_3.2.0.v201101271655.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.uml2.common</artifactId>
-            <version>1.5.0.v201005031530</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.uml2.common_1.5.0.v201005031530.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.emf.facet.infra.query.core</artifactId>
-            <version>0.1.0.v201105031513</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.emf.facet.infra.query.core_0.1.0.v201105031513.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.emf.facet.infra.query</artifactId>
-            <version>0.1.0.v201105031513</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.emf.facet.infra.query_0.1.0.v201105031513.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>org.eclipse.core.resources</artifactId>
-            <version>3.7.100.v20110427-0856</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../../../../../eclipses/Indigo M6/plugins/org.eclipse.core.resources_3.7.100.v20110427-0856.jar</systemPath>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/src/org/eclipse/papyrus/profile/facets/generation/acceleo/Activator.java b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/src/org/eclipse/papyrus/profile/facets/generation/acceleo/Activator.java
deleted file mode 100644
index b65a7751dc1..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/src/org/eclipse/papyrus/profile/facets/generation/acceleo/Activator.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.papyrus.profile.facets.generation.acceleo;
-
-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 plug-in ID.
-     */
-    public static final String PLUGIN_ID = "org.eclipse.papyrus.facets.profile.generation.acceleo";
-
-    /**
-     * The shared instance.
-     */
-    private static Activator plugin;
-    
-    /**
-     * The constructor.
-     */
-    public Activator() {
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
-     */
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @see org.eclipse.core.runtime.Plugin#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/org.eclipse.papyrus.profile.facets.generation.acceleo/src/org/eclipse/papyrus/profile/facets/generation/acceleo/Generate.java b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/src/org/eclipse/papyrus/profile/facets/generation/acceleo/Generate.java
deleted file mode 100644
index 23d3cf97636..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/src/org/eclipse/papyrus/profile/facets/generation/acceleo/Generate.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.papyrus.profile.facets.generation.acceleo;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.acceleo.engine.event.IAcceleoTextGenerationListener;
-import org.eclipse.acceleo.engine.generation.strategy.IAcceleoGenerationStrategy;
-import org.eclipse.acceleo.engine.service.AbstractAcceleoGenerator;
-import org.eclipse.acceleo.engine.service.AcceleoService;
-import org.eclipse.acceleo.engine.service.properties.AbstractAcceleoPropertiesLoaderService;
-import org.eclipse.emf.common.util.BasicMonitor;
-import org.eclipse.emf.common.util.Monitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-/**
- * Entry point of the 'Generate' generation module.
- * 
- * @generated
- */
-public class Generate extends AbstractAcceleoGenerator {
-
-	/**
-	 * The name of the module.
-	 * 
-	 * @generated
-	 */
-	public static final String MODULE_FILE_NAME = "/org/eclipse/papyrus/profile/facets/generation/acceleo/generate";
-
-	/**
-	 * The name of the templates that are to be generated.
-	 * 
-	 * @generated
-	 */
-	public static final String[] TEMPLATE_NAMES = { "generateQuery", "generateGetter", "generateSetter" };
-
-	/**
-	 * The list of properties files from the launch parameters (Launch configuration).
-	 */
-	private final List<String> propertiesFiles = new ArrayList<String>();
-
-	/**
-	 * Allows the public constructor to be used. Note that a generator created
-	 * this way cannot be used to launch generations before one of {@link #initialize(EObject, File, List)} or {@link #initialize(URI, File, List)} is
-	 * called.
-	 * <p>
-	 * The main reason for this constructor is to allow clients of this generation to call it from another Java file, as it allows for the retrieval
-	 * of {@link #getProperties()} and {@link #getGenerationListeners()}.
-	 * </p>
-	 * 
-	 * @generated
-	 */
-	public Generate() {
-        // Empty implementation
-    }
-
-	/**
-	 * This allows clients to instantiates a generator with all required information.
-	 * 
-	 * @param modelURI
-	 *        URI where the model on which this generator will be used is located.
-	 * @param targetFolder
-	 *        This will be used as the output folder for this generation : it will be the base path
-	 *        against which all file block URLs will be resolved.
-	 * @param arguments
-	 *        If the template which will be called requires more than one argument taken from the model,
-	 *        pass them here.
-	 * @throws IOException
-	 *         This can be thrown in three scenarios : the module cannot be found, it cannot be loaded, or
-	 *         the model cannot be loaded.
-	 * @generated
-	 */
-	public Generate(URI modelURI, File targetFolder, List<? extends Object> arguments) throws IOException {
-        initialize(modelURI, targetFolder, arguments);
-    }
-
-	/**
-	 * This allows clients to instantiates a generator with all required information.
-	 * 
-	 * @param model
-	 *        We'll iterate over the content of this element to find Objects matching the first parameter
-	 *        of the template we need to call.
-	 * @param targetFolder
-	 *        This will be used as the output folder for this generation : it will be the base path
-	 *        against which all file block URLs will be resolved.
-	 * @param arguments
-	 *        If the template which will be called requires more than one argument taken from the model,
-	 *        pass them here.
-	 * @throws IOException
-	 *         This can be thrown in two scenarios : the module cannot be found, or it cannot be loaded.
-	 * @generated
-	 */
-	public Generate(EObject model, File targetFolder, List<? extends Object> arguments) throws IOException {
-        initialize(model, targetFolder, arguments);
-    }
-
-	/**
-	 * This can be used to launch the generation from a standalone application.
-	 * 
-	 * @param args
-	 *        Arguments of the generation.
-	 * @generated
-	 */
-	public static void main(String[] args) {
-        try {
-            if (args.length < 2) {
-                System.out.println("Arguments not valid : {model, folder}.");
-            } else {
-                URI modelURI = URI.createFileURI(args[0]);
-                File folder = new File(args[1]);
-                
-                List<String> arguments = new ArrayList<String>();
-                
-                /*
-                 * Add in this list all the arguments used by the starting point of the generation
-                 * If your main template is called on an element of your model and a String, you can
-                 * add in "arguments" this "String" attribute.
-                 */
-                
-                Generate generator = new Generate(modelURI, folder, arguments);
-                
-                /*
-                 * Add the properties from the launch arguments.
-                 * If you want to programmatically add new arguments, add them in "propertiesFiles"
-                 * You can add the absolute path of a properties files, or even a project relative path.
-                 * If you want to add another "protocol" for your properties files, please override 
-                 * "getPropertiesLoaderService(AcceleoService)" in order to return a new property loader.
-                 * The basic properties loader will look for properties in the current project if the path
-                 * of the properties file is like this "packagea.packageb.packagec.default" for a properties
-                 * file named default.properties, or if the path is an absolute path. With a new property
-                 * loader you could for example, look for properties files in a bundle.
-                 */
-                 
-                for (int i = 2; i < args.length; i++) {
-                    generator.addPropertiesFile(args[i]);
-                }
-                
-                generator.doGenerate(new BasicMonitor());
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-	/**
-	 * Launches the generation described by this instance.
-	 * 
-	 * @param monitor
-	 *        This will be used to display progress information to the user.
-	 * @throws IOException
-	 *         This will be thrown if any of the output files cannot be saved to disk.
-	 * @generated
-	 */
-	@Override
-	public void doGenerate(Monitor monitor) throws IOException {
-        /*
-         * TODO if you wish to change the generation as a whole, override this. The default behavior should
-         * be sufficient in most cases. If you want to change the content of this method, do NOT forget to
-         * change the "@generated" tag in the Javadoc of this method to "@generated NOT". Without this new tag,
-         * any compilation of the Acceleo module with the main template that has caused the creation of this
-         * class will revert your modifications. If you encounter a problem with an unresolved proxy during the
-         * generation, you can remove the comments in the following instructions to check for problems. Please
-         * note that those instructions may have a significant impact on the performances.
-         */
-
-        //org.eclipse.emf.ecore.util.EcoreUtil.resolveAll(model);
-
-        //if (model != null && model.eResource() != null) {
-        //    List<org.eclipse.emf.ecore.resource.Resource.Diagnostic> errors = model.eResource().getErrors();
-        //    for (org.eclipse.emf.ecore.resource.Resource.Diagnostic diagnostic : errors) {
-        //        System.err.println(diagnostic.toString());
-        //    }
-        //}
-
-        super.doGenerate(monitor);
-    }
-
-	/**
-	 * If this generator needs to listen to text generation events, listeners can be returned from here.
-	 * 
-	 * @return List of listeners that are to be notified when text is generated through this launch.
-	 * @generated
-	 */
-	@Override
-	public List<IAcceleoTextGenerationListener> getGenerationListeners() {
-        List<IAcceleoTextGenerationListener> listeners = super.getGenerationListeners();
-        /*
-         * TODO if you need to listen to generation event, add listeners to the list here. If you want to change
-         * the content of this method, do NOT forget to change the "@generated" tag in the Javadoc of this method
-         * to "@generated NOT". Without this new tag, any compilation of the Acceleo module with the main template
-         * that has caused the creation of this class will revert your modifications.
-         */
-        return listeners;
-    }
-
-	/**
-	 * If you need to change the way files are generated, this is your entry point.
-	 * <p>
-	 * The default is {@link org.eclipse.acceleo.engine.generation.strategy.DefaultStrategy}; it generates files on the fly. If you only need to
-	 * preview the results, return a new {@link org.eclipse.acceleo.engine.generation.strategy.PreviewStrategy}. Both of these aren't aware of the
-	 * running Eclipse and can be used standalone.
-	 * </p>
-	 * <p>
-	 * If you need the file generation to be aware of the workspace (A typical example is when you wanna override files that are under clear case or
-	 * any other VCS that could forbid the overriding), then return a new
-	 * {@link org.eclipse.acceleo.engine.generation.strategy.WorkspaceAwareStrategy}. <b>Note</b>, however, that this <b>cannot</b> be used
-	 * standalone.
-	 * </p>
-	 * <p>
-	 * All three of these default strategies support merging through JMerge.
-	 * </p>
-	 * 
-	 * @return The generation strategy that is to be used for generations launched through this launcher.
-	 * @generated
-	 */
-	@Override
-	public IAcceleoGenerationStrategy getGenerationStrategy() {
-        return super.getGenerationStrategy();
-    }
-
-	/**
-	 * This will be called in order to find and load the module that will be launched through this launcher.
-	 * We expect this name not to contain file extension, and the module to be located beside the launcher.
-	 * 
-	 * @return The name of the module that is to be launched.
-	 * @generated
-	 */
-	@Override
-	public String getModuleName() {
-        return MODULE_FILE_NAME;
-    }
-
-	/**
-	 * If the module(s) called by this launcher require properties files, return their qualified path from
-	 * here.Take note that the first added properties files will take precedence over subsequent ones if they
-	 * contain conflicting keys.
-	 * <p>
-	 * Properties need to be in source folders, the path that we expect to get as a result of this call are of the form &lt;package>.&lt;properties
-	 * file name without extension>. For example, if you have a file named "messages.properties" in package "org.eclipse.acceleo.sample", the path
-	 * that needs be returned by a call to {@link #getProperties()} is "org.eclipse.acceleo.sample.messages".
-	 * </p>
-	 * 
-	 * @return The list of properties file we need to add to the generation context.
-	 * @see java.util.ResourceBundle#getBundle(String)
-	 * @generated
-	 */
-	@Override
-	public List<String> getProperties() {
-        /*
-         * TODO if your generation module requires access to properties files, add their qualified path to the list here.
-         * Properties files are expected to be in source folders, and the path here to be the qualified path as if referring
-         * to a Java class. For example, if you have a file named "messages.properties" in package "org.eclipse.acceleo.sample",
-         * the path that needs be added to this list is "org.eclipse.acceleo.sample.messages". If you want to change the content
-         * of this method, do NOT forget to change the "@generated" tag in the Javadoc of this method to "@generated NOT".
-         * Without this new tag, any compilation of the Acceleo module with the main template that has caused the creation of 
-         * this class will revert your modifications.
-         */
-        return propertiesFiles;
-    }
-
-	/**
-	 * Adds a properties file in the list of properties files.
-	 * 
-	 * @param propertiesFile
-	 *        The properties file to add.
-	 * @since 3.1
-	 */
-	@Override
-	public void addPropertiesFile(final String propertiesFile) {
-		this.propertiesFiles.add(propertiesFile);
-	}
-
-	/**
-	 * This will be used to get the list of templates that are to be launched by this launcher.
-	 * 
-	 * @return The list of templates to call on the module {@link #getModuleName()}.
-	 * @generated
-	 */
-	@Override
-	public String[] getTemplateNames() {
-        return TEMPLATE_NAMES;
-    }
-
-	/**
-	 * This can be used to update the resource set's package registry with all needed EPackages.
-	 * 
-	 * @param resourceSet
-	 *        The resource set which registry has to be updated.
-	 * @generated
-	 */
-	@Override
-	public void registerPackages(ResourceSet resourceSet) {
-        super.registerPackages(resourceSet);
-        if (!isInWorkspace(org.eclipse.uml2.uml.UMLPackage.class)) {
-            resourceSet.getPackageRegistry().put(org.eclipse.uml2.uml.UMLPackage.eINSTANCE.getNsURI(), org.eclipse.uml2.uml.UMLPackage.eINSTANCE);
-        }
-        
-        /*
-         * TODO If you need additional package registrations, you can register them here. The following line
-         * (in comment) is an example of the package registration for UML. If you want to change the content
-         * of this method, do NOT forget to change the "@generated" tag in the Javadoc of this method to
-         * "@generated NOT". Without this new tag, any compilation of the Acceleo module with the main template
-         * that has caused the creation of this class will revert your modifications. You can use the method
-         * "isInWorkspace(Class c)" to check if the package that you are about to register is in the workspace.
-         * To register a package properly, please follow the following conventions:
-         * 
-         * if (!isInWorkspace(UMLPackage.class)) {
-         *     // The normal package registration if your metamodel is in a plugin.
-         *     resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);
-         * } else {
-         *     // The package registration that will be used if the metamodel is not deployed in a plugin.
-         *     // This should be used if your metamodel is in your workspace.
-         *     resourceSet.getPackageRegistry().put("/myproject/myfolder/mysubfolder/MyUMLMetamodel.ecore", UMLPackage.eINSTANCE);
-         * }
-         */
-    }
-
-	/**
-	 * This can be used to update the resource set's resource factory registry with all needed factories.
-	 * 
-	 * @param resourceSet
-	 *        The resource set which registry has to be updated.
-	 * @generated
-	 */
-	@Override
-	public void registerResourceFactories(ResourceSet resourceSet) {
-        super.registerResourceFactories(resourceSet);
-        /*
-         * TODO If you need additional resource factories registrations, you can register them here. the following line
-         * (in comment) is an example of the resource factory registration for UML. If you want to change the content
-         * of this method, do NOT forget to change the "@generated" tag in the Javadoc of this method to "@generated NOT".
-         * Without this new tag, any compilation of the Acceleo module with the main template that has caused the creation
-         * of this class will revert your modifications. 
-         */ 
-        
-        // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
-    }
-
-	private String header;
-
-	protected String packageName;
-
-	public void setHeader(final String header) {
-		this.header = header;
-	}
-
-	public void setPackageName(final String packageName){
-		this.packageName = packageName;
-	}
-
-
-
-	/**
-	 * 
-	 * @see org.eclipse.acceleo.engine.service.AbstractAcceleoGenerator#getPropertiesLoaderService(org.eclipse.acceleo.engine.service.AcceleoService)
-	 * 
-	 * @param acceleoService
-	 * @return
-	 * @notgenerated
-	 */
-	@Override
-	protected AbstractAcceleoPropertiesLoaderService getPropertiesLoaderService(final AcceleoService service) {
-		System.out.println("GetPropertiesLoaderService");
-		return new AbstractAcceleoPropertiesLoaderService() {
-
-			{
-				this.acceleoService = service;
-			}
-
-			@Override
-			public void initializeService(final List<String> propertiesFiles) {
-				super.initializeService(propertiesFiles);
-				Map<String, String> myCustomProperties = new HashMap<String, String>();
-				if(Generate.this.header != null) {
-					myCustomProperties.put("copyright", Generate.this.header);
-				}
-				if(Generate.this.packageName!=null){
-					myCustomProperties.put("packageName", Generate.this.packageName);
-				}
-				service.addProperties(myCustomProperties);
-			}
-
-			@Override
-			protected Properties alternatePropertiesLoading(final String filepath) {
-				System.out.println("Loading " + filepath);
-
-				try {
-					Properties properties = new Properties();
-					File file = new File(filepath);
-					properties.load(new FileInputStream(file));
-					return properties;
-				} catch (IOException ex) {
-					System.err.println(ex);
-					ex.printStackTrace(System.err);
-				}
-				return null;
-			}
-
-
-		};
-	}
-
-}
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/src/org/eclipse/papyrus/profile/facets/generation/acceleo/HasStereotypeQuery.java b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/src/org/eclipse/papyrus/profile/facets/generation/acceleo/HasStereotypeQuery.java
deleted file mode 100644
index 4af00f7e68e..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/src/org/eclipse/papyrus/profile/facets/generation/acceleo/HasStereotypeQuery.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

-package org.eclipse.papyrus.profile.facets.generation.acceleo;

-

-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.uml2.uml.Element;

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

-

-/**

- * 

- * This class allows to test if a FacetSet can be used for an UML Element

- * 

- */

-public class HasStereotypeQuery implements IJavaModelQuery<Element, Boolean> {

-

-	/** the id of the stereotype */

-	private final String stereotypeID;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param stereotypeID

-	 */

-	public HasStereotypeQuery(final String stereotypeID) {

-		this.stereotypeID = stereotypeID;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery#evaluate(org.eclipse.emf.ecore.EObject,

-	 *      org.eclipse.emf.facet.infra.query.core.java.ParameterValueList)

-	 * 

-	 * @param context

-	 * @param parameterValues

-	 * @return

-	 * @throws ModelQueryExecutionException

-	 */

-	public Boolean evaluate(final Element context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {

-		Stereotype ste = context.getAppliedStereotype(stereotypeID);

-		if(ste != null) {

-			return Boolean.TRUE;

-		}

-		return Boolean.FALSE;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/src/org/eclipse/papyrus/profile/facets/generation/acceleo/generate.mtl b/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/src/org/eclipse/papyrus/profile/facets/generation/acceleo/generate.mtl
deleted file mode 100644
index bc050150589..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation.acceleo/src/org/eclipse/papyrus/profile/facets/generation/acceleo/generate.mtl
+++ /dev/null
@@ -1,181 +0,0 @@
-[comment encoding = UTF-8 /]
-[module generate(http://www.eclipse.org/uml2/3.0.0/UML)]
-
-[template public getFacetClassName(stereotype : Stereotype) post(trim())]
-Has[getQualifiedName().replaceAll(':', '')/]Query
-[/template]
-
-[template public getGetterClassName(property : Property) post(trim())]
-Get[owner.oclAsType(Stereotype).name /][property.name.toUpperFirst() /]
-[/template]
-
-[template public getSetterClassName(property : Property) post(trim())]
-Set[owner.oclAsType(NamedElement).name /][property.name.toUpperFirst() /]
-[/template]
-
-[template public getGetterFileName(property : Property) post(trim())]
-[if (owner.oclIsKindOf(Stereotype))]
-	[getProperty('packageName').replaceAll('.','/')/]/queries/getters/[getGetterClassName()/].java
-[/if]
-[/template]
-
-[template public getSetterFileName(property : Property) post(trim())]
-[if (owner.oclIsKindOf(Stereotype) and not type.oclIsKindOf(DataType))]
-	[getProperty('packageName').replaceAll('.','/')/]/queries/setters/[getSetterClassName()/].java
-[/if]
-[/template]
-
-[template public generateQuery(stereotype : Stereotype)]
-[comment @main/]
-[file (getProperty('packageName').replaceAll('.','/')+'/queries/facets/'+getFacetClassName()+'.java', false, 'UTF-8')]
-[getProperty('copyright')/]
-package [getProperty('packageName')/].queries.facets;
-
-import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery; 
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.papyrus.profile.facets.generation.acceleo.HasStereotypeQuery;
-
-/** Condition Query */
-public class [getFacetClassName()/] extends HasStereotypeQuery implements IJavaModelQuery<Element, Boolean> {
-
-	public [getFacetClassName()/]() {
-		super("[getQualifiedName()/]"); //$NON-NLS-1$
-	}
-
-}
-
-[/file]
-[/template]
-
-[template public generateGetter(property : Property)]
-[comment @main/]
-[file (getGetterFileName(), false, 'UTF-8')]
-[getProperty('copyright')/]
-package [getProperty('packageName')/].queries.getters;
-
-import java.util.Collection;
-
-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.uml2.uml.Class;
-import org.eclipse.uml2.uml.Stereotype;
-
-/** Query to get the text of the requirement */
-public class [getGetterClassName()/] implements IJavaModelQuery<[findScope()/], [findReturnType()/]> {
-
-	public [findReturnType()/] evaluate(final [findScope()/] context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		[if type.oclIsKindOf(DataType)]
-		//TODO : The generator cannot handle DataTypes correctly. You should probably edit this query
-		[/if]
-		Stereotype ste = context.getAppliedStereotype("[owner.oclAsType(Stereotype).getQualifiedName() /]"); //$NON-NLS-1$
-		if(ste != null) {
-			Object value = context.getValue(ste, "[name /]"); //$NON-NLS-1$
-			return ([findReturnType()/])value;
-		}
-		return null;
-	}
-}
-
-
-[/file]
-[/template]
-
-[template public generateSetter(property : Property)]
-[comment @main/]
-[file (getSetterFileName(), false, 'UTF-8')]
-[getProperty('copyright')/]
-package [getProperty('packageName')/].queries.setters;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
-import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQueryWithEditingDomain;
-import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;
-import org.eclipse.emf.facet.infra.query.runtime.ModelQueryParameterValue;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Stereotype;
-
-/** Query to set the attribute "attrName" of a stereotypeName */
-public class [getSetterClassName() /] implements IJavaModelQueryWithEditingDomain<Class, EObject> {
-
-	/**
-	 * 
-	 * @see org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery#evaluate(org.eclipse.emf.ecore.EObject,
-	 *      org.eclipse.emf.facet.infra.query.core.java.ParameterValueList)
-	 * 
-	 * @param context
-	 * @param parameterValues
-	 * @return
-	 * @throws ModelQueryExecutionException
-	 */
-	public EObject evaluate(final Class context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		//Unused
-		return null;
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.emf.facet.infra.query.core.java.IJavaModelQueryWithEditingDomain#evaluate(org.eclipse.emf.ecore.EObject,
-	 *      org.eclipse.emf.facet.infra.query.core.java.ParameterValueList, org.eclipse.emf.edit.domain.EditingDomain)
-	 * 
-	 * @param arg0
-	 * @param parameter
-	 * @param arg2
-	 * @return
-	 * @throws ModelQueryExecutionException
-	 */
-	public EObject evaluate(final Class context, final ParameterValueList parameter, final EditingDomain editingDomain) throws ModelQueryExecutionException {
-		final Stereotype ste = context.getAppliedStereotype("[owner.oclAsType(Stereotype).getQualifiedName() /]"); //$NON-NLS-1$
-		if(ste != null) {
-			if(parameter.size() != 0) {
-				final ModelQueryParameterValue newValue = parameter.get(0);
-				if(newValue != null && newValue.getValue() instanceof String) {
-					Command command = null;
-					TransactionalEditingDomain domain = null;
-					if(!(editingDomain instanceof TransactionalEditingDomain)) {
-						//if we work with a uml file, it is possible to get a UML2AdapterFactoryEditingDomain instead of TransactionEditingDomain
-						domain = TransactionUtil.getEditingDomain(context);
-					} else {
-						domain = (TransactionalEditingDomain)editingDomain;
-					}
-					if(domain != null) {
-						command = new RecordingCommand(domain) {
-
-							@Override
-							protected void doExecute() {
-								context.setValue(ste, "[name /]", newValue.getValue());
-							}
-						};
-					}
-					if(command != null && command.canExecute()) {
-						domain.getCommandStack().execute(command);
-					}
-				}
-			}
-		}
-		return context;
-	}
-}
-[/file]
-[/template]
-
-[template public findScope(property : Property) post(trim())]
-
-[/template]
-
-[template public findReturnType(property : Property) post(trim())]
-[if type.oclIsKindOf(Stereotype)]
-	Unknown return type (Stereotype/Facet)
-[elseif type.oclIsKindOf(Enumeration)]
-	org.eclipse.uml2.uml.EnumerationLiteral
-[elseif type.oclIsKindOf(DataType)]
-	org.eclipse.emf.ecore.EObject
-[else]
-	org.eclipse.uml2.uml.[type.name /]
-[/if]
-[/template]
diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation/.classpath b/sandbox/org.eclipse.papyrus.profile.facets.generation/.classpath
deleted file mode 100644
index efdacce142c..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation/.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.pde.core.requiredPlugins"/>

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

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

-</classpath>

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation/.project b/sandbox/org.eclipse.papyrus.profile.facets.generation/.project
deleted file mode 100644
index e277023ffcb..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation/.project
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.profile.facets.generation</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>

-			<arguments>

-				<dictionary>

-					<key>src_container</key>

-					<value>transforms</value>

-				</dictionary>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

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

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>

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

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

-	</natures>

-</projectDescription>

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.profile.facets.generation/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 02805d72a61..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri May 13 10:22:18 CEST 2011

-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/org.eclipse.papyrus.profile.facets.generation/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.profile.facets.generation/META-INF/MANIFEST.MF
deleted file mode 100644
index 4a4ee537c36..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.emf;bundle-version="2.6.0",

- org.eclipse.emf.facet.infra.facet;bundle-version="0.1.0"

-Export-Package: org.eclipse.papyrus.profile.facets.generation.postgene

- ration

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-Version: 0.10.0.qualifier

-Bundle-Name: Facet Generation (Incubation)

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.profile.facets.generation

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation/build.properties b/sandbox/org.eclipse.papyrus.profile.facets.generation/build.properties
deleted file mode 100644
index cc4fd85e322..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = META-INF/,\

-               transforms/

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation/src/org/eclipse/papyrus/profile/facets/generation/postgeneration/FacetSetSplitter.java b/sandbox/org.eclipse.papyrus.profile.facets.generation/src/org/eclipse/papyrus/profile/facets/generation/postgeneration/FacetSetSplitter.java
deleted file mode 100644
index 48e146e48e8..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation/src/org/eclipse/papyrus/profile/facets/generation/postgeneration/FacetSetSplitter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.eclipse.papyrus.profile.facets.generation.postgeneration;

-

-import java.io.IOException;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

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

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

-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.facet.infra.facet.FacetSet;

-

-

-public class FacetSetSplitter {

-

-	public static FacetSetSplitter instance = new FacetSetSplitter();

-

-	private FacetSetSplitter() {

-

-	}

-

-	public Set<Resource> splitFacetSet(FacetSet facetSet) {

-		return splitFacetSet(facetSet, true);

-	}

-

-	public Set<Resource> splitFacetSet(FacetSet facetSet, boolean removeEmptySets) {

-		return splitFacetSet(facetSet, true, facetSet.eResource().getURI());

-	}

-

-	public Set<Resource> splitFacetSet(FacetSet facetSet, boolean removeEmptySets, URI baseURI) {

-		Set<Resource> result = new HashSet<Resource>();

-		ResourceSet rs = new ResourceSetImpl();

-

-		Iterator<EPackage> iterator = facetSet.getESubpackages().iterator();

-		while(iterator.hasNext()) {

-			EPackage ePackage = iterator.next();

-			if(ePackage instanceof FacetSet) {

-				result.addAll(splitFacetSet((FacetSet)ePackage, removeEmptySets));

-				iterator.remove();

-			}

-		}

-

-		if(!(removeEmptySets && facetSet.getFacets().isEmpty())) {

-			Resource resource = rs.createResource(URI.createURI(facetSet.getName() + ".facetSet").resolve(baseURI));

-			resource.getContents().add(facetSet);

-			result.add(resource);

-

-			try {

-				resource.save(null);

-			} catch (IOException ex) {

-				ex.printStackTrace(System.err);

-			}

-		}

-

-		return result;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.profile.facets.generation/transforms/ProfileToFacetSet.qvto b/sandbox/org.eclipse.papyrus.profile.facets.generation/transforms/ProfileToFacetSet.qvto
deleted file mode 100644
index e9a89057d6b..00000000000
--- a/sandbox/org.eclipse.papyrus.profile.facets.generation/transforms/ProfileToFacetSet.qvto
+++ /dev/null
@@ -1,156 +0,0 @@
-modeltype facetset uses "http://www.eclipse.org/EmfFacet/infra/facet/0.8.incubation";
-modeltype uml uses "http://www.eclipse.org/uml2/4.0.0/UML";
-modeltype queryset uses "http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation";
-modeltype Ecore uses "http://www.eclipse.org/emf/2002/Ecore";
-
-transformation ProfileToFacetSet(in profile : uml, in umlEcore : Ecore, in ecore : Ecore, out facets : facetset, out queries : queryset);
-
-/**
-*	Package for queries implementation
-*/
-configuration property packageName : String; //For example : org.eclipse.papyrus.myProject
-
-main() {
-	log("Begin QVT Transformation");
-	profile.rootObjects()[Package]->map toFacetSet();
-	var querySet := profile.rootObjects()[Package]->any(e | true).map toQuerySet();
-	querySet.queries := queries.objectsOfType(ModelQuery);
-	log("End QVT Transformation");
-}
-
-query String::firstToLower() : String {
-	return  self.substring(1, 1).toLower()+self.substring(2, self.length());
-}
-
-mapping Package::toFacetSet() : FacetSet {
-	result.eClassifiers := self.ownedElement->select(e | e.oclIsKindOf(Stereotype)).oclAsType(Stereotype)->map toFacet();
-	result.eSubpackages := self.ownedElement->select(e | e.oclIsKindOf(Package)).oclAsType(Package)->map toFacetSet();
-	
-	result.extendedPackage := umlEcore.rootObjects()[EPackage]->any(e | true);
-	result.name := self.name.firstToLower()+'Facets';
-	result.nsPrefix := self.getQualifiedName().replace(":", "")+'FacetSet';
-	result.nsURI := 'http://www.eclipse.org/papyrus/'+self.getQualifiedName().toLower().replace("::", "/")+"/"+nsPrefix+'.facetSet';
-}
-
-mapping Package::toQuerySet() : ModelQuerySet {
-	result.associatedMetamodels := umlEcore.rootObjects()[EPackage];
-	result.name := self.name.firstToLower()+'QuerySet';
-	result.description := 'Set of queries for '+self.getQualifiedName();
-}
-
-query Package::findAllStereotypes() : Collection(Stereotype) {
-	var stereotypes := self.ownedElement->select(e | e.oclIsKindOf(Stereotype)).oclAsType(Stereotype);
-	stereotypes := stereotypes->union(self.ownedElement->select(e | e.oclIsKindOf(Package)).oclAsType(Package).findAllStereotypes());
-	return stereotypes;
-}
-
-mapping Stereotype::toFacet() : Facet {
-	name := self.name;
-	conditionQuery := self.map toQuery();
-	result.eSuperTypes := self.attribute->select(e | e.name.startsWith("base_")).getMetaClass(); -- UML Metaclass
-	result.eSuperTypes := result.eSuperTypes->union( -- Stereotype inheritance
-		self.generalization.target->select(e | e.oclIsKindOf(Stereotype)).oclAsType(Stereotype)->map toFacet()
-	);
-	
-	result.eStructuralFeatures := self.ownedAttribute->map toEStructuralFeature();
-}
-
-mapping Property::toEStructuralFeature() : EStructuralFeature disjuncts Property::toEAttribute, Property::toEReference{
-	//Nothing (Disjuncts)
-}
-
-abstract mapping Property::toFeature() : EStructuralFeature {
-	name := if self.isDerived then '/' else '' endif + self.name;
-	eType := self.type.getEClassifier();
-	lowerBound := self.lower;
-	upperBound := self.upper;
-	_ordered := self.isOrdered;
-	unique := self.isUnique;
-}
-
-abstract mapping Property::toFacetFeature() : FacetStructuralFeature {
-	valueQuery := self.map toGetQuery();
-	valueQuery := self.map toSetQuery();
-}
-
-mapping Property::toEAttribute() : FacetAttribute inherits Property::toFeature, Property::toFacetFeature 
-	when { self.type.oclIsKindOf(PrimitiveType) } {
-	//Nothing (Inherited)
-}
-
-mapping Property::toEReference() : FacetReference inherits Property::toFeature, Property::toFacetFeature {
-	//Nothing (Inherited)
-}
-
-mapping Property::toSetQuery() : JavaModelQuery {
-	name := 'Set'+self.owner.oclAsType(NamedElement).name +self.name.firstToUpper();
-	returnType := ecore.objectsOfType(EClass)->any(e | e.name = 'EObject');
-	scope := self.findScope();
-	implementationClassName := packageName+'.queries.setters.Set'+self.owner.oclAsType(NamedElement).name+self.name.firstToUpper();
-}
-
-mapping Property::toGetQuery() : JavaModelQuery {
-	name := 'Get'+self.owner.oclAsType(NamedElement).name +self.name.firstToUpper();
-	if self.type.oclIsKindOf(Enumeration) then{
-		returnType := umlEcore.objectsOfType(EClass)->any(e | e.name = 'EnumerationLiteral');
-		log('Enumeration return type'); 
-	}else
-		returnType := self.type.getEClassifier()
-	endif;
-	
-	if returnType.oclIsUndefined() then {
-		log('Cannot find a returnType for property '+self.getQualifiedName());
-		log('Type : '+self.type.name);
-		log('TypeClassifier : '+self.type.getEClassifier().name);
-	} endif;
-	
-	dump(returnType);
-	
-	scope := self.findScope();
-	implementationClassName := packageName+'.queries.getters.Get'+self.owner.oclAsType(NamedElement).name+self.name.firstToUpper();
-}
-
-query Property::findScope() : Collection(EClass){
-	var stereotype := self.owner.oclAsType(Stereotype);
-	var scope := stereotype.attribute->select(e | e.name.startsWith('base_')).getMetaClass();
-	
-	if scope->isEmpty() then 
-		log('Cannot find Scope for property '+self.getQualifiedName())
-	endif;
-	
-	return scope;
-}
-
-query Type::getEClassifier() : EClassifier {
-	return if self.oclIsKindOf(Stereotype) then
-		self.oclAsType(Stereotype).map toFacet()
-	else
-		umlEcore.objectsOfType(EClassifier)->any(e | e.name = self.name)
-	endif;
-}
-
-mapping Stereotype::toQuery() : JavaModelQuery {
-	name := 'is'+self.name;
-	description := 'Tests if the UML Element has the '+self.getQualifiedName()+' Stereotype';
-	returnType := ecore.objectsOfType(EClassifier)->any(e | e.name = 'EBoolean');
-	
-	if returnType.oclIsUndefined() then 
-		log('Cannot find EClassifier EBoolean')
-	endif;
-	
-	scope := umlEcore.objectsOfType(EClass)->any(e | e.name = 'Element');
-	upperBound := 1;
-	lowerBound := 1;
-	implementationClassName := packageName+'.queries.facets.Has'+self.getQualifiedName().replace(':', '')+'Query';
-}
-
-/**
-*	Return the metaclass corresponding to a stereotype extension
-*	Input : property p | p.name = "base_x"
-*	Ouput : EClass c | c.name = "x"
-*/
-query Property::getMetaClass() : EClass {
-	var metaclassName := self.name.substring(self.name.indexOf("_")+1, self.name.length());
-	return umlEcore.objectsOfType(EClass)->any(e | e.name = metaclassName); 
-}
-
diff --git a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/.classpath b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.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/org.eclipse.papyrus.sysml.table.efacet.requirement/.project b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/.project
deleted file mode 100644
index fb04985a85d..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.sysml.table.efacet.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/org.eclipse.papyrus.sysml.table.efacet.requirement/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/.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/org.eclipse.papyrus.sysml.table.efacet.requirement/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/META-INF/MANIFEST.MF
deleted file mode 100644
index 85b2399557e..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0

-Bundle-Name: EFacet Requirement SysML Table (Incubation)

-Bundle-Activator: org.eclipse.papyrus.sysml.table.efacet.requirement.A

- ctivator

-Bundle-ManifestVersion: 2

-Bundle-Vendor: Eclispe Modeling Project

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Bundle-SymbolicName: org.eclipse.papyrus.sysml.table.efacet.requiremen

- t;singleton:=true

-Bundle-ActivationPolicy: lazy

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.sysml.efacet;bundle-version="0.9.1",

- org.eclipse.papyrus.infra.table.efacet.common;bundle-version="0.9.1",

- org.eclipse.papyrus.infra.table.efacet.metamodel;bundle-version="0.9.1",

- org.eclipse.papyrus.infra.core;bundle-version="0.9.1",

- org.eclipse.papyrus.infra.emf.efacet;bundle-version="0.9.1"

-Bundle-Version: 0.9.1.qualifier

-

diff --git a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/about.html b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.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>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/org.eclipse.papyrus.sysml.table.efacet.requirement/build.properties b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/build.properties
deleted file mode 100644
index 6f20375d6c7..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml

diff --git a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/icons/table_SysML_Requirement.gif b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/icons/table_SysML_Requirement.gif
deleted file mode 100644
index 426869ed0ff..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/icons/table_SysML_Requirement.gif
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/icons/table_SysML_Requirement.png b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/icons/table_SysML_Requirement.png
deleted file mode 100644
index c671f9e6440..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/icons/table_SysML_Requirement.png
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/plugin.xml b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/plugin.xml
deleted file mode 100644
index 705d0c75c24..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/plugin.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

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

-      <editorDiagram

-            factoryClass="org.eclipse.papyrus.sysml.table.efacet.requirement.factory.RequirementTableEditorFactory"

-            icon="icons/table_SysML_Requirement.gif">

-      </editorDiagram>

-   </extension>

-<extension point="org.eclipse.ui.commands">

-      <command categoryId="org.eclipse.papyrus.editor.category" description="Create a new SysML Requirement Table Editor " id="org.eclipse.papyrus.sysml.table.efacet.requirement.creation" name="Create a new SysML Requirement Table Editor ">

-      </command>

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Create a new SysML Requirement Table Editor "

-            id="org.eclipse.papyrus.sysml.table.efacet.requirement.creation.withoutdialog"

-            name="Create a new SysML RequirementTable Editor Without Dialog">

-      </command>

-   </extension>

-   <extension point="org.eclipse.ui.handlers">

-      <handler class="org.eclipse.papyrus.sysml.table.efacet.requirement.handler.CreateRequirementTableEditorHandler" commandId="org.eclipse.papyrus.sysml.table.efacet.requirement.creation">

-         <activeWhen>

-            <or>

-               <with variable="activeEditorId">

-                  <equals value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </or>

-         </activeWhen>

-      </handler>

-      <handler

-            class="org.eclipse.papyrus.sysml.table.efacet.requirement.handler.CreateRequirementEditorHandlerWithoutDialog"

-            commandId="org.eclipse.papyrus.sysml.table.efacet.requirement.creation.withoutdialog">

-         <activeWhen>

-            <or>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </or>

-         </activeWhen>

-      </handler>

-   </extension>

-   <extension id="create.table.menus" name="Create Table Menus" point="org.eclipse.ui.menus">

-      <menuContribution allPopups="false" locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.table.efacet.creation">

-         <command commandId="org.eclipse.papyrus.sysml.table.efacet.requirement.creation" icon="icons/table_SysML_Requirement.gif" label="SysML Requirement" mnemonic="&amp;G" style="push" tooltip="Create a new SysML Requirement Table">

-            <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.ui.menu.efacet.table.creation">

-         <command

-               commandId="org.eclipse.papyrus.sysml.table.efacet.requirement.creation"

-               icon="icons/table_SysML_Requirement.gif"

-               label="SysML Requirement"

-               mnemonic="&amp;G"

-               style="push"

-               tooltip="Create a new SysML Requirement Table">

-            <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.toolbar.table.efacet.creation">

-         <command

-               commandId="org.eclipse.papyrus.sysml.table.efacet.requirement.creation"

-               icon="icons/table_SysML_Requirement.gif"

-               label="SysML Requirement"

-               mnemonic="&amp;G"

-               style="push"

-               tooltip="Create a new SysML Requirement Table">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-</plugin>

diff --git a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/resources/requirementtable.custom b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/resources/requirementtable.custom
deleted file mode 100644
index 03a8abd66b5..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/resources/requirementtable.custom
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<custom:Customization xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:custom="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet" xmlns:query="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet/query" name="requirement_table_hidden_columns">

- <eClassifiers xmi:type="custom:EClassCustomization" xmi:id="_NbeYMPKcEeGXopunkh-zug" conformanceTypedElement="_NbeYMfKcEeGXopunkh-zug">

-          <extendedMetaclass xmi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

-          <facetElements xmi:type="efacet:FacetAttribute" xmi:id="_NbeYMfKcEeGXopunkh-zug" name="isConforming" derived="true">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-            <query xmi:type="query:IsOneOfQuery" xmi:id="_NbeYM_KcEeGXopunkh-zug">

-              <expectedEObjects xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>

-              <expectedEObjects xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>

-              <expectedEObjects xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>

-              <expectedEObjects xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>

-              <expectedEObjects xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-              <expectedEObjects xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>

-              <expectedEObjects xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-            </query>

-          </facetElements>

-          <facetOperations xmi:type="efacet:FacetOperation" xmi:id="_Nbe_QPKcEeGXopunkh-zug" name="isVisible" lowerBound="1">

-            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>

-            <eParameters xmi:type="ecore:EParameter" xmi:id="_Nbe_QvKcEeGXopunkh-zug" name="eStructuralFeature">

-              <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

-            </eParameters>

-            <query xmi:type="custom:ETypedElementSwitchQuery" xmi:id="_Nbe_RPKcEeGXopunkh-zug">

-              <cases xmi:type="custom:ETypedElementCase" xmi:id="_Nbe_RfKcEeGXopunkh-zug">

-                <value xmi:type="query:FalseLiteralQuery" xmi:id="_QUxgkPKcEeGXopunkh-zug"/>

-              </cases>

-            </query>

-            <override xmi:type="efacet:FacetOperation" href="platform:/plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/isVisible"/>

-          </facetOperations>

-        </eClassifiers>

-</custom:Customization>

diff --git a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/resources/sysml_requirement_table.papyrustableconfiguration b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/resources/sysml_requirement_table.papyrustableconfiguration
deleted file mode 100644
index 582e7142fcc..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/resources/sysml_requirement_table.papyrustableconfiguration
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration:PapyrusTableConfiguration

-    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:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet"

-    xmlns:org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration="http://www.eclipse.org/Papyrus/PapyrusTableConfiguration/0.9.0/papyrustableconfiguration"

-    fillingMode="CONTEXT_FEATURE">

-  <listenContextFeature

-      href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-  <tableConfiguration>

-  <defaultLocalCustomizations

-        href="requirementtable.custom#/"/>

-      <canBePresentedInTheTable

-        xsi:type="efacet:FacetAttribute"

-       href="platform:/plugin/org.eclipse.papyrus.sysml.efacet/resources/sysml.efacet#//Utils/SysMLElement/isRequirement"/>

-      <instantiationMethod name="Requirement In" description="Create a new Requirement">

-      <instantiationOperation

-         href="platform:/plugin/org.eclipse.papyrus.sysml.efacet/resources/sysml.efacet#//Requirements/Requirement/createRequirement"/>

-    </instantiationMethod>

-    <defaultColumns xsi:type="efacet:FacetReference" href="platform:/plugin/org.eclipse.papyrus.infra.emf.efacet/resources/emf.efacet#//Extended_EObject/self"/>

-    <defaultColumns

-        xsi:type="ecore:EAttribute"

-        href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-  </tableConfiguration>

-</org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration:PapyrusTableConfiguration>

diff --git a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/Activator.java b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/Activator.java
deleted file mode 100644
index 34ae6d91a8e..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/Activator.java
+++ /dev/null
@@ -1,63 +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.table.efacet.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.table.efacet.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)

-	 */

-	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/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/editor/RequirementTableEditor.java b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/editor/RequirementTableEditor.java
deleted file mode 100644
index f2114f6398a..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/editor/RequirementTableEditor.java
+++ /dev/null
@@ -1,39 +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.table.efacet.requirement.editor;

-

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

-import org.eclipse.papyrus.infra.table.efacet.common.editor.AbstractSynchronizedTableEditor;

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

-

-

-public class RequirementTableEditor extends AbstractSynchronizedTableEditor {

-

-	/** the type of the editor */

-	public static final String EDITOR_TYPE = "PapyrusSysMLRequirementTable"; //$NON-NLS-1$

-

-	/** the default name for this table */

-	public static final String DEFAULT_NAME = "RequirementTable"; //$NON-NLS-1$

-

-	/**

-	 * @param servicesRegistry

-	 * @param rawModel

-	 * 

-	 */

-	public RequirementTableEditor(final ServicesRegistry servicesRegistry, final PapyrusTable rawModel) {

-		super(servicesRegistry, rawModel);

-	}

-

-

-}

diff --git a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/factory/RequirementTableEditorFactory.java b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/factory/RequirementTableEditorFactory.java
deleted file mode 100644
index 403ce52e3b3..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/factory/RequirementTableEditorFactory.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.sysml.table.efacet.requirement.factory;

-

-import org.eclipse.papyrus.infra.table.efacet.common.factory.AbstractTableEditorFactory;

-import org.eclipse.papyrus.sysml.table.efacet.requirement.editor.RequirementTableEditor;

-

-

-

-/**

- *

- * 

- */

-public class RequirementTableEditorFactory extends AbstractTableEditorFactory {

-

-

-	/**

-	 * Constructor.

-	 * 

-	 * @param diagramClass

-	 * @param expectedType

-	 */

-	public RequirementTableEditorFactory() {

-		super(RequirementTableEditor.class, RequirementTableEditor.EDITOR_TYPE);

-	}

-

-

-}

diff --git a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/handler/CreateRequirementEditorHandlerWithoutDialog.java b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/handler/CreateRequirementEditorHandlerWithoutDialog.java
deleted file mode 100644
index da3c33c45ac..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/handler/CreateRequirementEditorHandlerWithoutDialog.java
+++ /dev/null
@@ -1,34 +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.table.efacet.requirement.handler;

-

-

-

-public class CreateRequirementEditorHandlerWithoutDialog extends CreateRequirementTableEditorHandler {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 */

-	public CreateRequirementEditorHandlerWithoutDialog() {

-		super();

-	}

-

-

-	@Override

-	protected boolean shouldOpenNameDialog() {

-		return false;

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/handler/CreateRequirementTableEditorHandler.java b/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/handler/CreateRequirementTableEditorHandler.java
deleted file mode 100644
index 0567c8c0d47..00000000000
--- a/sandbox/org.eclipse.papyrus.sysml.table.efacet.requirement/src/org/eclipse/papyrus/sysml/table/efacet/requirement/handler/CreateRequirementTableEditorHandler.java
+++ /dev/null
@@ -1,64 +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.table.efacet.requirement.handler;

-

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

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

-import org.eclipse.papyrus.infra.table.efacet.common.handlers.AbstractCreateTableEditorHandler;

-import org.eclipse.papyrus.sysml.table.efacet.requirement.Activator;

-import org.eclipse.papyrus.sysml.table.efacet.requirement.editor.RequirementTableEditor;

-

-

-public class CreateRequirementTableEditorHandler extends AbstractCreateTableEditorHandler {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 */

-	public CreateRequirementTableEditorHandler() {

-		super(RequirementTableEditor.EDITOR_TYPE, RequirementTableEditor.DEFAULT_NAME);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.table.efacet.common.handlers.AbstractCreateTableEditorHandler#isEnabled()

-	 * 

-	 * @return

-	 */

-	@Override

-	public boolean isEnabled() {

-		final boolean enabled = super.isEnabled();

-		final EObject context = getTableContext();

-		//TODO improve the condition

-//		if(context instanceof Element) {

-//			return enabled && (UMLUtil.getStereotypeApplication((Element)context, Block.class) != null);

-//		}

-		return true;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.table.efacet.common.handlers.AbstractCreateTableEditorHandler#getPapyrusTableConfigurationURI()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected URI getPapyrusTableConfigurationURI() {

-		final String symbolicName = Activator.getDefault().getBundle().getSymbolicName();

-		final URI uri = URI.createPlatformPluginURI(symbolicName + "/resources/sysml_requirement_table.papyrustableconfiguration", true); //$NON-NLS-1$

-		return uri;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/.classpath b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/.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/org.eclipse.papyrus.uml.nattable.ws.preferences/.project b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/.project
deleted file mode 100644
index eeda059fd72..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.nattable.ws.preferences</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/org.eclipse.papyrus.uml.nattable.ws.preferences/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f287d53cf45..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/.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/org.eclipse.papyrus.uml.nattable.ws.preferences/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/META-INF/MANIFEST.MF
deleted file mode 100644
index c50303b5f72..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Papyrus table for Workspace Preferences (Incubation)
-Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.ws.preferences;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.uml.nattable.ws.preferences.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.1",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.1",
- org.eclipse.papyrus.infra.nattable.common;bundle-version="0.10.1",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.1",
- org.eclipse.papyrus.infra.emf;bundle-version="0.10.1",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.0.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.1",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.1",
- org.eclipse.papyrus.infra.emf.nattable,
- org.eclipse.papyrus.infra.tools;bundle-version="0.10.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/about.html b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/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/org.eclipse.papyrus.uml.nattable.ws.preferences/build.properties b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/build.properties
deleted file mode 100644
index 2b8285975bd..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               icons/,\

-               plugin.pdoc,\

-               about.html

-src.includes = about.html

diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/icons/file.png b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/icons/file.png
deleted file mode 100644
index 2bae43270eb..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/icons/file.png
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/icons/preferences_16x16.gif b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/icons/preferences_16x16.gif
deleted file mode 100644
index 4c07fea1449..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/icons/preferences_16x16.gif
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/icons/property.gif b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/icons/property.gif
deleted file mode 100644
index 867e05283d4..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/icons/property.gif
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/plugin.pdoc b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/plugin.pdoc
deleted file mode 100644
index 1e722b25b18..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/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 a table to edit preferences from the worskpace.">

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

-</doc:Documentation>

diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/plugin.xml b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/plugin.xml
deleted file mode 100644
index e7c48221adc..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/plugin.xml
+++ /dev/null
@@ -1,61 +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.uml.nattable.ws.preferences.tester.PreferencesTableCreationTester"

-            id="org.eclipse.papyrus.uml.nattable.ws.preferences.creationtester">

-      </tester>

-   </extension>

-   <extension

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

-      <axisManager

-            id="org.eclipse.papyrus.infra.nattable.propertyfile.property.axis.manager"

-            manager="org.eclipse.papyrus.uml.nattable.ws.preferences.manager.axis.PropertyFilePropertyAxisManager">

-      </axisManager>

-      <axisManager

-            id="org.eclipse.papyrus.infra.nattable.propertyfile.file.axis.manager"

-            manager="org.eclipse.papyrus.uml.nattable.ws.preferences.manager.axis.PropertyFileAxisManager">

-      </axisManager>

-   </extension>

-   <extension

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

-      <configuration

-            file="resources/nattablepreferences.nattableconfiguration">

-      </configuration>

-   </extension>

-   <extension

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

-      <cellManager

-            id="org.eclipse.papyrus.uml.nattable.ws.preferences.cellManager"

-            manager="org.eclipse.papyrus.uml.nattable.ws.preferences.manager.cell.PreferencesCellManager"

-            order="2">

-      </cellManager>

-   </extension>

-   <extension

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

-      <labelProvider

-            priority="10"

-            provider="org.eclipse.papyrus.uml.nattable.ws.preferences.provider.FileLabelProvider">

-         <labelProviderContext

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

-         </labelProviderContext>

-      </labelProvider>

-      <labelProvider

-            priority="10"

-            provider="org.eclipse.papyrus.uml.nattable.ws.preferences.provider.PropertyLabelProvider">

-         <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.uml.nattable.ws.preferences.celleditor.config.FilePropertyCellEditorConfiguration"

-            order="20">

-      </configuration>

-   </extension>

-

-</plugin>

diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/resources/nattablepreferences.nattableconfiguration b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/resources/nattablepreferences.nattableconfiguration
deleted file mode 100644
index b76417b9e87..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/resources/nattablepreferences.nattableconfiguration
+++ /dev/null
@@ -1,17 +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: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 allows to edit preferences" name="PreferencesTable" type="PapyrusPreferencesTable" iconPath="platform:/plugin/org.eclipse.papyrus.uml.nattable.ws.preferences/icons/preferences_16x16.gif" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">

-  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.uml.nattable.ws.preferences.creationtester"/>

-  <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#//Element/ownedComment"/>

-    </ownedAxisConfigurations>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.infra.nattable.propertyfile.file.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:ObjectLabelProviderConfiguration"/>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.infra.nattable.propertyfile.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>

-  </columnHeaderAxisConfiguration>

-  <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the property of the files" name="Preferences Property Axis Manager"/>

-  <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="Provides the files properties" name="Provides the files properties"/>

-</nattableconfiguration:TableConfiguration>

diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/Activator.java b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/Activator.java
deleted file mode 100644
index 2e8c5cae75e..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/Activator.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:

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

- *

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

-package org.eclipse.papyrus.uml.nattable.ws.preferences;

-

-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.ws.preferences"; //$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/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/celleditor/config/FilePropertyCellEditorConfiguration.java b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/celleditor/config/FilePropertyCellEditorConfiguration.java
deleted file mode 100644
index 421461e682f..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/celleditor/config/FilePropertyCellEditorConfiguration.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.uml.nattable.ws.preferences.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.edit.editor.IComboBoxDataProvider;

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

-import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig;

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

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

-import org.eclipse.papyrus.uml.nattable.ws.preferences.utils.Constants;

-

-

-

-public class FilePropertyCellEditorConfiguration extends EStructuralFeatureEditorConfig {

-

-	@Override

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

-		return super.getICellEditor(table, axisElement, elementProvider);

-	}

-

-	@Override

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

-		return super.getComboDataProvider(table, axisElement, elementProvider);

-	}

-

-	@Override

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

-		return super.getDisplayConvert(axisElement, table, provider);

-	}

-

-	@Override

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

-		return super.getCellPainter(table, axisElement);

-	}

-

-	@Override

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

-		return super.getDisplayMode(table, axisElement);

-	}

-

-	@Override

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

-		return super.getDataValidator(table, axisElement);

-	}

-

-	@Override

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

-		return axisElement instanceof String && ((String)axisElement).startsWith(Constants.PROPERTY_PREFIX);

-	}

-

-	@Override

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

-		return SINGLE_STRING;

-		//		return super.getFeatureIdentifier(table, axisElement);

-	}

-

-	@Override

-	public String getEditorDescription() {

-		return super.getEditorDescription();

-	}

-

-

-

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/axis/PropertyFileAxisManager.java b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/axis/PropertyFileAxisManager.java
deleted file mode 100644
index ba02dd97372..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/axis/PropertyFileAxisManager.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.uml.nattable.ws.preferences.manager.axis;

-

-import java.io.File;

-import java.io.FileInputStream;

-import java.io.FileNotFoundException;

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Properties;

-

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

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

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

-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.papyrus.uml.nattable.ws.preferences.utils.Constants;

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

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

-

-//FIXME : all input and output steam must be closed in this plugin!!! VERIFY THEM

-public class PropertyFileAxisManager extends AbstractSynchronizedOnFeatureAxisManager {

-

-	@Override

-	public void init(INattableModelManager manager, AxisManagerRepresentation rep, AbstractAxisProvider provider) {

-		super.init(manager, rep, provider);

-	}

-

-	/**

-	 * 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(getListenFeatures().contains(msg.getFeature())) {//FIXME : create our own adapter for derived/subset feature

-					getTableManager().updateAxisContents(getRepresentedContentProvider());

-					if(getRepresentedContentProvider() == getTableManager().getHorizontalAxisProvider()) {

-						getTableManager().updateAxisContents(getTableManager().getVerticalAxisProvider());

-					} else {

-						getTableManager().updateAxisContents(getTableManager().getHorizontalAxisProvider());

-					}

-

-				}

-			};

-		};

-

-		getTableContext().eAdapters().add(this.featureListener);

-	}

-

-	@Override

-	public NattableModelManager getTableManager() {

-		return super.getTableManager();

-	}

-

-	@Override

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

-		return super.canInsertAxis(objectsToAdd, index);

-	}

-

-	@Override

-	public boolean canCreateAxisElement(String elementId) {

-		return super.canCreateAxisElement(elementId);

-	}

-

-	@Override

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

-		return super.canDropAxisElement(objectsToAdd);

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-	}

-

-	@Override

-	public boolean canBeUsedAsRowManager() {

-		return super.canBeUsedAsRowManager();

-	}

-

-	@Override

-	public boolean canBeUsedAsColumnManager() {

-		return super.canBeUsedAsColumnManager();

-	}

-

-	@Override

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

-		return super.getAddAxisCommand(domain, objectToAdd);

-	}

-

-	@Override

-	public Command getInsertAxisCommand(Collection<Object> objectsToAdd, int index) {

-		return super.getInsertAxisCommand(objectsToAdd, index);

-	}

-

-	@Override

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

-		return super.getComplementaryAddAxisCommand(domain, objectToAdd);

-	}

-

-	@Override

-	public AbstractAxisProvider getRepresentedContentProvider() {

-		return super.getRepresentedContentProvider();

-	}

-

-	@Override

-	public void setHeaderDataValue(int columnIndex, int rowIndex, Object newValue) {

-		super.setHeaderDataValue(columnIndex, rowIndex, newValue);

-	}

-

-	@Override

-	public boolean isAllowedContents(Object object) {

-		return super.isAllowedContents(object);

-	}

-

-	@Override

-	public boolean canMoveAxis() {

-		return true;

-	}

-

-	@Override

-	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted) {

-		return super.createPossibleAxisContentProvider(isRestricted);

-	}

-

-	@Override

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

-		return super.getDestroyAxisCommand(domain, objectToDestroy);

-	}

-

-	@Override

-	public Collection<Object> getAllManagedAxis() {

-		final Element el = (Element)getTableContext();

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

-		Collection<Object> prop = new HashSet<Object>();

-		Properties properties = new Properties();

-		for(final Comment current : el.getOwnedComments()) {

-			String body = current.getBody();

-			if(body.startsWith(Constants.WORKSPACE_PREFIX)) {

-

-				//				Properties currentProp = new Properties();

-				//				try {

-				//					currentProp.load(new FileInputStream(filePath));

-				//				} catch (FileNotFoundException e) {

-				//					e.printStackTrace();

-				//				} catch (IOException e) {

-				//					e.printStackTrace();

-				//				}

-				//				//				comments.add(current);

-				//				prop.add(currentProp);

-				FileInputStream fis = null;

-				try {

-					fis = new FileInputStream(body.replace(Constants.WORKSPACE_PREFIX, ""));

-					properties.load(fis);

-					prop.add(body);

-				} catch (FileNotFoundException e) {

-					e.printStackTrace();

-				} catch (IOException e) {

-					e.printStackTrace();

-				} finally {

-					if(fis != null) {

-						try {

-							fis.close();

-						} catch (IOException e) {

-							e.printStackTrace();

-						}

-					}

-					prop.clear();

-				}

-

-			} else if(body.startsWith(Constants.FOLDER)) {

-				//				String path = body.replace(Constants.FOLDER, newChar)

-				File folder = new File(body.replace(Constants.FOLDER, ""));

-				File[] listOfFiles = folder.listFiles();

-

-				for(int i = 0; i < listOfFiles.length; i++) {

-					if(listOfFiles[i].isFile()) {

-						prop.add(Constants.WORKSPACE_PREFIX + listOfFiles[i].getAbsolutePath());

-						//						System.out.println("File " + listOfFiles[i].getAbsolutePath());

-						//						prop.add(e)

-					} else if(listOfFiles[i].isDirectory()) {

-						System.out.println("Directory " + listOfFiles[i].getName());

-					}

-				}

-			}

-		}

-

-		properties.clear();

-		return prop;

-	}

-

-

-	@Override

-	public void moveAxis(Object elementToMove, int newIndex) {

-		super.moveAxis(elementToMove, newIndex);

-	}

-

-	@Override

-	public void openEditAxisAliasDialog(NatEventData event, int axisPosition) {

-		super.openEditAxisAliasDialog(event, axisPosition);

-	}

-

-	@Override

-	public String getElementAxisName(IAxis axis) {

-		return super.getElementAxisName(axis);

-	}

-

-	@Override

-	public AxisManagerRepresentation getAxisManagerRepresentation() {

-		return super.getAxisManagerRepresentation();

-	}

-

-	@Override

-	public boolean canDestroyAxis(List<Integer> axisPositions) {

-		return super.canDestroyAxis(axisPositions);

-	}

-

-	@Override

-	public boolean canDestroyAxisElement(List<Integer> axisPositions) {

-		return super.canDestroyAxisElement(axisPositions);

-	}

-

-	@Override

-	public void destroyAxis(List<Integer> axisPositions) {

-		super.destroyAxis(axisPositions);

-	}

-

-	@Override

-	public boolean canDestroyAxis(Integer axisPosition) {

-		return super.canDestroyAxis(axisPosition);

-	}

-

-	@Override

-	protected List<Object> getElements(List<Integer> axisPositions) {

-		return super.getElements(axisPositions);

-	}

-

-	@Override

-	public void destroyAxisElement(List<Integer> axisPosition) {

-		super.destroyAxisElement(axisPosition);

-	}

-

-	@Override

-	protected List<Object> getElements() {

-		return super.getElements();

-	}

-

-	@Override

-	public boolean isSlave() {

-		return false;

-	}

-

-	//	@Override

-	//	public boolean isDynamic() {

-	//		return true;

-	//	}

-

-	@Override

-	public boolean canEditAxisHeader() {

-		return false;

-	}

-

-	@Override

-	public boolean canDestroyAxisElement(Integer axisIndex) {

-		return false;

-	}

-

-	@Override

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

-		return null;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/axis/PropertyFilePropertyAxisManager.java b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/axis/PropertyFilePropertyAxisManager.java
deleted file mode 100644
index 2afb7ae9574..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/axis/PropertyFilePropertyAxisManager.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

- * http://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.ws.preferences.manager.axis;

-

-import java.io.FileInputStream;

-import java.io.FileNotFoundException;

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-import java.util.Map.Entry;

-import java.util.Properties;

-import java.util.Set;

-

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

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

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

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

-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.papyrus.uml.nattable.ws.preferences.utils.Constants;

-

-

-public class PropertyFilePropertyAxisManager extends AbstractAxisManager {

-

-	@Override

-	public void init(INattableModelManager manager, AxisManagerRepresentation rep, AbstractAxisProvider provider) {

-		super.init(manager, rep, provider);

-	}

-

-	@Override

-	public NattableModelManager getTableManager() {

-		return super.getTableManager();

-	}

-

-	@Override

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

-		return super.canInsertAxis(objectsToAdd, index);

-	}

-

-	@Override

-	public boolean canCreateAxisElement(String elementId) {

-		return super.canCreateAxisElement(elementId);

-	}

-

-	@Override

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

-		return super.canDropAxisElement(objectsToAdd);

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-	}

-

-	@Override

-	public boolean canBeUsedAsRowManager() {

-		return super.canBeUsedAsRowManager();

-	}

-

-	@Override

-	public boolean canBeUsedAsColumnManager() {

-		return super.canBeUsedAsColumnManager();

-	}

-

-	@Override

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

-		return super.getAddAxisCommand(domain, objectToAdd);

-	}

-

-	@Override

-	public Command getInsertAxisCommand(Collection<Object> objectsToAdd, int index) {

-		return super.getInsertAxisCommand(objectsToAdd, index);

-	}

-

-	@Override

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

-		return super.getComplementaryAddAxisCommand(domain, objectToAdd);

-	}

-

-	@Override

-	public AbstractAxisProvider getRepresentedContentProvider() {

-		return super.getRepresentedContentProvider();

-	}

-

-	@Override

-	public void setHeaderDataValue(int columnIndex, int rowIndex, Object newValue) {

-		super.setHeaderDataValue(columnIndex, rowIndex, newValue);

-	}

-

-	@Override

-	public boolean isAllowedContents(Object object) {

-		return super.isAllowedContents(object);

-	}

-

-	@Override

-	public boolean canMoveAxis() {

-		return super.canMoveAxis();

-	}

-

-	@Override

-	public IRestrictedContentProvider createPossibleAxisContentProvider(boolean isRestricted) {

-		return super.createPossibleAxisContentProvider(isRestricted);

-	}

-

-	@Override

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

-		return super.getDestroyAxisCommand(domain, objectToDestroy);

-	}

-

-	@Override

-	public Collection<Object> getAllManagedAxis() {

-		List<Object> rowElements = getTableManager().getRowElementsList();//FIXME use the best way for that!

-		Collection<Object> values = new ArrayList<Object>();

-		for(final Object current : rowElements) {

-			if(current instanceof String) {

-				//				String filePath = body.replace("wsPref:/", "");

-				Properties currentProp = new Properties();

-				try {

-					currentProp.load(new FileInputStream(((String)current).replace(Constants.WORKSPACE_PREFIX, "")));

-				} catch (FileNotFoundException e) {

-					e.printStackTrace();

-				} catch (IOException e) {

-					e.printStackTrace();

-				}

-				Set<Entry<Object, Object>> entrySet = ((Properties)currentProp).entrySet();

-				for(Entry<Object, Object> entry : entrySet) {

-					values.add(Constants.PROPERTY_PREFIX + entry.getKey());

-				}

-				currentProp.clear();

-				//				Enumeration<Object> elements = currentProp.elements();

-				//				while(elements.hasMoreElements()) {

-				//					values.add(elements.nextElement());

-				//				}

-				//				int i = 0;

-				//				i++;

-				//				//				comments.add(current);

-				//				prop.add(currentProp);

-			}

-			//			if(current instanceof Properties) {

-			//				values.addAll(((Properties)current).entrySet());

-			//				Enumeration<Object> el = ((Properties)current).elements();

-			//				while(el.hasMoreElements()) {

-			//					System.out.println(((Properties)current).get(el.nextElement()));

-			//

-			//					//					System.out.println(((Properties)current).getProperty(el.nextElement()));

-			//					//					System.out.println(el.nextElement());

-			//				}

-			//				//				Object next = el.nextElement();

-			//				//				int i = 0;

-			//				//				i++;

-			//			}

-		}

-		return values;

-	}

-

-	@Override

-	public void moveAxis(Object elementToMove, int newIndex) {

-		super.moveAxis(elementToMove, newIndex);

-	}

-

-	@Override

-	public void openEditAxisAliasDialog(NatEventData event, int axisPosition) {

-		super.openEditAxisAliasDialog(event, axisPosition);

-	}

-

-	@Override

-	public String getElementAxisName(IAxis axis) {

-		return super.getElementAxisName(axis);

-	}

-

-	@Override

-	public AxisManagerRepresentation getAxisManagerRepresentation() {

-		return super.getAxisManagerRepresentation();

-	}

-

-	@Override

-	public boolean canDestroyAxis(List<Integer> axisPositions) {

-		return super.canDestroyAxis(axisPositions);

-	}

-

-	@Override

-	public boolean canDestroyAxisElement(List<Integer> axisPositions) {

-		return super.canDestroyAxisElement(axisPositions);

-	}

-

-	@Override

-	public void destroyAxis(List<Integer> axisPositions) {

-		super.destroyAxis(axisPositions);

-	}

-

-	@Override

-	public boolean canDestroyAxis(Integer axisPosition) {

-		return super.canDestroyAxis(axisPosition);

-	}

-

-	@Override

-	protected List<Object> getElements(List<Integer> axisPositions) {

-		return super.getElements(axisPositions);

-	}

-

-	@Override

-	public void destroyAxisElement(List<Integer> axisPosition) {

-		super.destroyAxisElement(axisPosition);

-	}

-

-	@Override

-	protected List<Object> getElements() {

-		return super.getElements();

-	}

-

-	@Override

-	public boolean isSlave() {

-		return false;

-	}

-

-	//	@Override

-	//	public boolean isDynamic() {

-	//		return true;

-	//	}

-

-	@Override

-	public boolean canEditAxisHeader() {

-		return false;

-	}

-

-	@Override

-	public boolean canDestroyAxisElement(Integer axisIndex) {

-		return false;

-	}

-

-	@Override

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

-		return null;

-	}

-

-	@Override

-	public boolean isDynamic() {

-		return true;

-	}

-

-	@Override

-	public boolean canBeSavedAsConfig() {

-		return false;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/cell/PreferencesCellManager.java b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/cell/PreferencesCellManager.java
deleted file mode 100644
index 8ee72f89d62..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/manager/cell/PreferencesCellManager.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.uml.nattable.ws.preferences.manager.cell;

-

-import java.io.File;

-import java.io.FileInputStream;

-import java.io.FileNotFoundException;

-import java.io.FileOutputStream;

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Properties;

-

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

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

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

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

-import org.eclipse.papyrus.uml.nattable.ws.preferences.Activator;

-import org.eclipse.papyrus.uml.nattable.ws.preferences.utils.Constants;

-

-

-public class PreferencesCellManager extends AbstractCellManager {

-

-	@Override

-	public boolean handles(Object columnElement, Object rowElement) {

-		return organizedAndResolvedValue(columnElement, rowElement) != null;

-	}

-

-	@Override

-	protected Object doGetValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {

-		final List<Object> elements = organizedAndResolvedValue(columnElement, rowElement);

-		Properties prop = new Properties();

-		FileInputStream fis = null;

-

-		try {

-			fis = new FileInputStream(new File((String)elements.get(0)));

-

-		} catch (FileNotFoundException e) {

-			Activator.log.error(e);

-		}

-		try {

-			prop.load(fis);

-		} catch (FileNotFoundException e) {

-			Activator.log.error(e);

-		} catch (IOException e) {

-			Activator.log.error(e);

-		}

-

-		String propName = (String)elements.get(1);

-		try {

-			fis.close();

-		} catch (IOException e) {

-			Activator.log.error(e);

-		}

-		if(prop.containsKey(propName)) {

-			return prop.getProperty(propName);

-		}

-		return NOT_AVALAIBLE;

-	}

-

-	@Override

-	public void setValue(TransactionalEditingDomain domain, Object columnElement, Object rowElement, Object newValue, INattableModelManager tableManager) {

-		final List<Object> elements = organizedAndResolvedValue(columnElement, rowElement);

-		Properties prop = new Properties();

-		FileInputStream fis = null;

-		FileOutputStream fos = null;

-		try {

-			fis = new FileInputStream(new File((String)elements.get(0)));

-			fos = new FileOutputStream(new File((String)elements.get(0)));

-		} catch (FileNotFoundException e) {

-			Activator.log.error(e);

-		}

-		if(fis != null) {

-			//			try {

-			try {

-				prop.load(fis);

-				String propName = (String)elements.get(1);

-				prop.put(propName, newValue);

-

-				prop.store(fos, "");

-			} catch (IOException e) {

-				Activator.log.error(e);

-			}

-		}

-		if(fis != null) {

-			try {

-				fis.close();

-			} catch (IOException e) {

-				Activator.log.error(e);

-			}

-		}

-		if(fos != null) {

-			try {

-				fos.close();

-			} catch (IOException e) {

-				Activator.log.error(e);

-			}

-		}

-		prop.clear();

-	}

-

-	@Override

-	public boolean isCellEditable(Object columnElement, Object rowElement) {

-		final List<Object> elements = organizedAndResolvedValue(columnElement, rowElement);

-		Properties prop = new Properties();

-		FileInputStream fis = null;

-		try {

-			fis = new FileInputStream(new File((String)elements.get(0)));

-		} catch (FileNotFoundException e) {

-			Activator.log.error(e);

-		}

-		try {

-			prop.load(fis);

-		} catch (FileNotFoundException e) {

-			Activator.log.error(e);

-		} catch (IOException e) {

-			Activator.log.error(e);

-		}

-		try {

-			fis.close();

-		} catch (IOException e) {

-			Activator.log.error(e);

-		}

-		String propName = (String)elements.get(1);

-

-		return prop.containsKey(propName);

-	}

-

-	@Override

-	public Command getSetValueCommand(TransactionalEditingDomain domain, Object columnElement, Object rowElement, Object newValue, INattableModelManager tableManager) {

-		return super.getSetValueCommand(domain, columnElement, rowElement, newValue, tableManager);

-	}

-

-	protected List<Object> organizedAndResolvedValue(final Object columnlement, final Object rowElement) {

-		List<Object> elements = null;

-		if(columnlement instanceof String && ((String)columnlement).startsWith(Constants.PROPERTY_PREFIX) && rowElement instanceof String && ((String)rowElement).startsWith(Constants.WORKSPACE_PREFIX)) {

-			elements = new ArrayList<Object>();

-			elements.add(((String)rowElement).replace(Constants.WORKSPACE_PREFIX, ""));

-			elements.add(((String)columnlement).replace(Constants.PROPERTY_PREFIX, ""));

-		} else if(rowElement instanceof String && ((String)rowElement).startsWith(Constants.PROPERTY_PREFIX) && columnlement instanceof String && ((String)columnlement).startsWith(Constants.WORKSPACE_PREFIX)) {

-			elements = new ArrayList<Object>();

-			elements.add(((String)columnlement).replace(Constants.WORKSPACE_PREFIX, ""));

-			elements.add(((String)rowElement).replace(Constants.PROPERTY_PREFIX, ""));

-

-		}

-

-		return elements;

-

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/provider/FileLabelProvider.java b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/provider/FileLabelProvider.java
deleted file mode 100644
index cf4cbb05c45..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/provider/FileLabelProvider.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.uml.nattable.ws.preferences.provider;

-

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

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

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

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

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

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

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

-import org.eclipse.papyrus.uml.nattable.ws.preferences.utils.Constants;

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

-

-

-public class FileLabelProvider extends AbstractNattableCellLabelProvider {

-

-	@Override

-	public boolean accept(Object element) {

-		if(element instanceof LabelProviderCellContextElementWrapper) {

-			element = ((LabelProviderCellContextElementWrapper)element).getObject();

-			return element instanceof String && ((String)element).startsWith(Constants.WORKSPACE_PREFIX);

-		}

-		return false;

-	}

-

-	@Override

-	public Image getImage(Object element) {

-		return Activator.getDefault().getImage(org.eclipse.papyrus.uml.nattable.ws.preferences.Activator.PLUGIN_ID, "icons/file.png");

-	}

-

-	@Override

-	public String getText(Object element) {

-		if(element instanceof LabelProviderCellContextElementWrapper) {

-			element = ((LabelProviderCellContextElementWrapper)element).getObject();

-			String path = (String)element;

-			int lastIndex = path.lastIndexOf("\\") + 1;

-			return path.substring(lastIndex, path.length());

-

-		}

-		return null;

-	}

-

-	@Override

-	public void addListener(ILabelProviderListener listener) {

-		super.addListener(listener);

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-	}

-

-	@Override

-	public boolean isLabelProperty(Object element, String property) {

-		return super.isLabelProperty(element, property);

-	}

-

-	@Override

-	public void removeListener(ILabelProviderListener listener) {

-		super.removeListener(listener);

-	}

-

-	@Override

-	protected Object getRowObject(ILayerCell cell, IConfigRegistry registry) {

-		return super.getRowObject(cell, registry);

-	}

-

-	@Override

-	protected Object getColumnObject(ILayerCell cell, IConfigRegistry registry) {

-		return super.getColumnObject(cell, registry);

-	}

-

-	@Override

-	protected ITableAxisElementProvider getAxisContentProvider(IConfigRegistry registry) {

-		return super.getAxisContentProvider(registry);

-	}

-

-	@Override

-	protected LabelProviderService getLabelProviderService(IConfigRegistry registry) {

-		return super.getLabelProviderService(registry);

-	}

-

-	@Override

-	protected ILabelProviderConfiguration getLabelConfiguration(LabelProviderCellContextElementWrapper element) {

-		return super.getLabelConfiguration(element);

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/provider/PropertyLabelProvider.java b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/provider/PropertyLabelProvider.java
deleted file mode 100644
index 5842685f279..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/provider/PropertyLabelProvider.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

- * http://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.ws.preferences.provider;

-

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

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

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

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

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

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

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

-import org.eclipse.papyrus.uml.nattable.ws.preferences.utils.Constants;

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

-

-

-public class PropertyLabelProvider extends AbstractNattableCellLabelProvider {

-

-	@Override

-	public boolean accept(Object element) {

-		if(element instanceof LabelProviderCellContextElementWrapper) {

-			element = ((LabelProviderCellContextElementWrapper)element).getObject();

-			return element instanceof String && ((String)element).startsWith(Constants.PROPERTY_PREFIX);

-		}

-		return false;

-	}

-

-	@Override

-	public Image getImage(Object element) {

-		return Activator.getDefault().getImage(org.eclipse.papyrus.uml.nattable.ws.preferences.Activator.PLUGIN_ID, "icons/property.gif");

-	}

-

-	@Override

-	public String getText(Object element) {

-		if(element instanceof LabelProviderCellContextElementWrapper) {

-			element = ((LabelProviderCellContextElementWrapper)element).getObject();

-			return ((String)element).replace(Constants.PROPERTY_PREFIX, "");

-		}

-		return null;

-

-	}

-

-	@Override

-	public void addListener(ILabelProviderListener listener) {

-		super.addListener(listener);

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-	}

-

-	@Override

-	public boolean isLabelProperty(Object element, String property) {

-		return super.isLabelProperty(element, property);

-	}

-

-	@Override

-	public void removeListener(ILabelProviderListener listener) {

-		super.removeListener(listener);

-	}

-

-	@Override

-	protected Object getRowObject(ILayerCell cell, IConfigRegistry registry) {

-		return super.getRowObject(cell, registry);

-	}

-

-	@Override

-	protected Object getColumnObject(ILayerCell cell, IConfigRegistry registry) {

-		return super.getColumnObject(cell, registry);

-	}

-

-	@Override

-	protected ITableAxisElementProvider getAxisContentProvider(IConfigRegistry registry) {

-		return super.getAxisContentProvider(registry);

-	}

-

-	@Override

-	protected LabelProviderService getLabelProviderService(IConfigRegistry registry) {

-		return super.getLabelProviderService(registry);

-	}

-

-	@Override

-	protected ILabelProviderConfiguration getLabelConfiguration(LabelProviderCellContextElementWrapper element) {

-		return super.getLabelConfiguration(element);

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/tester/PreferencesTableCreationTester.java b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/tester/PreferencesTableCreationTester.java
deleted file mode 100644
index 3c18b877b0c..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/tester/PreferencesTableCreationTester.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.uml.nattable.ws.preferences.tester;

-

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

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

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

-import org.eclipse.papyrus.infra.nattable.tester.ITableTester;

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

-

-

-public class PreferencesTableCreationTester implements ITableTester {

-

-

-	@Override

-	public IStatus isAllowed(Object context) {

-		if(context instanceof Element) {

-			return Status.OK_STATUS;

-		}

-		return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selection is not an Uml Element");

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/utils/Constants.java b/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/utils/Constants.java
deleted file mode 100644
index adaf05a9078..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.nattable.ws.preferences/src/org/eclipse/papyrus/uml/nattable/ws/preferences/utils/Constants.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

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

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

- * which accompanies this distribution, and is available at

- * http://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.ws.preferences.utils;

-

-

-public class Constants {

-

-

-	private Constants() {

-		//to prevent instanciation

-	}

-

-	public static final String WORKSPACE_PREFIX = "wsPref:/";

-

-	public static final String PROPERTY_PREFIX = "property:/";

-

-	public static final String FOLDER = "folder:/";

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/.classpath b/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/.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/org.eclipse.papyrus.uml.table.efacet.generic.tests/.project b/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/.project
deleted file mode 100644
index 631f711272d..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.table.efacet.generic.tests</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/org.eclipse.papyrus.uml.table.efacet.generic.tests/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/.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/org.eclipse.papyrus.uml.table.efacet.generic.tests/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 0829c9f0fb0..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tests UML Generic Table (Incubation)
-Bundle-SymbolicName: org.eclipse.papyrus.uml.table.efacet.generic.tests
-Bundle-Version: 0.9.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.uml.table.efacet.generic.tests.Activator
-Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.uml.table.efacet.generic;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.table.efacet.common;bundle-version="0.9.0",
- org.eclipse.papyrus.junit.utils;bundle-version="0.9.0",
- org.eclipse.papyrus.views.modelexplorer,
- org.eclipse.core.resources,
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.ui.navigator;bundle-version="3.5.200",
- org.eclipse.papyrus.infra.table.efacet.metamodel;bundle-version="0.9.0",
- org.eclipse.emf.facet.widgets.table.ui,
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/build.properties b/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/build.properties
deleted file mode 100644
index 41eb6ade2b4..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/org.eclipse.papyrus.uml.table.efacet.generic.tests.launch b/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/org.eclipse.papyrus.uml.table.efacet.generic.tests.launch
deleted file mode 100644
index d7d8c26371b..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/org.eclipse.papyrus.uml.table.efacet.generic.tests.launch
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.table.efacet.generic.tests/src/org/eclipse/papyrus/uml/table/efacet/generic/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.table.efacet.generic.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.table.efacet.generic.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms60m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=256M"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/resources/model.di b/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/resources/model.di
deleted file mode 100644
index 61c16241819..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/resources/model.di
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="model.notation#_9tRbkOEkEeGGo5AIoeD6vw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="model.notation#_9tRbkOEkEeGGo5AIoeD6vw"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/resources/model.notation b/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/resources/model.notation
deleted file mode 100644
index 609aeb8e987..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/resources/model.notation
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_9tRbkOEkEeGGo5AIoeD6vw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="__O3xMOEkEeGGo5AIoeD6vw" type="2008" fontName="Segoe UI" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__O-e4OEkEeGGo5AIoeD6vw" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__O-e4eEkEeGGo5AIoeD6vw" key="ShadowFigure_Value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__O-e4uEkEeGGo5AIoeD6vw" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__O-e4-EkEeGGo5AIoeD6vw" key="displayNameLabelIcon_value" value="false"/>

-    </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__O_F8OEkEeGGo5AIoeD6vw" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__O_F8eEkEeGGo5AIoeD6vw" key="QualifiedNameDepth" value="1000"/>

-    </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="__PA7IOEkEeGGo5AIoeD6vw" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="__PCwUOEkEeGGo5AIoeD6vw" type="7017">

-      <styles xmi:type="notation:TitleStyle" xmi:id="__PCwUeEkEeGGo5AIoeD6vw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="__PCwUuEkEeGGo5AIoeD6vw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="__PCwU-EkEeGGo5AIoeD6vw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__PCwVOEkEeGGo5AIoeD6vw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="__PCwVeEkEeGGo5AIoeD6vw" type="7018">

-      <styles xmi:type="notation:TitleStyle" xmi:id="__PCwVuEkEeGGo5AIoeD6vw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="__PCwV-EkEeGGo5AIoeD6vw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="__PCwWOEkEeGGo5AIoeD6vw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__PCwWeEkEeGGo5AIoeD6vw"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="__PCwWuEkEeGGo5AIoeD6vw" type="7019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="__PCwW-EkEeGGo5AIoeD6vw"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="__PCwXOEkEeGGo5AIoeD6vw"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="__PCwXeEkEeGGo5AIoeD6vw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__PCwXuEkEeGGo5AIoeD6vw"/>

-    </children>

-    <element xmi:type="uml:Class" href="model.uml#__OR7UOEkEeGGo5AIoeD6vw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="__O3xMeEkEeGGo5AIoeD6vw" x="332" y="203"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_9tSCoOEkEeGGo5AIoeD6vw"/>

-  <element xmi:type="uml:Model" href="model.uml#_9ssMwOEkEeGGo5AIoeD6vw"/>

-</notation:Diagram>

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/resources/model.uml b/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/resources/model.uml
deleted file mode 100644
index 6ca721ad327..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/resources/model.uml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_9ssMwOEkEeGGo5AIoeD6vw" name="Model">

-  <packageImport xmi:id="_9ssMweEkEeGGo5AIoeD6vw">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-  <packagedElement xmi:type="uml:Class" xmi:id="__OR7UOEkEeGGo5AIoeD6vw" name="Class1"/>

-</uml:Model>

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/src/org/eclipse/papyrus/uml/table/efacet/generic/tests/Activator.java b/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/src/org/eclipse/papyrus/uml/table/efacet/generic/tests/Activator.java
deleted file mode 100644
index 1c06e378b0b..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/src/org/eclipse/papyrus/uml/table/efacet/generic/tests/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.papyrus.uml.table.efacet.generic.tests;

-

-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.table.efacet.generic.tests"; //$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/org.eclipse.papyrus.uml.table.efacet.generic.tests/src/org/eclipse/papyrus/uml/table/efacet/generic/tests/AllTests.java b/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/src/org/eclipse/papyrus/uml/table/efacet/generic/tests/AllTests.java
deleted file mode 100644
index 8dc4ecd6d5d..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/src/org/eclipse/papyrus/uml/table/efacet/generic/tests/AllTests.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.uml.table.efacet.generic.tests;

-

-import org.eclipse.papyrus.uml.table.efacet.generic.tests.synchronization.features.DerivedFeatureTests;

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-

-@RunWith(Suite.class)

-@SuiteClasses({ DerivedFeatureTests.class })

-public class AllTests {

-	// JUnit 4 test suite

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/src/org/eclipse/papyrus/uml/table/efacet/generic/tests/synchronization/features/DerivedFeatureTests.java b/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/src/org/eclipse/papyrus/uml/table/efacet/generic/tests/synchronization/features/DerivedFeatureTests.java
deleted file mode 100644
index 54c28dc8d5d..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.generic.tests/src/org/eclipse/papyrus/uml/table/efacet/generic/tests/synchronization/features/DerivedFeatureTests.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package org.eclipse.papyrus.uml.table.efacet.generic.tests.synchronization.features;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.List;

-

-import junit.framework.Assert;

-

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

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

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

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

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

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

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

-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Row;

-import org.eclipse.emf.facet.widgets.table.ui.internal.exported.TableWidgetUtils;

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

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

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

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.FillingMode;

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

-import org.eclipse.papyrus.junit.utils.EditorUtils;

-import org.eclipse.papyrus.junit.utils.GenericUtils;

-import org.eclipse.papyrus.junit.utils.HandlerUtils;

-import org.eclipse.papyrus.junit.utils.ModelExplorerUtils;

-import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;

-import org.eclipse.papyrus.junit.utils.ProjectUtils;

-import org.eclipse.papyrus.uml.table.efacet.generic.tests.Activator;

-import org.eclipse.papyrus.views.modelexplorer.ModelExplorerView;

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

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

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

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

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

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

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Ignore;

-import org.junit.Test;

-

-

-public class DerivedFeatureTests {

-

-	private static final String CREATE_GENERIC_UML_TABLE = "org.eclipse.papyrus.uml.generic.table.command.withoutdialog"; //$NON-NLS-1$

-

-	private static final String MODEL = "model"; //$NON-NLS-1$

-

-	private static ModelExplorerView modelExplorerView;

-

-	private static IProject project;

-

-	private static CoreMultiDiagramEditor papyrusEditor;

-

-	private static Class class1;

-

-	@BeforeClass

-	public static void init() throws CoreException, IOException {

-		GenericUtils.closeIntroPart();

-		GenericUtils.cleanWorkspace();

-		final IProject project = ProjectUtils.createProject("GenericTableTest"); //$NON-NLS-1$

-		PapyrusProjectUtils.copyPapyrusModel(project, Activator.getDefault().getBundle(), "/resources/", MODEL); //$NON-NLS-1$

-		final IFile file = project.getFile(MODEL + "." + SashModel.MODEL_FILE_EXTENSION); //$NON-NLS-1$

-		Assert.assertNotNull(file);

-		papyrusEditor = (CoreMultiDiagramEditor)EditorUtils.openEditor(file);

-		Assert.assertNotNull(papyrusEditor);

-		modelExplorerView = ModelExplorerUtils.openModelExplorerView();

-		final Model root = (Model)ModelExplorerUtils.getRootInModelExplorer(modelExplorerView);

-		class1 = (Class)root.getOwnedMember("Class1"); //$NON-NLS-1$

-	}

-

-	public void setSelectionInTheModelExplorer() {

-		final List<Element> selection = new ArrayList<Element>();

-		selection.add(class1);

-		modelExplorerView.setFocus();

-		ModelExplorerUtils.setSelectionInTheModelexplorer(modelExplorerView, selection);

-	}

-

-	@Test

-	public void handlerActivationTest() {

-		final IHandler handler = HandlerUtils.getActiveHandlerFor(CREATE_GENERIC_UML_TABLE);

-		Assert.assertNotNull(handler);

-		Assert.assertTrue(handler.isEnabled());

-	}

-

-	@Test

-	public void createEmptyTableTest() throws Exception {

-		setSelectionInTheModelExplorer();

-		final Command cmd = HandlerUtils.getCommand(CREATE_GENERIC_UML_TABLE);

-		HandlerUtils.executeCommand(cmd);

-		final PapyrusTable table = getCurrentTable();

-		Assert.assertNotNull(table);

-		final List<EObject> elements = TableWidgetUtils.getElements(table.getTable());

-		Assert.assertTrue("The created table is not empty", elements.isEmpty());

-	}

-

-	protected PapyrusTable getCurrentTable() {

-		final PapyrusTable table = null;

-		return table;

-	}

-

-	protected TransactionalEditingDomain getEditingDomain(){

-		return null;

-	}

-	

-

-	@Test

-	public void createTableWithContentsTest() throws Exception {

-		//we create a new table

-		createEmptyTableTest();

-		final PapyrusTable table = getCurrentTable();

-		final Port port1 = UMLFactory.eINSTANCE.createPort();

-		port1.setName("port1");

-		class1.getAllAttributes().add(port1);

-		

-		//TODO add this port to the table

-		

-		table.setFillingMode(FillingMode.CONTEXT_FEATURE);

-		//there is no feature to listen, so the content of the table should be deleted

-		Assert.assertTrue(table.getTable().getRows().isEmpty());

-		//TODO

-		final EReference ref = UMLPackage.eINSTANCE.getEncapsulatedClassifier_OwnedPort();

-		table.setContextFeature(ref);

-		//the table should now content 1 element

-		EList<Row> rows = table.getTable().getRows();

-		Assert.assertTrue(rows.size()==1);

-		Assert.assertTrue(rows.get(0).getElement()==port1);

-		

-		final Port port2 = UMLFactory.eINSTANCE.createPort();

-		port2.setName("port2");

-		class1.getAllAttributes().add(port2);

-		

-		rows = table.getTable().getRows();

-		Assert.assertTrue(rows.size()==2);

-		Assert.assertTrue(rows.get(0).getElement()==port1);

-		Assert.assertTrue(rows.get(1).getElement()==port2);

-	}

-

-	

-	@Test

-	public void reparentElementTest() throws Exception {

-		createEmptyTableTest();

-		final PapyrusTable table = getCurrentTable();

-		final Port port1 = UMLFactory.eINSTANCE.createPort();

-		port1.setName("port1");

-		class1.getAllAttributes().add(port1);

-		

-		//TODO add this port to the table

-		

-		table.setFillingMode(FillingMode.CONTEXT_FEATURE);

-		//there is no feature to listen, so the content of the table should be deleted

-		Assert.assertTrue(table.getTable().getRows().isEmpty());

-		//TODO

-		final EReference ref = UMLPackage.eINSTANCE.getEncapsulatedClassifier_OwnedPort();

-		table.setContextFeature(ref);

-		//the table should now content 1 element

-		EList<Row> rows = table.getTable().getRows();

-		Assert.assertTrue(rows.size()==1);

-		Assert.assertTrue(rows.get(0).getElement()==port1);

-		

-		Class class2 = UMLFactory.eINSTANCE.createClass();

-		class1.getPackage().getOwnedElements().add(class2);

-		

-		//we reparent port1

-		class2.getAllAttributes().add(port1); //TODO verify if it is the best way!

-		rows = table.getTable().getRows();

-		Assert.assertTrue(rows.size()==0);

-	}

-

-	@Test

-	public void destroyElementTest() throws Exception {

-		createEmptyTableTest();

-		final PapyrusTable table = getCurrentTable();

-		final Port port1 = UMLFactory.eINSTANCE.createPort();

-		port1.setName("port1");

-		class1.getAllAttributes().add(port1);

-		

-		//TODO add this port to the table

-		

-		table.setFillingMode(FillingMode.CONTEXT_FEATURE);

-		//there is no feature to listen, so the content of the table should be deleted

-		Assert.assertTrue(table.getTable().getRows().isEmpty());

-		//TODO

-		final EReference ref = UMLPackage.eINSTANCE.getEncapsulatedClassifier_OwnedPort();

-		table.setContextFeature(ref);

-		//the table should now content 1 element

-		EList<Row> rows = table.getTable().getRows();

-		Assert.assertTrue(rows.size()==1);

-		Assert.assertTrue(rows.get(0).getElement()==port1);

-		

-		//TODO destroy Port1

-	}

-

-	@Ignore

-	@Test

-	public void destroyTableTest() {

-//should be moved in a modelexplorer plugin

-	}

-	

-	@Ignore

-	@Test

-	public void destroyTableContextTest() {

-		//should be moved in a modelexplorer plugin

-	}

-

-	@AfterClass

-	public static void closeAll() {

-		GenericUtils.closeAllEditors();

-	}

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/.classpath b/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/.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/org.eclipse.papyrus.uml.table.efacet.parameter/.project b/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/.project
deleted file mode 100644
index 219e8cfcd6a..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.table.efacet.parameter</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>

-		<buildCommand>

-			<name>org.eclipse.emf.facet.common.core.builder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.emf.facet.common.ProjectNature</nature>

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

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

-	</natures>

-</projectDescription>

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/.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/org.eclipse.papyrus.uml.table.efacet.parameter/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/META-INF/MANIFEST.MF
deleted file mode 100644
index a61c6e830f8..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Parameter Table Efacet (Incubation)
-Bundle-SymbolicName: org.eclipse.papyrus.uml.table.efacet.parameter;singleton:=true
-Bundle-Version: 0.9.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.uml.table.efacet.parameter.Activator
-Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.table.efacet.common;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.table.efacet;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.table.efacet.metamodel;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/build.properties b/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/build.properties
deleted file mode 100644
index 6f20375d6c7..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/icons/parameter_table.gif b/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/icons/parameter_table.gif
deleted file mode 100644
index eb6a5a96518..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/icons/parameter_table.gif
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/icons/parameter_table.png b/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/icons/parameter_table.png
deleted file mode 100644
index 6147c953a70..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/icons/parameter_table.png
+++ /dev/null
diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/plugin.xml b/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/plugin.xml
deleted file mode 100644
index f661bc22e31..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/plugin.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

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

-      <editorDiagram

-            factoryClass="org.eclipse.papyrus.uml.table.efacet.parameter.factory.ParameterTableEditorFactory"

-            icon="icons/parameter_table.gif">

-      </editorDiagram>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commands">

-      <command

-            description="Create a UML Parameter Table Editor"

-            id="org.eclipse.papyrus.uml.table.efacet.parameter.command"

-            name="Create a UML Parameter Table Editor">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.papyrus.uml.table.efacet.parameter.handler.CreateParameterTableEditorHandler"

-            commandId="org.eclipse.papyrus.uml.table.efacet.parameter.command">

-         <activeWhen>

-            <or>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </or>

-         </activeWhen>

-      </handler>

-   </extension>

-   <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.table.efacet.creation">

-         <command

-               commandId="org.eclipse.papyrus.uml.table.efacet.parameter.command"

-               icon="icons/parameter_table.gif"

-               label="UML Parameter Table"

-               mnemonic="&amp;P"

-               style="push"

-               tooltip="Create a new UUML Parameter Table">

-            <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.ui.menu.efacet.table.creation">

-         <command

-               commandId="org.eclipse.papyrus.uml.table.efacet.parameter.command"

-               icon="icons/parameter_table.gif"

-               label="UML Parameter Table"

-               mnemonic="&amp;P"

-               style="push"

-               tooltip="Create a new UUML Parameter Table">

-            <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.toolbar.table.efacet.creation">

-         <command

-               commandId="org.eclipse.papyrus.uml.table.efacet.parameter.command"

-               icon="icons/parameter_table.gif"

-               label="UML Parameter Table"

-               mnemonic="&amp;P"

-               style="push"

-               tooltip="Create a new UUML Parameter Table">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-

-</plugin>

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/resources/uml_parameter_table.papyrustableconfiguration b/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/resources/uml_parameter_table.papyrustableconfiguration
deleted file mode 100644
index 567899a74cd..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/resources/uml_parameter_table.papyrustableconfiguration
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration:PapyrusTableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration="http://www.eclipse.org/Papyrus/PapyrusTableConfiguration/0.9.0/papyrustableconfiguration" fillingMode="CONTEXT_FEATURE">

-  <listenContextFeature href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature/ownedParameter"/>

-  <tableConfiguration/>

-</org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration:PapyrusTableConfiguration>

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/src/org/eclipse/papyrus/uml/table/efacet/parameter/Activator.java b/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/src/org/eclipse/papyrus/uml/table/efacet/parameter/Activator.java
deleted file mode 100644
index 600ae7a0065..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/src/org/eclipse/papyrus/uml/table/efacet/parameter/Activator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.papyrus.uml.table.efacet.parameter;

-

-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.table.efacet.parameter"; //$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(final 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(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/org.eclipse.papyrus.uml.table.efacet.parameter/src/org/eclipse/papyrus/uml/table/efacet/parameter/editor/ParameterTableEditor.java b/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/src/org/eclipse/papyrus/uml/table/efacet/parameter/editor/ParameterTableEditor.java
deleted file mode 100644
index c8f71e8b996..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/src/org/eclipse/papyrus/uml/table/efacet/parameter/editor/ParameterTableEditor.java
+++ /dev/null
@@ -1,39 +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.table.efacet.parameter.editor;

-

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

-import org.eclipse.papyrus.infra.table.efacet.common.editor.AbstractSynchronizedTableEditor;

-import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

-

-

-public class ParameterTableEditor extends AbstractSynchronizedTableEditor {

-

-	/** the type of the editor */

-	public static final String EDITOR_TYPE = "PapyrusUMLParameterTable"; //$NON-NLS-1$

-

-	/** the default name for this table */

-	public static final String DEFAULT_NAME = "ParameterTable"; //$NON-NLS-1$

-

-	/**

-	 * @param servicesRegistry

-	 * @param rawModel

-	 * 

-	 */

-	public ParameterTableEditor(final ServicesRegistry servicesRegistry, final PapyrusTable rawModel) {

-		super(servicesRegistry, rawModel);

-	}

-

-

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/src/org/eclipse/papyrus/uml/table/efacet/parameter/factory/ParameterTableEditorFactory.java b/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/src/org/eclipse/papyrus/uml/table/efacet/parameter/factory/ParameterTableEditorFactory.java
deleted file mode 100644
index 5030fd0d225..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/src/org/eclipse/papyrus/uml/table/efacet/parameter/factory/ParameterTableEditorFactory.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.table.efacet.parameter.factory;

-

-import org.eclipse.papyrus.infra.table.efacet.common.factory.AbstractTableEditorFactory;

-import org.eclipse.papyrus.uml.table.efacet.parameter.editor.ParameterTableEditor;

-

-

-/**

- *

- * 

- */

-public class ParameterTableEditorFactory extends AbstractTableEditorFactory {

-

-

-	/**

-	 * Constructor.

-	 * 

-	 * @param diagramClass

-	 * @param expectedType

-	 */

-	public ParameterTableEditorFactory() {

-		super(ParameterTableEditor.class, ParameterTableEditor.EDITOR_TYPE);

-	}

-

-

-}

diff --git a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/src/org/eclipse/papyrus/uml/table/efacet/parameter/handler/CreateParameterTableEditorHandler.java b/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/src/org/eclipse/papyrus/uml/table/efacet/parameter/handler/CreateParameterTableEditorHandler.java
deleted file mode 100644
index fc019f7abef..00000000000
--- a/sandbox/org.eclipse.papyrus.uml.table.efacet.parameter/src/org/eclipse/papyrus/uml/table/efacet/parameter/handler/CreateParameterTableEditorHandler.java
+++ /dev/null
@@ -1,59 +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.table.efacet.parameter.handler;

-

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

-import org.eclipse.papyrus.infra.table.efacet.common.handlers.AbstractCreateTableEditorHandler;

-import org.eclipse.papyrus.uml.table.efacet.parameter.Activator;

-import org.eclipse.papyrus.uml.table.efacet.parameter.editor.ParameterTableEditor;

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

-

-

-public class CreateParameterTableEditorHandler extends AbstractCreateTableEditorHandler {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 */

-	public CreateParameterTableEditorHandler() {

-		super(ParameterTableEditor.EDITOR_TYPE, ParameterTableEditor.DEFAULT_NAME);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.table.efacet.common.handlers.AbstractCreateTableEditorHandler#isEnabled()

-	 * 

-	 * @return

-	 */

-	@Override

-	public boolean isEnabled() {

-		return getTableContext() instanceof Operation;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.table.efacet.common.handlers.AbstractCreateTableEditorHandler#getPapyrusTableConfigurationURI()

-	 * 

-	 * @return

-	 */

-	@Override

-	protected URI getPapyrusTableConfigurationURI() {

-		final String symbolicName = Activator.getDefault().getBundle().getSymbolicName();

-		final URI uri = URI.createPlatformPluginURI(symbolicName + "/resources/uml_parameter_table.papyrustableconfiguration", true); //$NON-NLS-1$

-		return uri;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/.classpath b/sandbox/org.eclipse.papyrus.views.properties.table/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/.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/org.eclipse.papyrus.views.properties.table/.project b/sandbox/org.eclipse.papyrus.views.properties.table/.project
deleted file mode 100644
index b2f73f42d99..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.views.properties.table</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/org.eclipse.papyrus.views.properties.table/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.views.properties.table/META-INF/MANIFEST.MF
deleted file mode 100644
index f9731f74021..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Table integration in properties (Incubation)
-Bundle-SymbolicName: org.eclipse.papyrus.views.properties.table;singleton:=true
-Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.views.properties.table.Activator
-Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.views.properties;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.emf.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.0",
- org.eclipse.papyrus.uml.nattable;bundle-version="0.10.0",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.emf.ecore;bundle-version="2.9.0",
- org.eclipse.emf.databinding;bundle-version="1.3.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.widgets;bundle-version="0.10.0",
- org.eclipse.papyrus.views.properties.model;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.emf.edit;bundle-version="2.9.0",
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.uml.tools;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",
- org.eclipse.papyrus.infra.tools;bundle-version="0.10.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/about.html b/sandbox/org.eclipse.papyrus.views.properties.table/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/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/org.eclipse.papyrus.views.properties.table/build.properties b/sandbox/org.eclipse.papyrus.views.properties.table/build.properties
deleted file mode 100644
index 57a34d97317..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               resources/,\

-               plugin.xml

-src.includes = about.html

diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/plugin.xml b/sandbox/org.eclipse.papyrus.views.properties.table/plugin.xml
deleted file mode 100644
index 822c84b3efe..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/plugin.xml
+++ /dev/null
@@ -1,44 +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.emf.nattable.synchronized.featurevalue.axis.manager"

-            manager="org.eclipse.papyrus.views.properties.table.axis.SynchronizedFeatureValueAxisManager">

-      </axisManager>

-      <axisManager

-            id="org.eclipse.papyrus.uml.nattable.derived.features.axis.manager"

-            manager="org.eclipse.papyrus.views.properties.table.axis.DerivedUMLPropertiesAxisManager">

-      </axisManager>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.views.properties.environment">

-      <environment

-            environmentModel="resources/Environment.xmi">

-      </environment>

-   </extension>

-   <extension

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

-      <labelProvider

-            priority="10"

-            provider="org.eclipse.papyrus.views.properties.table.providers.DerivedUMLPropertiesLabelProvider">

-      </labelProvider>

-   </extension>

-   <extension

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

-      <configuration

-            class="org.eclipse.papyrus.views.properties.table.cell.DerivedUMLPropertiesCellEditorConfiguration"

-            order="1">

-      </configuration>

-   </extension>

-   <extension

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

-      <cellManager

-            id="org.eclipse.papyrus.uml.nattable.derived.features.cell.manager"

-            manager="org.eclipse.papyrus.views.properties.table.cell.DerivedUMLPropertiesCellManager"

-            order="1">

-      </cellManager>

-   </extension>

-

-</plugin>

diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/resources/Environment.xmi b/sandbox/org.eclipse.papyrus.views.properties.table/resources/Environment.xmi
deleted file mode 100644
index eb6479d9b23..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/resources/Environment.xmi
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<environment:Environment

-    xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:environment="http://www.eclipse.org/papyrus/properties/environment/0.9">

-  <propertyEditorTypes

-      label="EMFTableReferenceEditor (No preview)"

-      widgetClass="NattablePropertyEditor"

-      namespace="//@namespaces.0"

-      type="Reference"

-      multiplicity="-1"/>

-  <namespaces

-      name="table"

-      value="org.eclipse.papyrus.views.properties.table.widgets"/>

-</environment:Environment>

diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/resources/property.nattableconfiguration b/sandbox/org.eclipse.papyrus.views.properties.table/resources/property.nattableconfiguration
deleted file mode 100644
index f88b8e8aaf3..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/resources/property.nattableconfiguration
+++ /dev/null
@@ -1,34 +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 references all the owned attributes of the context element" name="OwnedAttributeTable" type="PapyrusOwnedAttributeTable" iconPath="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.gif" defaultColumnAxisProvider="//@columnAxisProviders.0">

-  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.uml.nattable.tester.isumlelement"/>

-  <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC" displayIndex="false">

-    <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#//StructuredClassifier/ownedAttribute"/>

-    </ownedAxisConfigurations>

-    <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.emf.nattable.synchronized.featurevalue.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0"/>

-  </rowHeaderAxisConfiguration>

-  <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" displayIndex="false">

-    <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.derived.features.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@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">

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@rowHeaderAxisConfiguration/@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="//@rowHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//TypedElement/type"/>

-    </axis>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@rowHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@rowHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/defaultValue"/>

-    </axis>

-    <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@rowHeaderAxisConfiguration/@axisManagers.0">

-      <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/isDerived"/>

-    </axis>

-    <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="uml_derived_features:/multiplicity"/>

-  </columnAxisProviders>

-</nattableconfiguration:TableConfiguration>

diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/Activator.java b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/Activator.java
deleted file mode 100644
index 60b147cfb61..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/Activator.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:

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

- *

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

-package org.eclipse.papyrus.views.properties.table;

-

-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.views.properties.table"; //$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/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/DerivedUMLPropertiesAxisManager.java b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/DerivedUMLPropertiesAxisManager.java
deleted file mode 100644
index 2a8e1f0354f..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/DerivedUMLPropertiesAxisManager.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:

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

- *

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

-package org.eclipse.papyrus.views.properties.table.axis;

-

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

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

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

-

-/**

- * An AxisManager for custom/derived UML features (Such as Multiplicity)

- * 

- * @author Camille Letavernier

- * 

- */

-public class DerivedUMLPropertiesAxisManager extends AbstractAxisManager {

-

-	public static final String AXIS_MANAGER_ID = "org.eclipse.papyrus.uml.nattable.derived.features.axis.manager"; //$NON-NLS-1$

-

-	public static final String PROPERTIES_PREFIX = "uml_derived_features:/";

-

-	public static final String MULTIPLICITY = PROPERTIES_PREFIX + "multiplicity";

-

-	public boolean isSlave() {

-		return false;

-	}

-

-	public boolean isDynamic() {

-		return false;

-	}

-

-	public boolean canEditAxisHeader() {

-		return true;

-	}

-

-	public boolean canDestroyAxisElement(Integer axisIndex) {

-		return false;

-	}

-

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

-		return null;

-	}

-

-	@Override

-	public boolean canBeSavedAsConfig() {

-		return false;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/SynchronizedFeatureValueAxisManager.java b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/SynchronizedFeatureValueAxisManager.java
deleted file mode 100644
index df38aa0a10e..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/axis/SynchronizedFeatureValueAxisManager.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:

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

- *

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

-package org.eclipse.papyrus.views.properties.table.axis;

-

-import java.util.LinkedList;

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

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

-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.services.edit.service.ElementEditServiceUtils;

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

-

-/**

- * 

- * @author Camille Letavernier

- * 

- */

-public class SynchronizedFeatureValueAxisManager extends AbstractSynchronizedOnEStructuralFeatureAxisManager {

-

-	public static final String AXIS_MANAGER_ID = "org.eclipse.papyrus.emf.nattable.synchronized.featurevalue.axis.manager"; //$NON-NLS-1$

-

-	@Override

-	public List<Object> getAllManagedAxis() {

-		List<Object> result = new LinkedList<Object>();

-

-		EStructuralFeatureValueFillingConfiguration config = null;

-		for(final IAxisConfiguration current : this.representedAxisManager.getSpecificAxisConfigurations()) {

-			if(current instanceof EStructuralFeatureValueFillingConfiguration) {

-				config = (EStructuralFeatureValueFillingConfiguration)current;

-				break;

-			}

-		}

-

-		EStructuralFeature synchronizedFeature = config.getListenFeature();

-

-		result.addAll((List<?>)this.getTableManager().getTable().getContext().eGet(synchronizedFeature));

-

-		return result;

-	}

-

-	public boolean canDestroyAxisElement(Integer axisIndex) {

-		return true;

-	}

-

-	public Command getDestroyAxisElementCommand(TransactionalEditingDomain 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/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellEditorConfiguration.java b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellEditorConfiguration.java
deleted file mode 100644
index 49ed8bc76ed..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellEditorConfiguration.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

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

- * are made available under the terms 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 (camille.letavernier@cea.fr) - Initial API and implementation

- *

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

-package org.eclipse.papyrus.views.properties.table.cell;

-

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

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

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

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

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

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

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

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

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

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

-import org.eclipse.papyrus.uml.tools.util.MultiplicityParser;

-import org.eclipse.papyrus.views.properties.table.axis.DerivedUMLPropertiesAxisManager;

-

-/**

- * Specific CellEditorConfiguration for UML Multiplicities (And derived UML properties in general)

- * 

- * @author Camille Letavernier

- * 

- */

-public class DerivedUMLPropertiesCellEditorConfiguration extends AbstractCellEditorConfiguration implements IAxisCellEditorConfiguration {

-

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

-		return null;

-	}

-

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

-		return new TextPainter();

-	}

-

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

-		return new TextCellEditor();

-	}

-

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

-		return DisplayMode.NORMAL;

-	}

-

-	@Override

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

-		return new DataValidator() {

-

-			@Override

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

-

-				if(!(newValue instanceof String)) {

-					return false;

-				}

-

-				String multiplicityValue = (String)newValue;

-				return MultiplicityParser.isValidMultiplicity(multiplicityValue);

-			}

-		};

-	}

-

-	public String getEditorConfigId() {

-		return DerivedUMLPropertiesAxisManager.MULTIPLICITY;

-	}

-

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

-		return DerivedUMLPropertiesAxisManager.MULTIPLICITY.equals(object);

-	}

-

-	@Override

-	public String getEditorDescription() {

-		return "Specific editor for Multiplicities";

-	}

-

-	@Override

-	public IDisplayConverter getDisplayConvert(Table table, Object axisElement, ILabelProvider provider) {

-		return null;

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellManager.java b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellManager.java
deleted file mode 100644
index 0542d21c911..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/cell/DerivedUMLPropertiesCellManager.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:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.views.properties.table.cell;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager;

-import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;

-import org.eclipse.papyrus.uml.tools.commands.SetMultiplicityCommand;

-import org.eclipse.papyrus.uml.tools.util.MultiplicityParser;

-import org.eclipse.papyrus.views.properties.table.axis.DerivedUMLPropertiesAxisManager;

-import org.eclipse.uml2.uml.MultiplicityElement;

-

-

-public class DerivedUMLPropertiesCellManager extends AbstractCellManager implements ICellManager {

-

-	public final static String CELL_MANAGER_ID = "org.eclipse.papyrus.uml.nattable.derived.features.cell.manager"; //$NON-NLS-1$

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean handles(Object columnElement, Object rowElement) {

-		return getMultiplicityElement(columnElement, rowElement) != null && getMultiplicityHandler(columnElement, rowElement) != null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean handlesAxisElement(Object obj) {

-		return DerivedUMLPropertiesAxisManager.MULTIPLICITY.equals(obj);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Object doGetValue(Object columnElement, Object rowElement, INattableModelManager tableManager) {

-		MultiplicityElement element = getMultiplicityElement(columnElement, rowElement);

-		if(element == null) {

-			return null;

-		}

-

-		return getValue(element);

-	}

-

-	protected Object getValue(MultiplicityElement multiplicityElement) {

-		int lower = multiplicityElement.getLower(), upper = multiplicityElement.getUpper();

-		return MultiplicityParser.getMultiplicity(lower, upper);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public boolean isCellEditable(Object columnElement, Object rowElement) {

-		return getMultiplicityElement(columnElement, rowElement) != null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Command getSetValueCommand(TransactionalEditingDomain domain, Object columnElement, Object rowElemenet, Object newValue) {

-

-		MultiplicityElement element = getMultiplicityElement(columnElement, rowElemenet);

-

-		if(element == null) {

-			return null;

-		}

-

-		if(newValue == null || newValue instanceof String) {

-			return getSetValueCommand(element, (String)newValue);

-		}

-

-		return null;

-	}

-

-	protected MultiplicityElement getMultiplicityElement(Object obj1, Object obj2) {

-		if(obj1 instanceof MultiplicityElement) {

-			return (MultiplicityElement)obj1;

-		}

-		if(obj2 instanceof MultiplicityElement) {

-			return (MultiplicityElement)obj2;

-		}

-

-		return null;

-	}

-

-	private String getMultiplicityHandler(Object obj1, Object obj2) {

-		String featureId = getFeatureId(obj1);

-		if(featureId != null) {

-			return featureId;

-		}

-

-		featureId = getFeatureId(obj2);

-		if(featureId != null) {

-			return featureId;

-		}

-		return null;

-	}

-

-	private String getFeatureId(Object object) {

-		if(object instanceof FeatureIdAxis) {

-			FeatureIdAxis idAxis = (FeatureIdAxis)object;

-			if(DerivedUMLPropertiesAxisManager.MULTIPLICITY.equals(idAxis.getElement())) {

-				return DerivedUMLPropertiesAxisManager.MULTIPLICITY;

-			}

-		}

-		return null;

-	}

-

-	protected Command getSetValueCommand(MultiplicityElement element, String newValue) {

-		return new SetMultiplicityCommand(element, newValue);

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/providers/DerivedUMLPropertiesLabelProvider.java b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/providers/DerivedUMLPropertiesLabelProvider.java
deleted file mode 100644
index 211c61120ef..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/providers/DerivedUMLPropertiesLabelProvider.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:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.views.properties.table.providers;

-

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdAxis;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-import org.eclipse.papyrus.views.properties.table.axis.DerivedUMLPropertiesAxisManager;

-import org.eclipse.swt.graphics.Image;

-

-

-public class DerivedUMLPropertiesLabelProvider extends LabelProvider implements IFilteredLabelProvider {

-

-	@Override

-	public boolean accept(final Object element) {

-		if(element instanceof LabelProviderCellContextElementWrapper) {

-			Object object = ((LabelProviderCellContextElementWrapper)element).getObject();

-			if(object instanceof IdAxis) {

-				String id = ((IdAxis)object).getElement();

-				return DerivedUMLPropertiesAxisManager.MULTIPLICITY.equals(id);

-			}

-

-		}

-		return false;

-	}

-

-	@Override

-	public String getText(final Object element) {

-		return "multiplicity : String [0..1]";

-	}

-

-	@Override

-	public Image getImage(final Object element) {

-		org.eclipse.papyrus.infra.widgets.Activator widgetActivator = org.eclipse.papyrus.infra.widgets.Activator.getDefault();

-		String emtNattablePluginID = org.eclipse.papyrus.infra.emf.nattable.Activator.PLUGIN_ID;

-		return widgetActivator.getImage(emtNattablePluginID, "icons/attributes.gif");

-	}

-

-}

diff --git a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/widgets/NattablePropertyEditor.java b/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/widgets/NattablePropertyEditor.java
deleted file mode 100644
index 160975e9169..00000000000
--- a/sandbox/org.eclipse.papyrus.views.properties.table/src/org/eclipse/papyrus/views/properties/table/widgets/NattablePropertyEditor.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:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.views.properties.table.widgets;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.nebula.widgets.nattable.NatTable;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-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.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration;

-import org.eclipse.papyrus.views.properties.contexts.Property;

-import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;

-import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

-import org.eclipse.papyrus.views.properties.table.Activator;

-import org.eclipse.papyrus.views.properties.widgets.AbstractPropertyEditor;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.DisposeEvent;

-import org.eclipse.swt.events.DisposeListener;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-import org.eclipse.swt.widgets.Label;

-

-/**

- * A PropertyEditor to manipulate Papyrus Nattables in the properties view

- * 

- * @author Camille Letavernier

- * 

- */

-public class NattablePropertyEditor extends AbstractPropertyEditor {

-

-	private Composite self;

-

-	private URI tableConfigURI = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/resources/property.nattableconfiguration", true);

-

-	public NattablePropertyEditor(Composite parent, int style) {

-		self = new Group(parent, SWT.NONE);

-		FillLayout fillLayout = new FillLayout();

-		fillLayout.marginHeight = 10;

-		fillLayout.marginWidth = 10;

-		self.setLayout(fillLayout);

-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);

-		data.minimumHeight = 300;

-		self.setLayoutData(data);

-	}

-

-	public void setURI(String uri) {

-		tableConfigURI = URI.createURI(uri);

-	}

-

-	public String getURI() {

-		return tableConfigURI == null ? null : tableConfigURI.toString();

-	}

-

-	@Override

-	protected void checkInput() {

-		if(tableConfigURI != null) {

-			super.checkInput();

-		}

-	}

-

-	@Override

-	protected void doBinding() {

-		super.doBinding();

-

-		//Configure the table

-		ModelElement modelElement = input.getModelElement(propertyPath);

-

-		Table table;

-		if(modelElement instanceof EMFModelElement) {

-			EMFModelElement emfModelElement = (EMFModelElement)modelElement;

-			EObject sourceElement = emfModelElement.getSource();

-			EStructuralFeature feature = emfModelElement.getFeature(getLocalPropertyPath());

-

-			table = createTable(sourceElement, feature);

-			if(table == null) {

-				displayError("Cannot initialize the table");

-				return;

-			}

-		} else {

-			displayError("Invalid table context");

-			return;

-		}

-

-		//Create the widget

-		final NattableModelManager nattableManager = new NattableModelManager(table);

-		NatTable widget = nattableManager.createNattable(self, SWT.NONE, null);

-		self.addDisposeListener(new DisposeListener() {

-

-			public void widgetDisposed(DisposeEvent e) {

-				nattableManager.dispose();

-			}

-		});

-

-		widget.setBackground(self.getBackground());

-	}

-

-	@Override

-	protected void updateDescription(String description) {

-		self.setToolTipText(description);

-	}

-

-	@Override

-	public void updateLabel(String label) {

-		if(showLabel) {

-			((Group)self).setText(getLabel());

-		}

-	}

-

-	protected void displayError(String message) {

-		Label label = new Label(self, SWT.NONE);

-		label.setText(message);

-		label.setImage(org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("icons/error.gif")); //$NON-NLS-1$

-	}

-

-	protected Table createTable(EObject sourceElement, EStructuralFeature synchronizedFeature) {

-		final TableConfiguration tableConfiguration = getTableConfiguration();

-		if(tableConfiguration == null) {

-			return null;

-		}

-

-		final Table table = NattableFactory.eINSTANCE.createTable();

-

-		table.setTableConfiguration(tableConfiguration);

-		Property property = getModelProperty();

-		if(property != null) {

-			String description = property.getDescription();

-			if(description != null) {

-				table.setDescription(description);

-			}

-		}

-

-		table.setName(getLabel());

-		table.setContext(sourceElement);

-

-		AbstractAxisProvider rowProvider = tableConfiguration.getDefaultRowAxisProvider();

-		if(rowProvider == null) {

-			rowProvider = NattableaxisproviderFactory.eINSTANCE.createMasterObjectAxisProvider();

-		} else {

-			rowProvider = EcoreUtil.copy(rowProvider);

-		}

-

-		AbstractAxisProvider columnProvider = tableConfiguration.getDefaultColumnAxisProvider();

-		if(columnProvider == null) {

-			columnProvider = NattableaxisproviderFactory.eINSTANCE.createSlaveObjectAxisProvider();

-		} else {

-			columnProvider = EcoreUtil.copy(columnProvider);

-		}

-

-

-		TableHeaderAxisConfiguration rowHeaderAxisconfig = tableConfiguration.getRowHeaderAxisConfiguration();

-		for(IAxisConfiguration axisConfig : rowHeaderAxisconfig.getOwnedAxisConfigurations()) {

-			if(axisConfig instanceof EStructuralFeatureValueFillingConfiguration) {

-				((EStructuralFeatureValueFillingConfiguration)axisConfig).setListenFeature(synchronizedFeature);

-			}

-		}

-		//		if(rowProvider instanceof EMFFeatureValueAxisProvider) {

-		//			EMFFeatureValueAxisProvider emfAxisProvider = (EMFFeatureValueAxisProvider)rowProvider;

-		//

-		//			emfAxisProvider.setListenFeature(synchronizedFeature);

-		//		}

-

-		table.setCurrentColumnAxisProvider(columnProvider);

-		table.setCurrentRowAxisProvider(rowProvider);

-

-		return table;

-	}

-

-	protected TableConfiguration getTableConfiguration() {

-		ResourceSet resourceSet = new ResourceSetImpl();

-		try {

-			TableConfiguration tableConfiguration = (TableConfiguration)EMFHelper.loadEMFModel(resourceSet, tableConfigURI);

-			return tableConfiguration;

-		} catch (Exception ex) {

-			Activator.log.error("Invalid table configuration", ex);

-		}

-

-		return null;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/.classpath b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/.classpath
deleted file mode 100644
index 6c79a3a9e3f..00000000000
--- a/sandbox/pasteInNewTable/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/JavaSE-1.6"/>

-	<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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/.project b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/.project
deleted file mode 100644
index 2c06e6705e9..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
deleted file mode 100644
index b31a455ebf8..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1",

- 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.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.emf;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.core;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.1",

- org.eclipse.emf.edit,

- org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.1",

- org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.1"

-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

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.10.1.qualifier

-Bundle-Name: EMF Nattable (Incubation)

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.emf.nattable.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.nattable;singleton:

- =true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/about.html b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/build.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/build.properties
deleted file mode 100644
index feffce05748..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/aggreg.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/aggreg.gif
deleted file mode 100644
index 2c62284e92b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/aggreg.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/aggreg_unidir.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/aggreg_unidir.gif
deleted file mode 100644
index 30bf63ea561..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/aggreg_unidir.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/attributes.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/attributes.gif
deleted file mode 100644
index d4cb4254d92..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/attributes.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/inv_aggreg.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/inv_aggreg.gif
deleted file mode 100644
index 6f1021d4d1c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/inv_aggreg.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/link.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/link.gif
deleted file mode 100644
index 94c14024075..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/link.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/link_unidir.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/link_unidir.gif
deleted file mode 100644
index c8169bcfbf8..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/link_unidir.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/opposite_links.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/opposite_links.gif
deleted file mode 100644
index 63520975df7..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/icons/opposite_links.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/plugin.pdoc b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/plugin.pdoc
deleted file mode 100644
index 58d0d3e5769..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/plugin.xml
deleted file mode 100644
index 5801e449bed..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/Activator.java
deleted file mode 100644
index 82a08b67971..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
deleted file mode 100644
index d1cf39d98d0..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/celleditor/config/EStructuralFeatureEditorConfig.java
+++ /dev/null
@@ -1,316 +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.config.IConfigRegistry;

-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.layer.cell.ILayerCell;

-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;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.RGB;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * 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(){

-				

-				@Override

-				protected Color getBackgroundColour(ILayerCell cell, IConfigRegistry configRegistry) {

-					int rowPosition = cell.getRowPosition();

-					int columnPostion = cell.getColumnPosition();

-					return new Color(Display.getDefault(), new RGB(255,  0,  0));

-					

-//					return super.getBackgroundColour(cell, configRegistry);

-				}

-			};//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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EObjectAxisManager.java b/sandbox/pasteInNewTable/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/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EStructuralFeatureAxisManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/axis/EStructuralFeatureAxisManager.java
deleted file mode 100644
index 6f48d80de62..00000000000
--- a/sandbox/pasteInNewTable/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) {//FIXME must be done in the abstract class

-		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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java
deleted file mode 100644
index 94c51a5d1dc..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/manager/cell/EMFFeatureValueCellManager.java
+++ /dev/null
@@ -1,162 +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 java.util.Map;

-

-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.utils.EMFStringValueConverter;

-import org.eclipse.papyrus.infra.nattable.manager.cell.AbstractCellManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-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;

-	}

-

-	@Override

-	public ICommand getSetStringValueCommand(EditingDomain domain,final Table table, EObject tableContext, Object obj1, Object obj2, String newValue, EMFStringValueConverter valueSolver) {

-		return null;

-	}

-

-	

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/Messages.java b/sandbox/pasteInNewTable/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/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/messages/messages.properties b/sandbox/pasteInNewTable/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/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java
deleted file mode 100644
index e9ac239eaff..00000000000
--- a/sandbox/pasteInNewTable/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.ILabelProviderContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-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 ILabelProviderContextElementWrapper) {

-			Object object = ((ILabelProviderContextElementWrapper)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) {

-		ILabelProviderContextElementWrapper context = (ILabelProviderContextElementWrapper)element;

-		EObject object = (EObject)((ILabelProviderContextElementWrapper)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 LabelProviderCellContextElementWrapper) {

-			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper)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)((ILabelProviderContextElementWrapper)element).getObject();

-		if(object instanceof EObjectAxis) {

-			object = ((EObjectAxis)object).getElement();

-		}

-		final IConfigRegistry configRegistry = ((ILabelProviderContextElementWrapper)element).getConfigRegistry();

-		final LabelProviderService serv = getLabelProviderService(configRegistry);

-		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElementWrapper) {

-			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper)element);

-		}

-		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayIcon()) {

-			return null;

-		}

-		return serv.getLabelProvider(object).getImage(object);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFFeatureHeaderLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFFeatureHeaderLabelProvider.java
deleted file mode 100644
index b9310752f39..00000000000
--- a/sandbox/pasteInNewTable/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.ILabelProviderContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * Provides the label for the EstructuralFeature

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class 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 ILabelProviderContextElementWrapper) {

-			final Object object = ((ILabelProviderContextElementWrapper)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 = ((ILabelProviderContextElementWrapper)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)((ILabelProviderContextElementWrapper)element).getObject();

-		}

-

-		final IConfigRegistry configRegistry = ((ILabelProviderContextElementWrapper)element).getConfigRegistry();

-		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElementWrapper) {

-			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper)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 LabelProviderCellContextElementWrapper) {

-			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper)element);

-		}

-		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayIcon()) {

-			return null;

-		}

-

-		final Object object = ((ILabelProviderContextElementWrapper)element).getObject();

-		EStructuralFeature feature = null;

-		if(object instanceof EStructuralFeatureAxis) {

-			feature = ((EStructuralFeatureAxis)object).getElement();

-		} else if(object instanceof EStructuralFeature) {

-			feature = (EStructuralFeature)((ILabelProviderContextElementWrapper)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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/registry/EStructuralFeatureImageRegistry.java b/sandbox/pasteInNewTable/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/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/validator/IntegerDataValidator.java b/sandbox/pasteInNewTable/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/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.emf/.classpath b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/.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/pasteInNewTable/org.eclipse.papyrus.infra.emf/.project b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/.project
deleted file mode 100644
index 2e261c7b71c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.emf</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/pasteInNewTable/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5a8be5f6faa..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Thu Dec 08 10:09:13 CET 2011

-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/pasteInNewTable/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
deleted file mode 100644
index b61856493e4..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.emf.ecore;bundle-version="2.7.0",

- org.eclipse.emf.edit;bundle-version="2.7.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.1",

- org.eclipse.emf.edit.ui;bundle-version="2.8.0",

- org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.core.databinding.property;bundle-version="1.4.0",

- org.eclipse.emf.databinding;bundle-version="1.2.0",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.0",

- org.eclipse.emf.facet.infra.facet;bundle-version="0.2.0",

- org.eclipse.emf.facet.infra.browser.custom;bundle-version="0.2.0",

- org.eclipse.emf.facet.infra.facet.core;bundle-version="0.2.0",

- org.eclipse.emf.facet.infra.browser.custom.core;bundle-version="0.2.0",

- org.eclipse.papyrus.infra.tools;bundle-version="0.10.1",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.emf.ecore.xmi,

- org.eclipse.emf.facet.custom.metamodel;bundle-version="0.2.0",

- org.eclipse.emf.facet.custom.ui;bundle-version="0.2.0",

- org.eclipse.emf.facet.util.emf.core,

- com.ibm.icu;bundle-version="4.4.2",

- org.eclipse.papyrus.infra.core;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.1",

- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.core.expressions;bundle-version="3.4.400",

- org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",

- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

- com.google.guava;bundle-version="10.0.1"

-Export-Package: org.eclipse.papyrus.infra.emf,

- org.eclipse.papyrus.infra.emf.commands,

- org.eclipse.papyrus.infra.emf.databinding,

- org.eclipse.papyrus.infra.emf.dialog,

- org.eclipse.papyrus.infra.emf.providers,

- org.eclipse.papyrus.infra.emf.providers.strategy,

- org.eclipse.papyrus.infra.emf.utils

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.10.1.qualifier

-Bundle-Name: EMF Tools (Incubation)

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.emf.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/about.html b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/about.html
deleted file mode 100644
index 209103075a7..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/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>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>
\ No newline at end of file
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/build.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/build.properties
deleted file mode 100644
index 2eb0111b369..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               build.properties,\

-               plugin.pdoc,\

-               plugin.xml

-src.includes = about.html

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/plugin.pdoc b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/plugin.pdoc
deleted file mode 100644
index 0d8bd6f33cd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/plugin.pdoc
+++ /dev/null
@@ -1,5 +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 some classes with dependencies on EMF">

-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@cea.fr" currentCompany="CEA-LIST"/>

-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>

-</doc:Documentation>

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/plugin.xml b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/plugin.xml
deleted file mode 100644
index a5a77a29959..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/plugin.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.papyrus.infra.core.service">

-      <service

-            classname="org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceInitializerService"

-            description="Service used to initialize association between ResourceSet and ServiceRegistry"

-            id="org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceInitializerService"

-            priority="1"

-            startKind="startup">

-         <dependsOn

-               serviceKeyRef="org.eclipse.papyrus.infra.core.resource.ModelSet">

-         </dependsOn>

-      </service>

-   </extension>

-   <extension

-         point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">

-      <labelProvider

-            priority="100"

-            provider="org.eclipse.papyrus.infra.emf.providers.EMFFilteredLabelProvider">

-      </labelProvider>

-      <labelProvider

-            priority="50"

-            provider="org.eclipse.papyrus.infra.emf.providers.AnyTypeLabelProvider">

-      </labelProvider>

-   </extension>

-   <extension

-         point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">

-      <metamodel

-            nsURI="http://www.eclipse.org/emf/2002/Ecore">

-         <adviceBinding

-               class="org.eclipse.papyrus.infra.emf.advice.DeletePageAdvice"

-               id="org.eclipse.papyrus.infra.emf.deletePageAdvice"

-               inheritance="none"

-               typeId="*">

-         </adviceBinding>

-         <metamodelType

-               eclass="EObject"

-               edithelper="org.eclipse.papyrus.infra.emf.advice.DeletePageEditHelper"

-               id="org.eclipse.papyrus.infra.emf.page">

-         </metamodelType>

-      </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.emf.page">

-         </elementType>

-      </binding>

-      <binding

-            context="org.eclipse.gmf.runtime.emf.type.core.defaultContext">

-         <elementType

-               ref="org.eclipse.papyrus.infra.emf.deletePageAdvice">

-         </elementType>

-      </binding>

-   </extension>

-

-</plugin>

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java
deleted file mode 100644
index bb975328e95..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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 (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;

-import org.eclipse.emf.facet.infra.browser.custom.TypeView;

-import org.eclipse.emf.facet.infra.browser.custom.core.CustomizationsCatalog;

-import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;

-import org.eclipse.emf.facet.infra.facet.Facet;

-import org.eclipse.emf.facet.infra.facet.FacetSet;

-import org.eclipse.emf.facet.infra.facet.core.FacetSetCatalog;

-import org.eclipse.jface.dialogs.DialogSettings;

-import org.eclipse.jface.dialogs.IDialogSettings;

-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"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The plug-in's logger

-	 */

-	public static LogHelper log;

-

-	private CustomizationManager fCustomizationManager;

-

-	/**

-	 * 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;

-		log = new LogHelper(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;

-	}

-

-	/**

-	 * 

-	 * @return the customization manager in charge to adapt element in modisco

-	 */

-	public CustomizationManager getCustomizationManager() {

-		if(this.fCustomizationManager == null) {

-			this.fCustomizationManager = new CustomizationManager();

-			init(this.fCustomizationManager);

-		}

-		return this.fCustomizationManager;

-	}

-

-	/**

-	 * Saves the current Customization Manager settings to the preferences

-	 */

-	public void saveCustomizationManagerState() {

-		IDialogSettings dialogSettings = getBrowserCustomizationDialogSettings();

-

-		List<MetamodelView> appliedCustomizations = getCustomizationManager().getRegisteredCustomizations();

-

-		for(MetamodelView customization : CustomizationsCatalog.getInstance().getRegistryCustomizations()) {

-

-			boolean isApplied = appliedCustomizations.contains(customization);

-			String settingKey = getSettingKey(customization);

-

-			dialogSettings.put(settingKey, isApplied);

-		}

-	}

-

-	private String getSettingKey(MetamodelView customization) {

-		return customization.getLocation();

-	}

-

-	protected IDialogSettings getBrowserCustomizationDialogSettings() {

-		String sectionId = CUSTOMIZATION_MANAGER_SECTION;

-

-		IDialogSettings settings = Activator.getDefault().getDialogSettings().getSection(sectionId);

-		if(settings == null) {

-			settings = Activator.getDefault().getDialogSettings().addNewSection(sectionId);

-		}

-		return settings;

-	}

-

-	private void init(final CustomizationManager customizationManager) {

-		// the appearance can be customized here:

-

-		customizationManager.setShowDerivedLinks(true);

-		//to hide the blue arrow overlay

-		customizationManager.setDecorateExternalResources(false);

-

-		IDialogSettings settings = getBrowserCustomizationDialogSettings();

-

-		try {

-

-			// load customizations defined as default through the customization

-			// extension

-			List<MetamodelView> registryDefaultCustomizations = CustomizationsCatalog.getInstance().getRegistryDefaultCustomizations();

-			List<MetamodelView> registryAllCustomizations = CustomizationsCatalog.getInstance().getRegistryCustomizations();

-

-			List<MetamodelView> appliedCustomizations = new LinkedList<MetamodelView>();

-

-			for(MetamodelView customization : registryAllCustomizations) {

-				String settingKey = getSettingKey(customization);

-

-				boolean isActive = false;

-				if(settings.get(settingKey) == null) { //Never customized

-					isActive = registryDefaultCustomizations.contains(customization); //Loaded by default

-				} else {

-					isActive = settings.getBoolean(settingKey);

-				}

-

-				if(isActive) {

-					customizationManager.registerCustomization(customization);

-					appliedCustomizations.add(customization);

-				}

-			}

-

-			customizationManager.loadCustomizations();

-			loadFacetsForCustomizations(appliedCustomizations, customizationManager);

-

-		} catch (Throwable e) {

-			Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error initializing customizations", e)); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 * The section name of the Dialog Settings for storing Customization Manager settings

-	 */

-	public static final String CUSTOMIZATION_MANAGER_SECTION = PLUGIN_ID + ".customizationManager";//$NON-NLS-1$

-

-	/**

-	 * Restores the default Customization Manager configuration

-	 */

-	public void restoreDefaultCustomizationManager() {

-		CustomizationManager manager = getCustomizationManager();

-

-		DialogSettings settings = (DialogSettings)getDialogSettings();

-		settings.removeSection(CUSTOMIZATION_MANAGER_SECTION);

-

-		List<MetamodelView> registryDefaultCustomizations = CustomizationsCatalog.getInstance().getRegistryDefaultCustomizations();

-

-		manager.clearCustomizations();

-		for(MetamodelView customization : registryDefaultCustomizations) {

-			manager.registerCustomization(customization);

-		}

-		manager.loadCustomizations();

-	}

-

-	/**

-	 * load the facets

-	 * 

-	 * @param customizations

-	 *        list of customization

-	 * @param customizationManager

-	 *        the Customization Manager

-	 */

-	protected void loadFacetsForCustomizations(final List<MetamodelView> customizations, final CustomizationManager customizationManager) {

-		final Set<Facet> referencedFacets = new HashSet<Facet>();

-		final Collection<FacetSet> facetSets = FacetSetCatalog.getSingleton().getAllFacetSets();

-

-		for(MetamodelView customization : customizations) {

-			String metamodelURI = customization.getMetamodelURI();

-			// find customized FacetSet

-			FacetSet customizedFacetSet = null;

-			if(metamodelURI != null) {

-				for(FacetSet facetSet : facetSets) {

-					if(metamodelURI.equals(facetSet.getNsURI())) {

-						customizedFacetSet = facetSet;

-						break;

-					}

-				}

-			}

-			if(customizedFacetSet == null) {

-				continue;

-			}

-

-			// find customized Facets

-			EList<TypeView> types = customization.getTypes();

-			for(TypeView typeView : types) {

-				String metaclassName = typeView.getMetaclassName();

-				Facet facet = findFacetWithFullyQualifiedName(metaclassName, customizedFacetSet);

-				if(facet != null) {

-					referencedFacets.add(facet);

-				} else {

-					Activator.log.warn(String.format("Missing required facet \"%s\" in FacetSet \"%s\" for customization \"%s\"", metaclassName, customizedFacetSet.getName(), customization.getName()));

-				}

-			}

-

-			for(Facet referencedFacet : referencedFacets) {

-				customizationManager.loadFacet(referencedFacet);

-			}

-		}

-

-		//

-		// for modified facets

-		// customizationManager.getInstancesForMetaclasses().buildDerivationTree();

-		// customizationManager.getAppearanceConfiguration().touch();

-		// customizationManager.refreshDelayed(true);

-	}

-

-	/**

-	 * fin a facet from

-	 * 

-	 * @param metaclassName

-	 * @param customizedFacetSet

-	 * @return

-	 */

-	private Facet findFacetWithFullyQualifiedName(final String metaclassName, final FacetSet customizedFacetSet) {

-		EList<Facet> facets = customizedFacetSet.getFacets();

-		for(Facet facet : facets) {

-			String facetName = getMetaclassQualifiedName(facet);

-			if(metaclassName.equals(facetName)) {

-				return facet;

-			}

-		}

-		return null;

-	}

-

-	/** @return the qualified name of the given metaclass */

-	public static String getMetaclassQualifiedName(final EClassifier eClass) {

-		final ArrayList<String> qualifiedNameParts = new ArrayList<String>();

-		final StringBuilder builder = new StringBuilder();

-

-		EPackage ePackage = eClass.getEPackage();

-		while(ePackage != null) {

-			qualifiedNameParts.add(ePackage.getName());

-			ePackage = ePackage.getESuperPackage();

-		}

-

-		for(int i = qualifiedNameParts.size() - 1; i >= 0; i--) {

-			builder.append(qualifiedNameParts.get(i) + "."); //$NON-NLS-1$

-		}

-

-		builder.append(eClass.getName());

-

-		return builder.toString();

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java
deleted file mode 100644
index 21894ef9909..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.advice;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-

-/**

- * An EditHelperAdvice which applies to all Papyrus page identifiers (i.e. Tables, Diagrams, ...)

- * When a page identifier object is deleted, the associated page is removed

- * 

- * This advice is used when an Object containing a page is deleted

- * 

- * @author Camille Letavernier

- * 

- */

-public class DeletePageAdvice extends AbstractEditHelperAdvice {

-

-	@Override

-	public ICommand getBeforeDestroyElementCommand(DestroyElementRequest request) {

-		final EObject objectToDestroy = request.getElementToDestroy();

-		if(objectToDestroy == null) {

-			return null;

-		}

-

-		return RemovePageHelper.getRemovePageCommand(request.getEditingDomain(), objectToDestroy);

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageEditHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageEditHelper.java
deleted file mode 100644
index 8819b05bcab..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageEditHelper.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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.advice;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-

-/**

- * An EditHelper which applies to all Papyrus page identifiers (i.e. Tables, Diagrams, ...)

- * When a page identifier object is deleted, the associated page is removed

- * 

- * This EditHelper will be called when a Page is deleted

- * 

- * @author Camille Letavernier

- * 

- */

-public class DeletePageEditHelper extends AbstractEditHelper {

-

-	@Override

-	protected ICommand getDestroyElementCommand(DestroyElementRequest req) {

-		ICommand baseCommand = super.getDestroyElementCommand(req);

-

-		final EObject elementToDestroy = req.getElementToDestroy();

-

-		ICommand removePage = RemovePageHelper.getRemovePageCommand(req.getEditingDomain(), elementToDestroy);

-

-		baseCommand = CompositeCommand.compose(removePage, baseCommand);

-

-		return baseCommand;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/RemovePageHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/RemovePageHelper.java
deleted file mode 100644
index 2f55fda2fea..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/RemovePageHelper.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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.advice;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.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.infra.core.sasheditor.contentprovider.IPageManager;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-

-/**

- * A Helper to build the command used to remove the page associated to the destroyed element

- * 

- * @author Camille Letavernier

- * 

- */

-public class RemovePageHelper {

-

-	public static ICommand getRemovePageCommand(final TransactionalEditingDomain editingDomain, final EObject elementToDestroy) {

-		try {

-			final IPageManager pageManager = ServiceUtilsForEObject.getInstance().getIPageManager(elementToDestroy);

-			if(pageManager.allPages().contains(elementToDestroy)) {

-				return new AbstractTransactionalCommand(editingDomain, "Delete page", null) {

-

-					@Override

-					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-						pageManager.removePage(elementToDestroy);

-						return CommandResult.newOKCommandResult();

-					}

-				};

-			}

-		} catch (ServiceException ex) {

-			//Ignore

-		} catch (Exception ex) {

-			//Ignore

-		}

-

-		return null;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/AddToResourceCommand.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/AddToResourceCommand.java
deleted file mode 100644
index 52ee15b938a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/AddToResourceCommand.java
+++ /dev/null
@@ -1,100 +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.commands;

-

-import org.eclipse.emf.common.command.AbstractCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-

-/**

- * 

- * This command allows to add an EObject to a resource

- * 

- */

-public class AddToResourceCommand extends AbstractCommand {

-

-	/**

-	 * the resource

-	 */

-	private final Resource resource;

-

-	/**

-	 * the object to add to the resource

-	 */

-	private final EObject toAdd;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param resource

-	 *        the resource

-	 * @param toAdd

-	 *        the objectto add to the resource

-	 */

-	public AddToResourceCommand(final Resource resource, final EObject toAdd) {

-		this.resource = resource;

-		this.toAdd = toAdd;

-		setLabel("Add an object to a resource");

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.emf.common.command.Command#execute()

-	 * 

-	 */

-	public void execute() {

-		this.resource.getContents().add(this.toAdd);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.emf.common.command.Command#redo()

-	 * 

-	 */

-	public void redo() {

-		execute();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.emf.common.command.AbstractCommand#prepare()

-	 * 

-	 */

-	@Override

-	protected boolean prepare() {

-		return true;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.emf.common.command.AbstractCommand#undo()

-	 * 

-	 */

-	@Override

-	public void undo() {

-		this.resource.getContents().remove(this.toAdd);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.emf.common.command.AbstractCommand#canExecute()

-	 * 

-	 */

-	@Override

-	public boolean canExecute() {

-		return super.canExecute() && this.resource != null;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/CreateEAnnotationCommand.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/CreateEAnnotationCommand.java
deleted file mode 100644
index c253c04e724..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/CreateEAnnotationCommand.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.commands;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EcoreFactory;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-

-public class CreateEAnnotationCommand extends org.eclipse.emf.transaction.RecordingCommand {

-

-	public EModelElement getObject() {

-		return object;

-	}

-

-	// @unused

-	public void setObject(EModelElement object) {

-		this.object = object;

-	}

-

-	// @unused

-	public String getEAnnotationName() {

-		return eAnnotationName;

-	}

-

-	// @unused

-	public void setEAnnotationName(String annotationName) {

-		eAnnotationName = annotationName;

-	}

-

-	/** The object. */

-	private EModelElement object;

-

-	/** The e annotation name. */

-	private String eAnnotationName;

-

-	/**

-	 * Instantiates a new creates the e annotation command.

-	 * 

-	 * @param domain

-	 *        the domain

-	 * @param object

-	 *        the object

-	 * @param eannotationName

-	 *        the eannotation name

-	 */

-	public CreateEAnnotationCommand(TransactionalEditingDomain domain, EModelElement object, String eannotationName) {

-		super(domain);

-		this.object = object;

-		this.eAnnotationName = eannotationName;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		attachEannotation(createEAnnotation(), object);

-

-	}

-

-	/**

-	 * Creates the e annotation.

-	 * 

-	 * @return the e annotation

-	 */

-	protected EAnnotation createEAnnotation() {

-		EAnnotation eannotation = EcoreFactory.eINSTANCE.createEAnnotation();

-		eannotation.setSource(eAnnotationName);

-		return eannotation;

-	}

-

-	/**

-	 * Attach eannotation to an EmodelElement.

-	 * 

-	 * @param annotation

-	 *        the annotation

-	 * @param object

-	 *        the object

-	 */

-	protected void attachEannotation(EAnnotation annotation, EModelElement object) {

-		object.getEAnnotations().add(annotation);

-	}

-

-	/**

-	 * Replace existing eannotation with a new eannotation. This repplaced eannotation has the same

-	 * source.

-	 * 

-	 * @param annotation

-	 *        the annotation

-	 * @param object

-	 *        the object

-	 */

-	protected void replaceEannotation(EAnnotation annotation, EModelElement object) {

-		while(object.getEAnnotation(annotation.getSource()) != null) {

-			object.getEAnnotations().remove(object.getEAnnotation(annotation.getSource()));

-		}

-

-		object.getEAnnotations().add(annotation);

-	}

-

-	/**

-	 * Adds the entry.

-	 * 

-	 * @param annotation

-	 *        the annotation

-	 * @param key

-	 *        the key

-	 * @param value

-	 *        the value

-	 */

-	// @unused

-	protected void addEntry(EAnnotation annotation, String key, String value) {

-		annotation.getDetails().put(key, value);

-	}

-

-	/**

-	 * Replace entry.

-	 * 

-	 * @param annotation

-	 *        the annotation not null

-	 * @param key

-	 *        the key

-	 * @param value

-	 *        the value

-	 */

-	protected void replaceEntry(EAnnotation annotation, String key, String value) {

-		while(annotation.getDetails().get(key) != null) {

-			annotation.getDetails().removeKey(key);

-

-		}

-		annotation.getDetails().put(key, value);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/IPapyrusDuplicateCommandConstants.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/IPapyrusDuplicateCommandConstants.java
deleted file mode 100644
index e2a59d4646b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/IPapyrusDuplicateCommandConstants.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *		

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.commands;

-

-

-/**

- * Constants for the duplication commands.

- */

-public interface IPapyrusDuplicateCommandConstants {

-

-	/** Constant used as a key for the parameters map of the duplication request */

-	public final String ADDITIONAL_DUPLICATED_ELEMENTS = "Additional_Duplicated_Elements"; //$NON-NLS-1$

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveEAnnotationCommand.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveEAnnotationCommand.java
deleted file mode 100644
index bca16f5e807..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveEAnnotationCommand.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.commands;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-

-/**

- * This {@link RecordingCommand} removes an eannotation to a given element.

- */

-public class RemoveEAnnotationCommand extends org.eclipse.emf.transaction.RecordingCommand {

-

-	// @unused

-	public EModelElement getObject() {

-		return object;

-	}

-

-	// @unused

-	public void setObject(EModelElement object) {

-		this.object = object;

-	}

-

-	// @unused

-	public String getEAnnotationName() {

-		return eAnnotationName;

-	}

-

-	// @unused

-	public void setEAnnotationName(String annotationName) {

-		eAnnotationName = annotationName;

-	}

-

-	/** The object. */

-	private EModelElement object;

-

-	/** The e annotation name. */

-	private String eAnnotationName;

-

-	/**

-	 * Instantiates a new creates the e annotation command.

-	 * 

-	 * @param domain

-	 *        the domain

-	 * @param object

-	 *        the object

-	 * @param eannotationName

-	 *        the eannotation name

-	 */

-	public RemoveEAnnotationCommand(TransactionalEditingDomain domain, EModelElement object, String eannotationName) {

-		super(domain);

-		this.object = object;

-		this.eAnnotationName = eannotationName;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doExecute() {

-		EAnnotation annotation = object.getEAnnotation(eAnnotationName);

-		object.getEAnnotations().remove(annotation);

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveFromResourcecommand.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveFromResourcecommand.java
deleted file mode 100644
index 1d87e223a28..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/RemoveFromResourcecommand.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.emf.commands;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-

-/**

- * 

- * This command allows to remove elements from a resource

- * 

- */

-public class RemoveFromResourcecommand extends RecordingCommand {

-

-	/**

-	 * the managed resource

-	 */

-	final private Resource resource;

-

-	/**

-	 * the element to remove from the resource

-	 */

-	final private EObject toRemove;

-

-	/**

-	 * the list of the elements to remove from the resource

-	 */

-	final private Collection<EObject> elementsToRemove;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param domain

-	 *        the editing domain

-	 * @param resource

-	 *        the resource

-	 * @param toRemove

-	 *        the element to remove

-	 */

-	public RemoveFromResourcecommand(final TransactionalEditingDomain domain, final Resource resource, final EObject toRemove) {

-		this(domain, resource, toRemove, null);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param domain

-	 *        the editing domain

-	 * @param resource

-	 *        the resource

-	 * @param elementsToRemove

-	 *        the list of the elements to remove

-	 */

-	public RemoveFromResourcecommand(final TransactionalEditingDomain domain, final Resource resource, final Collection<EObject> elementsToRemove) {

-		this(domain, resource, null, elementsToRemove);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param domain

-	 *        the editing domain

-	 * @param resource

-	 *        the resource

-	 * @param toRemove

-	 *        the element to remove

-	 * @param elementsToRemove

-	 *        the list of the elements to remove

-	 */

-	protected RemoveFromResourcecommand(final TransactionalEditingDomain domain, final Resource resource, final EObject toRemove, final Collection<EObject> elementsToRemove) {

-		super(domain, "Remove an EObject from a resource");

-		this.resource = resource;

-		this.toRemove = toRemove;

-		this.elementsToRemove = elementsToRemove;

-	}

-

-	/**

-	 * 

-	 * remove the element(s) of the resource

-	 * 

-	 */

-	@Override

-	protected void doExecute() {

-		try {

-			if(this.toRemove != null) {

-				this.resource.getContents().remove(toRemove);

-			}

-

-			if(this.elementsToRemove != null) {

-				this.resource.getContents().removeAll(elementsToRemove);

-			}

-		} catch (Exception e) {

-			int i = 0;

-			i++;

-		}

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.emf.common.command.AbstractCommand#canExecute()

-	 * 

-	 * @return

-	 */

-	@Override

-	public boolean canExecute() {

-		boolean result = super.canExecute();

-		if(toRemove == null && elementsToRemove == null) {

-			return false;

-		}

-		return result;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/UnsetCommand.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/UnsetCommand.java
deleted file mode 100644
index a5b70fd6c1e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/commands/UnsetCommand.java
+++ /dev/null
@@ -1,62 +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.commands;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.messages.Messages;

-

-

-public class UnsetCommand extends RecordingCommand {

-

-	/**

-	 * the source eobject

-	 */

-	private final EObject source;

-

-	/**

-	 * the feature

-	 */

-	private final EStructuralFeature feature;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param domain

-	 *        the editing domain

-	 * @param source

-	 *        the eobject to modify

-	 * @param feature

-	 *        the feature to unset

-	 */

-	public UnsetCommand(final TransactionalEditingDomain domain, final EObject source, final EStructuralFeature feature) {

-		super(domain, Messages.UnsetCommand_UnsetCommand);

-		this.source = source;

-		this.feature = feature;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()

-	 * 

-	 */

-	@Override

-	protected void doExecute() {

-		source.eUnset(feature);

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/AnnotationObservableValue.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/AnnotationObservableValue.java
deleted file mode 100644
index 1e690d4c09a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/AnnotationObservableValue.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.emf.databinding;

-

-import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

-import org.eclipse.emf.common.command.AbstractCommand;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EcoreFactory;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-

-/**

- * An IObservableValue for editing EMF EAnnotations

- * 

- * @author Camille Letavernier

- */

-public class AnnotationObservableValue extends AbstractObservableValue {

-

-	/**

-	 * The EModelElement to edit.

-	 */

-	protected EModelElement source;

-

-	/**

-	 * The editing domain on which the commands will be executed

-	 */

-	protected EditingDomain domain;

-

-	/**

-	 * The name of the annotation to use

-	 */

-	protected String annotationName;

-

-	/**

-	 * The annotation key to edit

-	 */

-	protected String key;

-

-	/**

-	 * Whether the EAnnotation should be removed from the source when its last

-	 * entry is removed (ie. value = null)

-	 */

-	protected boolean deleteWithLastEntry;

-

-	/**

-	 * Constructor.

-	 * 

-	 * Creates an IObservableValue for the annotation. The annotation doesn't

-	 * need to be created beforehand

-	 * 

-	 * @param source

-	 *        The EObject owning the annotation

-	 * @param domain

-	 *        The editing domain on which the commands will be executed

-	 * @param annotationName

-	 *        The name of the annotation

-	 * @param key

-	 *        The name of annotation's property to edit

-	 */

-	public AnnotationObservableValue(EModelElement source, EditingDomain domain, String annotationName, String key) {

-		this(source, domain, annotationName, key, false);

-	}

-

-	/**

-	 * Constructor.

-	 * 

-	 * Creates an IObservableValue for the annotation. The annotation doesn't

-	 * need to be created beforehand

-	 * 

-	 * @param source

-	 *        The EObject owning the annotation

-	 * @param domain

-	 *        The editing domain on which the commands will be executed

-	 * @param annotationName

-	 *        The name of the annotation

-	 * @param key

-	 *        The name of annotation's property to edit

-	 * @param deleteWithLastEntry

-	 *        Whether the EAnnotation should be removed from the source when its

-	 *        last entry is removed (ie. value = null)

-	 */

-	public AnnotationObservableValue(EModelElement source, EditingDomain domain, String annotationName, String key, boolean deleteWithLastEntry) {

-		this.source = source;

-		this.domain = domain;

-		this.annotationName = annotationName;

-		this.key = key;

-		this.deleteWithLastEntry = deleteWithLastEntry;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object getValueType() {

-		return String.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected Object doGetValue() {

-		EAnnotation annotation = getEAnnotation();

-		if(annotation == null) {

-			return null;

-		}

-

-		return annotation.getDetails().get(key);

-	}

-

-	/**

-	 * @return the observed EAnnotation

-	 */

-	protected EAnnotation getEAnnotation() {

-		return source.getEAnnotation(annotationName);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	protected void doSetValue(Object value) {

-		Command emfCommand = getCommand(value);

-		if(emfCommand != null) {

-			domain.getCommandStack().execute(emfCommand);

-		}

-	}

-

-	/**

-	 * Returns the command used to edit the observed annotation, which the

-	 * given value

-	 * 

-	 * @param value

-	 * @return

-	 */

-	protected Command getCommand(Object value) {

-		EAnnotation annotation = getEAnnotation();

-

-		if(value == null) {

-			//No change : the key is not defined ; we cannot remove it

-			if(annotation == null || !annotation.getDetails().containsKey(key)) {

-				return null;

-			}

-		} else {

-			if(!(value instanceof String)) {

-				return null;

-			}

-		}

-

-		CompoundCommand emfCommand = new CompoundCommand("Set " + key) {

-

-			@Override

-			public boolean prepare() {

-				if(this.isEmpty()) {

-					return false;

-				}

-

-				return commandList.get(0).canExecute();

-			}

-

-		};

-

-		if(annotation == null) {

-			annotation = EcoreFactory.eINSTANCE.createEAnnotation();

-

-			SetCommand attachToSourceCommand = new SetCommand(domain, annotation, EcorePackage.eINSTANCE.getEAnnotation_EModelElement(), source);

-			attachToSourceCommand.setLabel("Attach to source");

-			emfCommand.append(attachToSourceCommand);

-

-			SetCommand nameCommand = new SetCommand(domain, annotation, EcorePackage.eINSTANCE.getEAnnotation_Source(), annotationName);

-			nameCommand.setLabel("Set name");

-			emfCommand.append(nameCommand);

-		}

-

-		if(value == null) {

-			if(annotation.getDetails().size() == 1 && annotation.getDetails().containsKey(key) && deleteWithLastEntry) {

-				//We removed the last key : delete the annotation

-				SetCommand deleteAnnotationCommand = new SetCommand(domain, annotation, EcorePackage.eINSTANCE.getEAnnotation_EModelElement(), null);

-				deleteAnnotationCommand.setLabel("Delete EAnnotation");

-				emfCommand.append(deleteAnnotationCommand);

-			} else {

-				Command removeEntryCommand = new RemoveEntryCommand(annotation, key);

-				emfCommand.append(removeEntryCommand);

-			}

-		} else {

-			Command addEntryCommand = new AddEntryCommand(annotation, key, (String)value);

-			emfCommand.append(addEntryCommand);

-		}

-

-		return emfCommand;

-	}

-

-	/**

-	 * A Command to remove an entry from an EAnnotation

-	 * 

-	 * @author Camille Letavernier

-	 * 

-	 */

-	protected class RemoveEntryCommand extends AbstractCommand {

-

-		private EAnnotation annotation;

-

-		private String key;

-

-		private String previousValue;

-

-		private boolean undo = false;

-

-		/**

-		 * Constructor

-		 * 

-		 * @param annotation

-		 *        The EAnnotation to edit

-		 * @param key

-		 *        The EAnnotation's key to edit

-		 */

-		public RemoveEntryCommand(EAnnotation annotation, String key) {

-			this.annotation = annotation;

-			this.key = key;

-		}

-

-		public void execute() {

-			undo = annotation.getDetails().containsKey(key);

-			if(undo) {

-				previousValue = annotation.getDetails().get(key);

-				annotation.getDetails().remove(key);

-			}

-		}

-

-		public void redo() {

-			execute();

-		}

-

-		@Override

-		public boolean prepare() {

-			return true;

-		}

-

-		@Override

-		public void undo() {

-			if(undo) {

-				annotation.getDetails().put(key, previousValue);

-			}

-		}

-	}

-

-	/**

-	 * A Command to set an EAnnotation's entry

-	 * 

-	 * @author Camille Letavernier

-	 */

-	protected class AddEntryCommand extends AbstractCommand {

-

-		private EAnnotation annotation;

-

-		private String key;

-

-		private String value;

-

-		/**

-		 * 

-		 * 

-		 * @param annotation

-		 *        The EAnnotation to edit

-		 * @param key

-		 *        The EAnnotation's key to edit

-		 * @param value

-		 *        The value to set

-		 */

-		public AddEntryCommand(EAnnotation annotation, String key, String value) {

-			this.annotation = annotation;

-			this.key = key;

-			this.value = value;

-		}

-

-		public void execute() {

-			annotation.getDetails().put(key, value);

-		}

-

-		public void redo() {

-			execute();

-		}

-

-		@Override

-		public void undo() {

-			annotation.getDetails().remove(key);

-		}

-

-		@Override

-		public boolean prepare() {

-			return true;

-		}

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/EMFObservableList.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/EMFObservableList.java
deleted file mode 100644
index 67b5f24364b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/EMFObservableList.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.databinding;

-

-import java.util.Collection;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.databinding.observable.list.ObservableList;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.command.AddCommand;

-import org.eclipse.emf.edit.command.DeleteCommand;

-import org.eclipse.emf.edit.command.RemoveCommand;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

-import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

-

-/**

- * An ObservableList using EMF Commands to edit the underlying list.

- * The commands are executed when the {@link #commit(AbstractEditor)} method is called.

- * However, the read operations (such as get, size, ...) return up-to-date

- * results, even when {@link #commit(AbstractEditor)} hasn't been called.

- * 

- * @author Camille Letavernier

- */

-@SuppressWarnings({ "unchecked", "rawtypes" })

-public class EMFObservableList extends ObservableList implements ICommitListener {

-

-	/**

-	 * The list of commands that haven't been executed yet

-	 */

-	protected List<Command> commands = new LinkedList<Command>();

-

-	/**

-	 * The editing domain on which the commands will be executed

-	 */

-	protected EditingDomain editingDomain;

-

-	/**

-	 * The edited EObject

-	 */

-	protected EObject source;

-

-	/**

-	 * The feature being edited

-	 */

-	protected EStructuralFeature feature;

-

-	/**

-	 * The list to be updated only on #commit() calls

-	 */

-	protected List<?> concreteList;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param wrappedList

-	 *        The list to be edited when #commit() is called

-	 * @param domain

-	 *        The editing domain on which the commands will be executed

-	 * @param source

-	 *        The EObject from which the list will be retrieved

-	 * @param feature

-	 *        The feature from which the list will be retrieved

-	 */

-	public EMFObservableList(List<?> wrappedList, EditingDomain domain, EObject source, EStructuralFeature feature) {

-		super(new LinkedList<Object>(wrappedList), Object.class);

-		this.concreteList = wrappedList;

-		this.editingDomain = domain;

-		this.source = source;

-		this.feature = feature;

-	}

-

-	/**

-	 * Forces this list to commit all the pending commands. Only one composite command will

-	 * be executed, and can be undone in a single operation.

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.editors.ICommitListener#commit(AbstractEditor)

-	 * 

-	 */

-	public void commit(AbstractEditor editor) {

-

-		if(commands.isEmpty()) {

-			return;

-		}

-

-		CompoundCommand compoundCommand = new CompoundCommand() {

-

-			@Override

-			public void execute() {

-				super.execute();

-				refreshCacheList();

-			}

-

-			@Override

-			public void undo() {

-				super.undo();

-				refreshCacheList();

-			}

-

-			@Override

-			public void redo() {

-				super.redo();

-				refreshCacheList();

-			}

-

-			@Override

-			protected boolean prepare() {

-				if(commandList.isEmpty()) {

-					return false;

-				} else {

-					//We only test the first command, as the following ones might depend

-					//on the first command's execution. StrictCompoundCommands don't seem

-					//to be compatible with emf transaction (execute() is called by 

-					//canExecute(), before the transaction is started)

-					return commandList.get(0).canExecute();

-				}

-			}

-		};

-

-		for(Command cmd : commands) {

-			compoundCommand.append(cmd);

-		}

-

-		editingDomain.getCommandStack().execute(compoundCommand);

-		refreshCacheList();

-		commands.clear();

-	}

-

-	/**

-	 * Refresh the cached list by copying the real list

-	 */

-	protected void refreshCacheList() {

-		if(isDisposed()) {

-			//This observable can be disposed, but the commands might still be

-			//in the command stack. Undo() or Redo() will call this method, which

-			//should be ignored. The command should probably not call refresh directly ;

-			//we should have listeners on the concrete list... but it is not necessarily

-			//observable

-			return;

-		}

-		wrappedList.clear();

-		wrappedList.addAll(concreteList);

-		fireListChange(null);

-	}

-

-	@Override

-	public void add(int index, Object value) {

-		Command command = getAddCommand(index, value);

-		commands.add(command);

-

-		wrappedList.add(index, value);

-		fireListChange(null);

-	}

-

-	@Override

-	public void clear() {

-		Command command = getClearCommand();

-		commands.add(command);

-

-		wrappedList.clear();

-		fireListChange(null);

-	}

-

-	@Override

-	public boolean add(Object o) {

-		Command command = getAddCommand(o);

-		commands.add(command);

-

-		boolean result = wrappedList.add(o);

-		fireListChange(null);

-		return result;

-	}

-

-	@Override

-	public boolean remove(Object o) {

-		Command command = getRemoveCommand(o);

-

-		commands.add(command);

-

-		boolean result = wrappedList.remove(o);

-		fireListChange(null);

-		return result;

-	}

-

-	@Override

-	public boolean addAll(Collection c) {

-		Command command = getAddAllCommand(c);

-		commands.add(command);

-

-		boolean result = wrappedList.addAll(c);

-		fireListChange(null);

-		return result;

-	}

-

-	@Override

-	public boolean addAll(int index, Collection c) {

-		Command command = getAddAllCommand(index, c);

-		commands.add(command);

-

-		boolean result = wrappedList.addAll(index, c);

-		fireListChange(null);

-		return result;

-	}

-

-	@Override

-	public boolean removeAll(Collection c) {

-		Command command = getRemoveCommand(c);

-		commands.add(command);

-

-		boolean result = wrappedList.removeAll(c);

-		fireListChange(null);

-		return result;

-	}

-

-	@Override

-	public boolean retainAll(Collection c) {

-		Command command = getRetainAllCommand(c);

-		commands.add(command);

-

-		boolean result = wrappedList.retainAll(c);

-		fireListChange(null);

-		return result;

-	}

-

-	@Override

-	public Object set(int index, Object element) {

-		Command command = getSetCommand(index, element);

-		commands.add(command);

-

-		Object result = wrappedList.set(index, element);

-		fireListChange(null);

-		return result;

-	}

-

-	@Override

-	public Object move(int oldIndex, int newIndex) {

-		commands.addAll(getMoveCommands(oldIndex, newIndex));

-

-		Object value = get(oldIndex);

-		wrappedList.remove(oldIndex);

-		wrappedList.add(newIndex, value);

-

-		fireListChange(null);

-

-		return value;

-	}

-

-	@Override

-	public Object remove(int index) {

-		Object value = get(index);

-		if(value != null) {

-			Command command = getRemoveCommand(index);

-			commands.add(command);

-		}

-

-		Object result = wrappedList.remove(index);

-		fireListChange(null);

-		return result;

-	}

-

-	public Command getAddCommand(int index, Object value) {

-		return AddCommand.create(editingDomain, source, feature, value, index);

-	}

-

-	public Command getAddCommand(Object value) {

-		return AddCommand.create(editingDomain, source, feature, value);

-	}

-

-	public Command getAddAllCommand(Collection<?> values) {

-		return AddCommand.create(editingDomain, source, feature, values);

-	}

-

-	public Command getAddAllCommand(int index, Collection<?> values) {

-		return AddCommand.create(editingDomain, source, feature, values, index);

-	}

-

-	public Command getClearCommand() {

-		return getRemoveAllCommand(new LinkedList<Object>(wrappedList));

-	}

-

-	public Command getRemoveCommand(int index) {

-		Object value = get(index);

-		return getRemoveCommand(value);

-	}

-

-	public Command getRemoveCommand(Object value) {

-		Command cmd = RemoveCommand.create(editingDomain, source, feature, value);

-		if (value instanceof EObject && feature instanceof EReference && ((EReference)feature).isContainment()) {

-			addDestroyCommand(cmd, (EObject)value);

-		}

-		return cmd;

-	}

-

-	public Command getRemoveAllCommand(Collection<?> values) {

-		CompoundCommand cc = new CompoundCommand("Edit list");

-

-		if (feature instanceof EReference && ((EReference)feature).isContainment() && values != null) {

-			for (Object o : values) {

-				if (o instanceof EObject) {

-					addDestroyCommand(cc, (EObject)o);

-				}

-			}

-		}

-

-		cc.append(RemoveCommand.create(editingDomain, source, feature, values));

-		return cc;

-	}

-

-	public List<Command> getMoveCommands(int oldIndex, int newIndex) {

-		Object value = get(oldIndex);

-		List<Command> commands = new LinkedList<Command>();

-		commands.add(getRemoveCommand(value));

-		commands.add(getAddCommand(newIndex, value));

-		return commands;

-	}

-

-	public Command getRetainAllCommand(Collection<?> values) {

-		List<Object> objectsToRemove = new LinkedList<Object>();

-		for(Object object : values) {

-			if(!contains(object)) {

-				objectsToRemove.add(object);

-			}

-		}

-		if(!objectsToRemove.isEmpty()) {

-			return getRemoveAllCommand(objectsToRemove);

-		} else {

-			return null;

-		}

-	}

-

-	public Command getSetCommand(int index, Object value) {

-		Object oldValue = get(index);

-		Command command = SetCommand.create(editingDomain, source, feature, value, index);

-		if (oldValue instanceof EObject && feature instanceof EReference && ((EReference)feature).isContainment()) {

-			addDestroyCommand(command, (EObject)oldValue);

-		}

-		return command;

-	}

-	

-	protected void addDestroyCommand(Command cmd, EObject objToDestroy) {

-		Command destroyCmd = DeleteCommand.create(editingDomain, objToDestroy);

-

-		if (cmd instanceof CompoundCommand) {

-			((CompoundCommand)cmd).append(destroyCmd);

-		} else {

-			cmd.chain(destroyCmd);

-		}

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/EMFObservableValue.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/EMFObservableValue.java
deleted file mode 100644
index 6ddd393f854..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/databinding/EMFObservableValue.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.databinding;

-

-import org.eclipse.core.databinding.observable.Realm;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CompoundCommand;

-import org.eclipse.emf.databinding.EObjectObservableValue;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.command.DeleteCommand;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-

-/**

- * An Observable value to edit EMF values through EMF commands.

- * 

- * @author Camille Letavernier

- */

-public class EMFObservableValue extends EObjectObservableValue {

-

-	/**

-	 * The editing domain on which the commands will be executed

-	 */

-	protected EditingDomain domain;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param eObject

-	 *        The eObject being edited

-	 * @param eStructuralFeature

-	 *        The structuralFeature being edited

-	 * @param domain

-	 *        The Editing domain on which the commands will be executed

-	 */

-	public EMFObservableValue(EObject eObject, EStructuralFeature eStructuralFeature, EditingDomain domain) {

-		this(Realm.getDefault(), eObject, eStructuralFeature, domain);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param realm

-	 * @param eObject

-	 *        The eObject being edited

-	 * @param eStructuralFeature

-	 *        The structuralFeature being edited

-	 * @param domain

-	 *        The Editing domain on which the commands will be executed

-	 */

-	public EMFObservableValue(Realm realm, EObject eObject, EStructuralFeature eStructuralFeature, EditingDomain domain) {

-		super(realm, eObject, eStructuralFeature);

-		this.domain = domain;

-	}

-

-	@Override

-	protected void doSetValue(Object value) {

-		EObject eObject = EMFHelper.getEObject(value);

-		if(eObject != null) {

-			value = eObject;

-		}

-

-		Command command = getSetCommand(value);

-		domain.getCommandStack().execute(command);

-	}

-

-	/**

-	 * Returns the command used to edit the value

-	 * 

-	 * @param value

-	 *        The new value

-	 * @return

-	 *         The Set command used to edit the value

-	 */

-	protected Command getSetCommand(Object value) {

-		Object oldValue = getValue();

-

-		CompoundCommand cc = new CompoundCommand("Edit value");

-

-		if (oldValue instanceof EObject && eStructuralFeature instanceof EReference && ((EReference)eStructuralFeature).isContainment()) {

-			cc.append(DeleteCommand.create(domain, (EObject)oldValue));

-		}

-

-		cc.append(new SetCommand(domain, eObject, eStructuralFeature, value));

-

-		return cc;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/dialog/CommandCreationProgressMonitorDialog.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/dialog/CommandCreationProgressMonitorDialog.java
deleted file mode 100644
index be0fbe08ce4..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/dialog/CommandCreationProgressMonitorDialog.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.dialog;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.swt.widgets.Shell;

-

-

-/**

- * 

- * This dialog allows to create a command using a progress bar dialog

- * Typical usage is:

- * 

- * <pre>

- * CreationCommandProgressMonitorDialog commandCreationDialog = new CreationCommandProgressMonitorDialog(Display.getShell());

- * 

- * try {

- * 		commandCreationDialog.run(true, true, new IRunnableWithProgress() {

- * 

- * 			public void run(final IProgressMonitor cancelProvider) throws InvocationTargetException, InterruptedException {

- * 				final Command cmd = commandProvider.getCommand();

- * 				commandCreationDialog.setCreatedCommand(cmd);

- * 			}

- * 		});

- * } catch (final InvocationTargetException e) {

- * 		Activator.log.error(e);

- * } catch (final InterruptedException e) {

- * 		Activator.log.error(e);

- * }

- * final int returnCode = commandCreationDialog.getReturnCode();

- * if(returnCode == Window.OK) {

- * final Command createdCommand = commandCreationDialog.getCreatedCommand();

- * ...

- * }

- * </pre>

- */

-public class CommandCreationProgressMonitorDialog extends ProgressMonitorDialog {

-

-	/** the created command */

-	private Command createdCommand = null;

-

-	/** an exception threw by the command creation */

-	private Exception exception;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param parent

-	 */

-	public CommandCreationProgressMonitorDialog(final Shell parent) {

-		super(parent);

-

-	}

-

-	/**

-	 * Setter for {@link #createdCommand}

-	 * 

-	 * @param cmd

-	 *        the created command

-	 */

-	public void setCreatedCommand(final Command cmd) {

-		this.createdCommand = cmd;

-	}

-

-	/**

-	 * Getter for {@link #createdCommand}

-	 * 

-	 * @return

-	 *         the created command

-	 */

-	public Command getCreatedCommand() {

-		return this.createdCommand;

-	}

-

-	public void setCaughtException(final Exception e) {

-		this.exception = e;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the exception throwed by the command creation

-	 */

-	public Exception getCaughtException() {

-		return this.exception;

-	}

-

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/Messages.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/Messages.java
deleted file mode 100644
index 04d8fa9b5a0..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/Messages.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.papyrus.infra.emf.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-

-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.emf.messages.messages"; //$NON-NLS-1$

-

-	public static String UnsetCommand_UnsetCommand;

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/messages.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/messages.properties
deleted file mode 100644
index b5119e19f07..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/messages/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-UnsetCommand_UnsetCommand=Unset Command

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/AnyTypeLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/AnyTypeLabelProvider.java
deleted file mode 100644
index 4e1203a22e1..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/AnyTypeLabelProvider.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:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.providers;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.xml.type.AnyType;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.ui.ISharedImages;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * A LabelProvider for unresolved "AnyType" elements

- * 

- * @author Camille Letavernier

- * 

- */

-public class AnyTypeLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {

-

-	@Override

-	public String getText(Object element) {

-		EObject eObject = EMFHelper.getEObject(element);

-

-		if(!(eObject instanceof AnyType)) {

-			return super.getText(element);

-		}

-

-		AnyType anyType = (AnyType)eObject;

-		EClass eClass = anyType.eClass();

-		if(eClass != null) {

-			return "Missing " + eClass.getName();

-		} else {

-			return "Missing component";

-		}

-	}

-

-	@Override

-	public Image getImage(Object element) {

-		EObject eObject = EMFHelper.getEObject(element);

-		if(!(eObject instanceof AnyType)) {

-			return super.getImage(element);

-		}

-

-		return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);

-	}

-

-	public boolean accept(Object element) {

-		return EMFHelper.getEObject(element) instanceof AnyType;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFContentProvider.java
deleted file mode 100644
index b03ffe1f2f2..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFContentProvider.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.emf.providers;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.papyrus.infra.emf.providers.strategy.ContainmentBrowseStrategy;

-import org.eclipse.papyrus.infra.emf.providers.strategy.SemanticEMFContentProvider;

-import org.eclipse.papyrus.infra.emf.utils.HistoryUtil;

-import org.eclipse.papyrus.infra.widgets.providers.EmptyContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

-import org.eclipse.papyrus.infra.widgets.strategy.IStrategyBasedContentProvider;

-import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;

-import org.eclipse.papyrus.infra.widgets.strategy.StrategyBasedContentProvider;

-import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;

-

-/**

- * A global Content provider for EMF

- * 

- * @author Camille Letavernier

- */

-public class EMFContentProvider extends EncapsulatedContentProvider {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param feature

-	 *        The feature representing the reference for which we want to retrieve possible values

-	 * @param eObject

-	 */

-	public EMFContentProvider(EObject editedEObject, EStructuralFeature feature) {

-		IStructuredContentProvider provider = getSemanticProvider(editedEObject, feature);

-

-		encapsulated = encapsulateProvider(provider, editedEObject, feature);

-	}

-

-	/**

-	 * Returns the content provider associated to feature being edited

-	 * 

-	 * @param editedEObject

-	 *        The object being edited

-	 * @param feature

-	 *        The object's feature being edited

-	 * @return

-	 *         A content provider returning all the values valid for the given feature

-	 */

-	protected IStructuredContentProvider getSemanticProvider(EObject editedEObject, EStructuralFeature feature) {

-		EClassifier type = feature.getEType();

-		if(type instanceof EEnum) {

-			return new EMFEnumeratorContentProvider(feature);

-		} else if(type instanceof EClass) {

-			return new SemanticEMFContentProvider(editedEObject, feature);

-		}

-

-		return EmptyContentProvider.instance;

-	}

-

-	/**

-	 * Encapsulates the given content provider in a higher-level content provider

-	 * The returned provider uses two different strategies to display and search

-	 * elements, and adds a pattern filter and an History

-	 * 

-	 * @param provider

-	 *        The ContentProvider to encapsulate

-	 * @return

-	 */

-	protected EMFGraphicalContentProvider encapsulateProvider(IStructuredContentProvider provider, EObject editedEObject, EStructuralFeature feature) {

-		String historyId = HistoryUtil.getHistoryID(editedEObject, feature);

-

-		IStructuredContentProvider contentProvider;

-

-		if(provider instanceof ITreeContentProvider) {

-			contentProvider = getStrategyProvider((ITreeContentProvider)provider);

-		} else {

-			contentProvider = provider;

-		}

-

-		ResourceSet rs = editedEObject == null ? null : editedEObject.eResource() == null ? null : editedEObject.eResource().getResourceSet();

-		EMFGraphicalContentProvider graphicalProvider = new EMFGraphicalContentProvider(contentProvider, rs, historyId);

-

-		return graphicalProvider;

-	}

-

-	protected IStrategyBasedContentProvider getStrategyProvider(ITreeContentProvider provider) {

-		TreeBrowseStrategy browseStrategy = new ProviderBasedBrowseStrategy(provider);

-		TreeBrowseStrategy revealStrategy = new ContainmentBrowseStrategy(provider);

-

-		return new StrategyBasedContentProvider(browseStrategy, revealStrategy);

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFEnumeratorContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFEnumeratorContentProvider.java
deleted file mode 100644
index a4d5f0c9d1d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFEnumeratorContentProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.providers;

-

-import org.eclipse.emf.common.util.Enumerator;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EEnumLiteral;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.widgets.providers.AbstractStaticContentProvider;

-

-/**

- * An IStaticContentProvider for EMF enumerators.

- * 

- * @author Camille Letavernier

- */

-public class EMFEnumeratorContentProvider extends AbstractStaticContentProvider {

-

-	/**

-	 * The feature representing the Enumerator for this ContentProvider

-	 */

-	protected EStructuralFeature feature;

-

-	/**

-	 * Constructs an EcoreEnumerator for the given Structural Feature

-	 * 

-	 * @param feature

-	 */

-	public EMFEnumeratorContentProvider(EStructuralFeature feature) {

-		this.feature = feature;

-	}

-

-	public Object[] getElements() {

-		EClassifier type = feature.getEType();

-		EEnum enumerated = (EEnum)type;

-		EEnumLiteral[] literals = enumerated.getELiterals().toArray(new EEnumLiteral[0]);

-		Enumerator[] values = new Enumerator[literals.length];

-

-		int i = 0;

-		for(EEnumLiteral literal : literals) {

-			Enumerator value = literal.getInstance();

-			values[i++] = value;

-		}

-

-		return values;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFFilteredLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFFilteredLabelProvider.java
deleted file mode 100644
index 4b8190009c1..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFFilteredLabelProvider.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.emf.providers;

-

-import java.util.Iterator;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;

-

-/**

- * A LabelProvider which only accepts EMF Objects (EObject, or objects which can be adapted to EObjects)

- * 

- * @author Camille Letavernier

- * 

- */

-public class EMFFilteredLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {

-

-	public boolean accept(IStructuredSelection selection) {

-		if(selection.isEmpty()) {

-			return false;

-		}

-

-		Iterator<?> iterator = selection.iterator();

-		while(iterator.hasNext()) {

-			Object element = iterator.next();

-			if(!accept(element)) {

-				return false;

-			}

-		}

-

-		return true;

-	}

-

-	public boolean accept(Object element) {

-		if(element instanceof IStructuredSelection) {

-			return accept((IStructuredSelection)element);

-		}

-

-		//The element is an EObject or can be adapted to an EObject

-		return EMFHelper.getEObject(element) != null;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFGraphicalContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFGraphicalContentProvider.java
deleted file mode 100644
index 16cc0586c3a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFGraphicalContentProvider.java
+++ /dev/null
@@ -1,482 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Added graphic contributions for the filters

- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial History implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - History integration

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.providers;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Iterator;

-import java.util.LinkedHashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.jface.dialogs.IDialogSettings;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.jface.viewers.ViewerFilter;

-import org.eclipse.papyrus.infra.emf.Activator;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IDetailLabelProvider;

-import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

-import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

-import org.eclipse.papyrus.infra.widgets.editors.StringEditor;

-import org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.EncapsulatedContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.PatternViewerFilter;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CLabel;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Group;

-import org.eclipse.swt.widgets.Table;

-

-/**

- * This providers adds a text-filter and an History to EMF-based content providers

- */

-//TODO : Extend (Abstract)FilteredContentProvider

-public class EMFGraphicalContentProvider extends EncapsulatedContentProvider implements ISelectionChangedListener {

-

-	private static final String DIALOG_SETTINGS = EMFGraphicalContentProvider.class.getName();

-

-	protected String historyId;

-

-	//Unused (yet)

-	//TODO : Add a preference or a collapsible composite for this feature (Or both)

-	//

-	//	/**

-	//	 * The current metaclass viewer filter

-	//	 */ 

-	//	protected ViewerFilter currentMetaclassViewerFilter;

-

-	protected ViewerFilter patternFilter;

-

-	private static final String HISTORY_SETTINGS = "History"; //$NON-NLS-1$

-

-	private static final String PREVIOUS_SELECTION = "PreviousSelection";

-

-	protected List<EObject> selectionHistory;

-

-	protected CLabel detailLabel;

-

-	protected Object selectedObject;

-

-	protected StructuredViewer viewer;

-

-	protected ResourceSet resourceSet;

-

-	private static final int HISTORY_MAX_SIZE = 5;

-

-	private String currentFilterPattern;

-

-	private TableViewer historyViewer;

-

-	/**

-	 * the wanted root of the contentprovider

-	 */

-

-	/**

-	 * the constructor

-	 */

-	public EMFGraphicalContentProvider(IStructuredContentProvider semanticProvider, ResourceSet resourceSet, String historyId) {

-		super(semanticProvider);

-		this.historyId = historyId;

-		this.resourceSet = resourceSet;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void createBefore(Composite parent) {

-		createPatternFilter(parent);

-	}

-

-	protected void createPatternFilter(Composite parent) {

-		StringEditor editor = new StringEditor(parent, SWT.NONE);

-		editor.setLabel("Filter:");

-		editor.setToolTipText("Enter the name of the element you're looking for. You can use * as a wildcard");

-		editor.setValidateOnDelay(true);

-		patternFilter = new PatternViewerFilter();

-		currentFilterPattern = ""; //$NON-NLS-1$

-		((PatternViewerFilter)patternFilter).setPattern(currentFilterPattern);

-

-		editor.addCommitListener(new ICommitListener() {

-

-			public void commit(AbstractEditor editor) {

-				String filterPattern = (String)((StringEditor)editor).getValue();

-				((PatternViewerFilter)patternFilter).setPattern(filterPattern);

-				viewer.refresh();

-				if(!("".equals(filterPattern) || currentFilterPattern.equals(filterPattern))) {

-

-					//FIXME: The reveal first match algorithm is not compatible with infinite trees and had bad performances

-					//Object firstMatch = getFirstMatchingElement(null);

-					//if(firstMatch != null) {

-					//		revealSemanticElement(Collections.singletonList(firstMatch));

-					//}

-

-					currentFilterPattern = filterPattern;

-				}

-			}

-

-		});

-

-		List<ViewerFilter> filters = new LinkedList<ViewerFilter>(Arrays.asList(viewer.getFilters()));

-		filters.add(patternFilter);

-		viewer.setFilters(filters.toArray(new ViewerFilter[filters.size()]));

-	}

-

-	/**

-	 * Returns the first (encapsulated) element matching the current filters

-	 * 

-	 * @return

-	 */

-	protected Object getFirstMatchingElement(Object parent) {

-		//Browse from the root element

-		if(parent == null) {

-			for(Object parentElement : getElements(viewer.getInput())) {

-				Object firstMatch = getFirstMatchingElement(parentElement);

-				if(firstMatch != null) {

-					return firstMatch;

-				}

-			}

-			return null;

-		}

-

-		for(ViewerFilter filter : viewer.getFilters()) {

-			if(!filter.select(viewer, getParent(parent), parent)) {

-				return null;

-			}

-		}

-

-		//Test the current element

-		if(isValidValue(parent)) {

-			return parent;

-		}

-

-		//Browse the child elements

-		for(Object childElement : getChildren(parent)) {

-			Object firstMatch = getFirstMatchingElement(childElement);

-			if(firstMatch != null) {

-				return firstMatch;

-			}

-		}

-

-		//No match found

-		return null;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void createAfter(Composite parent) {

-		parent.setLayout(new GridLayout(1, false));

-		//		createMetaclassFilter(parent); //Disabled

-		createHistory(parent);

-		createDetailArea(parent);

-	}

-

-	/**

-	 * Creates a widget referencing the recently selected elements

-	 * 

-	 * @param parent

-	 *        The composite in which the widget will be created

-	 */

-	protected void createHistory(Composite parent) {

-		initSelectionHistory();

-

-		Group historyGroup = new Group(parent, SWT.NONE);

-		historyGroup.setText("Recent selections");

-		historyGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));

-		historyGroup.setLayout(new GridLayout(1, true));

-

-		// table

-		Table historyTable = new Table(historyGroup, SWT.BORDER | SWT.SINGLE);

-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, false);

-		data.heightHint = 70;

-		historyTable.setLayoutData(data);

-		historyViewer = new TableViewer(historyTable);

-		historyViewer.setContentProvider(CollectionContentProvider.instance);

-		historyViewer.setLabelProvider(viewer.getLabelProvider());

-		historyViewer.setInput(selectionHistory);

-		historyViewer.addSelectionChangedListener(new ISelectionChangedListener() {

-

-			/**

-			 * {@inheritDoc}

-			 */

-			public void selectionChanged(SelectionChangedEvent event) {

-				IStructuredSelection selection = (IStructuredSelection)historyViewer.getSelection();

-				Object selectedObject = selection.getFirstElement();

-				if(selectedObject instanceof EObject) {

-					EObject eObject = ((EObject)selectedObject);

-					revealSemanticElement(Collections.singletonList(eObject));

-				}

-			}

-		});

-	}

-

-	/**

-	 * Inits the History

-	 */

-	protected void initSelectionHistory() {

-		selectionHistory = new ArrayList<EObject>(HISTORY_MAX_SIZE + 1);

-

-		IDialogSettings historySettings = getDialogSettings().getSection(HISTORY_SETTINGS);

-		if(historySettings != null && resourceSet != null) {

-			String[] uriHistory = historySettings.getArray(PREVIOUS_SELECTION);

-			// for each element in the list, try to get the EObject by its URI

-			if(uriHistory != null) {

-				for(String uri : uriHistory) {

-					try {

-						EObject object = resourceSet.getEObject(URI.createURI(uri), true);

-						if(object != null && !selectionHistory.contains(object)) {

-							selectionHistory.add(object);

-						}

-					} catch (Exception ex) {

-						//Ignore : if the resource doesn't exist anymore, we just skip it

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * Creates a widget to filter the tree according to the selected

-	 * metaclass.

-	 * 

-	 * @param parent

-	 *        The Composite in which the widgets will be created

-	 * @deprecated

-	 */

-	@Deprecated

-	protected void createMetaclassFilter(Composite parent) {

-		//		if(semanticRoot == null) {

-		//			return;

-		//		}

-		//

-		//		Composite container = new Composite(parent, SWT.NONE);

-		//		container.setLayout(new GridLayout(2, false));

-		//		container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

-		//

-		//		ResourceSet resourceSet = semanticRoot.eResource().getResourceSet();

-		//		EcoreUtil.resolveAll(resourceSet);

-		//

-		//		Label metamodelLabel = new Label(container, SWT.NONE);

-		//		metamodelLabel.setText("Metamodel:");

-		//

-		//		ComboViewer metamodelViewer = new ComboViewer(container);

-		//		metamodelViewer.setContentProvider(getMetamodelContentProvider());

-		//		metamodelViewer.setLabelProvider(new EMFLabelProvider());

-		//		metamodelViewer.setInput(semanticRoot);

-		//		metamodelViewer.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

-		//

-		//		Label metaclassLabel = new Label(container, SWT.NONE);

-		//		metaclassLabel.setText("Metaclass:");

-		//

-		//		final ComboViewer metaclassViewer = new ComboViewer(container);

-		//		IStructuredContentProvider metaclassProvider = getMetaclassContentProvider();

-		//		metaclassViewer.setContentProvider(metaclassProvider);

-		//		metaclassViewer.setLabelProvider(new EMFLabelProvider());

-		//		metaclassViewer.getCombo().setEnabled(false);

-		//		metaclassViewer.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

-		//

-		//		metamodelViewer.setFilters(new ViewerFilter[]{ new MetamodelContentFilter(metaclassProvider) });

-		//

-		//		metamodelViewer.addSelectionChangedListener(new ISelectionChangedListener() {

-		//

-		//			public void selectionChanged(SelectionChangedEvent event) {

-		//				metaclassViewer.setInput(((IStructuredSelection)event.getSelection()).getFirstElement());

-		//				metaclassViewer.getCombo().setEnabled(true);

-		//			}

-		//		});

-		//

-		//		metaclassViewer.addSelectionChangedListener(new ISelectionChangedListener() {

-		//

-		//			public void selectionChanged(SelectionChangedEvent event) {

-		//				if(!event.getSelection().isEmpty()) {

-		//					Object selectedObject = ((IStructuredSelection)event.getSelection()).getFirstElement();

-		//					List<ViewerFilter> filters = new LinkedList<ViewerFilter>(Arrays.asList(viewer.getFilters()));

-		//					filters.remove(currentMetaclassViewerFilter);

-		//					currentMetaclassViewerFilter = getMetaclassViewerFilter(selectedObject);

-		//					filters.add(currentMetaclassViewerFilter);

-		//					viewer.setFilters(filters.toArray(new ViewerFilter[filters.size()]));

-		//					viewer.refresh();

-		//				}

-		//			}

-		//		});

-	}

-

-	/**

-	 * Creates a label widget to display detailed information on the

-	 * current value (Such as fully qualified name, ...)

-	 * 

-	 * @param parent

-	 *        The composite in which the widget will be created

-	 */

-	protected void createDetailArea(Composite parent) {

-		detailLabel = new CLabel(parent, SWT.BORDER);

-		detailLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

-		updateDetailLabel();

-	}

-

-	//	@Deprecated

-	//	protected IStructuredContentProvider getMetamodelContentProvider() {

-	//		return new MetamodelContentProvider();

-	//	}

-	//

-	//	@Deprecated

-	//	protected IStructuredContentProvider getMetaclassContentProvider() {

-	//		return new MetaclassContentProvider((EClass)this.metaClassWanted, this.metaClassNotWantedList);

-	//	}

-	//

-	//	@Deprecated

-	//	protected ILabelProvider getLabelProvider() {

-	//		return new EMFObjectLabelProvider();

-	//	}

-	//

-	//	@Deprecated

-	//	protected ViewerFilter getMetaclassViewerFilter(Object selectedMetaClass) {

-	//		return new MetaclassViewerFilter(selectedMetaClass);

-	//	}

-

-	/**

-	 * Returns the dialog settings. Returned object can't be null.

-	 * 

-	 * @return dialog settings for this dialog

-	 */

-	protected IDialogSettings getDialogSettings() {

-		IDialogSettings settings = Activator.getDefault().getDialogSettings().getSection(getDialogSettingsIdentifier());

-		if(settings == null) {

-			settings = Activator.getDefault().getDialogSettings().addNewSection(getDialogSettingsIdentifier());

-		}

-		return settings;

-	}

-

-	private String getDialogSettingsIdentifier() {

-		return DIALOG_SETTINGS + "_" + historyId;

-	}

-

-	/**

-	 * Stores dialog settings.

-	 * 

-	 * @param settings

-	 *        settings used to store dialog

-	 */

-	protected void storeDialog(IDialogSettings settings, Collection<EObject> newValues) {

-		selectionHistory.removeAll(newValues);

-

-		selectionHistory.addAll(0, newValues);

-

-		//Truncate the history: only keep a sublist of size HISTORY_MAX_SIZE

-		if(selectionHistory.size() > HISTORY_MAX_SIZE) {

-			selectionHistory = selectionHistory.subList(0, HISTORY_MAX_SIZE);

-		}

-

-		List<String> uriList = new ArrayList<String>();

-

-		// convert list of EObject into URI string list

-		for(EObject object : selectionHistory) {

-			URI uri = EcoreUtil.getURI(object);

-			uriList.add(uri.toString());

-		}

-

-		IDialogSettings historySettings = settings.getSection(HISTORY_SETTINGS);

-		if(historySettings == null) {

-			historySettings = settings.addNewSection(HISTORY_SETTINGS);

-		}

-		historySettings.put(PREVIOUS_SELECTION, uriList.toArray(new String[uriList.size()]));

-

-		historyViewer.setInput(selectionHistory);

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		encapsulated.inputChanged(viewer, oldInput, newInput);

-

-		if(viewer instanceof StructuredViewer) {

-			this.viewer = (StructuredViewer)viewer;

-			if(newInput != null && viewer.getControl() != null && !viewer.getControl().isDisposed()) {

-				this.viewer.addSelectionChangedListener(this);

-			}

-		} else {

-			this.viewer = null;

-		}

-	}

-

-	public void selectionChanged(SelectionChangedEvent event) {

-		selectedObject = ((IStructuredSelection)event.getSelection()).getFirstElement();

-		updateDetailLabel();

-	}

-

-	private void updateDetailLabel() {

-		if(detailLabel == null || detailLabel.isDisposed()) {

-			return;

-		}

-		if(selectedObject == null) {

-			detailLabel.setText("");

-			detailLabel.setImage(null);

-		} else {

-			ILabelProvider labelProvider = (ILabelProvider)viewer.getLabelProvider();

-			String description;

-			if(labelProvider instanceof IDetailLabelProvider) {

-				description = ((IDetailLabelProvider)labelProvider).getDetail(selectedObject);

-			} else {

-				description = labelProvider.getText(selectedObject);

-			}

-			detailLabel.setText(description);

-			detailLabel.setImage(labelProvider.getImage(selectedObject));

-		}

-		detailLabel.getParent().getParent().layout();

-	}

-

-	@Override

-	public void commit(AbstractEditor editor) {

-		Iterator<?> selectionIterator = ((IStructuredSelection)viewer.getSelection()).iterator();

-		Set<EObject> eObjectsToStore = new LinkedHashSet<EObject>();

-		while(selectionIterator.hasNext()) {

-			Object selectedElement = selectionIterator.next();

-			if(isValidValue(selectedElement)) {

-				Object semanticObject = getAdaptedValue(selectedElement);

-				if(semanticObject instanceof EObject) {

-					eObjectsToStore.add((EObject)semanticObject);

-				}

-			}

-		}

-

-		if(!eObjectsToStore.isEmpty()) {

-			storeDialog(getDialogSettings(), eObjectsToStore);

-		}

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-		viewer.removeSelectionChangedListener(this);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFLabelProvider.java
deleted file mode 100644
index e91126d9a5c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFLabelProvider.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.emf.providers;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelLabelProvider;

-import org.eclipse.emf.facet.infra.browser.uicore.internal.model.ITreeElement;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.emf.Activator;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IDetailLabelProvider;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IQualifierLabelProvider;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * This class handles labels for EMF Objects

- * The class can handle the following cases :

- * - An EObject (Which can be resolved with {@link EMFHelper#getEObject(Object)})

- * - A IStructuredSelection containing EObject(s)

- * 

- * @author Camille Letavernier

- */

-public class EMFLabelProvider extends CustomizableModelLabelProvider implements IDetailLabelProvider, IQualifierLabelProvider {

-

-	/** the max number of displayed element */

-	public static final int MAX_ELEMENT = 2;

-

-	protected ILabelProvider baseEMFLabelProvider;

-

-	/**

-	 * Creates a new EMFObjectLabelProvider.

-	 */

-	public EMFLabelProvider() {

-		super(Activator.getDefault().getCustomizationManager()); //Note: CustomizableModelLabelProvider doesn't use the CustomizationManager. It relies on the content provider's CustomizationManager

-		baseEMFLabelProvider = new StandardEMFLabelProvider();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getText(Object element) {

-		if(element == null) {

-			return ""; //$NON-NLS-1$

-		}

-

-		if(element instanceof ITreeElement) {

-			return super.getText(element);

-		}

-

-		EObject eObject = EMFHelper.getEObject(element);

-		if(eObject != null) {

-			return getText(eObject);

-		}

-

-		if(element instanceof IStructuredSelection) {

-			return getText((IStructuredSelection)element);

-		}

-

-		return element.toString();

-	}

-

-	protected String getText(EObject element) {

-		return baseEMFLabelProvider.getText(element);

-	}

-

-	protected String getText(IStructuredSelection selection) {

-		final int selectionSize = selection.size();

-		int managedSize = selectionSize;

-		if(selectionSize > MAX_ELEMENT) {

-			managedSize = MAX_ELEMENT;

-		}

-		if(selection.isEmpty()) {

-			return ""; //$NON-NLS-1$

-		}

-

-		if(managedSize == 1) {

-			return getText(selection.getFirstElement());

-		} else {

-			final List<Object> selectionAsList = selection.toList();

-			String str = "";

-			for(int i = 0; i < managedSize; i++) {

-				final String txt = getText(selectionAsList.get(i));

-				if(txt != null) {

-					str += txt;

-				}

-				if(i < managedSize - 1) {

-					str += ", ";

-				}

-			}

-			if(selectionSize > managedSize) {

-				str += "  +  " + (selectionSize - managedSize) + " others elements.";

-			}

-			return str;

-		}

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Image getImage(Object element) {

-		if(element instanceof ITreeElement) {

-			return super.getImage(element);

-		}

-

-		EObject eObject = EMFHelper.getEObject(element);

-		if(eObject != null) {

-			return getImage(eObject);

-		}

-

-		if(element instanceof IStructuredSelection) {

-			return getImage((IStructuredSelection)element);

-		}

-

-		return null;

-	}

-

-	protected Image getImage(EObject eObject) {

-		return baseEMFLabelProvider.getImage(eObject);

-	}

-

-	protected Image getImage(IStructuredSelection selection) {

-		int selectionSize = selection.size();

-		int managedSize = selectionSize;

-		if(selectionSize > MAX_ELEMENT) {

-			managedSize = MAX_ELEMENT;

-		}

-

-

-		if(selection.isEmpty()) {

-			return null;

-		} else if(selection.size() == 1) {

-			return getImage(selection.getFirstElement());

-		}

-

-		final List<?> selectionAsList = selection.toList();

-		final Set<EObject> selectedEObject = new HashSet<EObject>();

-		boolean isEObjectSelection = true;

-		for(int i = 0; i < managedSize; i++) {

-			final EObject obj = EMFHelper.getEObject(selectionAsList.get(i));

-			if(obj != null) {

-				selectedEObject.add(obj);

-			} else {

-				isEObjectSelection = false;

-			}

-		}

-		//selected object is a set, so the size can be lowest that the initial size

-		selectionSize = selectedEObject.size();

-		if(selectionSize > MAX_ELEMENT) {

-			managedSize = MAX_ELEMENT;

-		}

-		if(isEObjectSelection) {//all selected elements are EObject

-			if(managedSize == 1 || hasCommonImage(selectedEObject)) {

-				return getImage(selectedEObject.toArray()[0]);

-			} else {

-				final EClass common = org.eclipse.emf.facet.util.emf.core.internal.EMFUtils.computeLeastCommonSupertype(getEClasses(selectedEObject));

-				if(!common.isAbstract()) {

-					//FIXME : the label provider service should manage this case

-					final Object instance = common.getEPackage().getEFactoryInstance().create(common);

-					return getNonCommonIcon(instance);

-				}

-			}

-		} else if(selectedEObject.size() == 0) {

-			//the multiple selection contains any EObject 

-		} else {

-			//the selection contains EObject and others elements

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @param objects

-	 *        a collection of objects

-	 * @return

-	 *         <code>true</code> if the image found for each object is the same <code>false</code> of if the collection is empty or the image returned

-	 *         for each object is not the same

-	 */

-	protected boolean hasCommonImage(final Collection<?> objects) {

-		if(objects.size() > MAX_ELEMENT) {

-			return false;

-		}

-		if(!objects.isEmpty()) {

-			final Image lastImage = getImage(objects.toArray()[0]);

-			for(final Object current : objects) {

-				if(lastImage != getImage(current)) {

-					return false;

-				}

-			}

-		} else {

-			return false;

-		}

-		return true;

-	}

-

-	/**

-	 * 

-	 * @param commonEClass

-	 *        the eClass

-	 * @return

-	 *         the icon to use for this eclass

-	 */

-	protected Image getNonCommonIcon(final Object commonObject) {

-		return getImage(commonObject);

-	}

-

-	/**

-	 * 

-	 * @param objects

-	 *        a collection of eobject

-	 * @return

-	 *         the set of eclasses for the parameter objects

-	 */

-	private Set<EClass> getEClasses(final Collection<EObject> objects) {

-		final Set<EClass> eclasses = new HashSet<EClass>();

-		for(final EObject current : objects) {

-			eclasses.add(current.eClass());

-		}

-		return eclasses;

-	}

-

-	public String getDetail(Object object) {

-		object = EMFHelper.getEObject(object);

-		return getText(object) + " - " + getQualifiedClassName(object); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the qualified Class name of the given EObject, or an

-	 * empty String if the object is not an EObject

-	 * 

-	 * @param object

-	 * @return The qualified name of this object's class, or an empty

-	 *         String if the object is not an EObject

-	 */

-	protected String getQualifiedClassName(Object object) {

-		if(object instanceof EObject) {

-			EObject eObject = (EObject)object;

-			EClass eClass = eObject.eClass();

-			return EMFHelper.getQualifiedName(eClass, "::"); //$NON-NLS-1$

-		}

-		return ""; //$NON-NLS-1$

-	}

-

-	

-

-	public String getQualifierText(Object element) {

-		String result = null;

-

-		EObject parent = getParentObject(element);

-		if(parent != null) {

-			result = getQualifiedText(parent);

-		}

-

-		return result;

-	}

-

-	private EObject getParentObject(Object element) {

-		EObject result = null;

-

-		if(element != null) {

-			EObject eObject = EMFHelper.getEObject(element);

-			if(eObject != null) {

-				result = getParent(eObject);

-			}

-		}

-

-		return result;

-	}

-

-	public Image getQualifierImage(Object element) {

-		Image result = null;

-

-		EObject parent = getParentObject(element);

-		if(parent != null) {

-			result = getImage(parent);

-		}

-

-		return result;

-	}

-

-	protected EObject getParent(EObject object) {

-		return object.eContainer();

-	}

-

-	protected String getQualifiedText(EObject object) {

-		StringBuilder result = new StringBuilder();

-

-		appendQualifiedText(object, result);

-

-		return result.toString();

-	}

-

-	protected void appendQualifiedText(EObject object, StringBuilder buf) {

-		EObject parent = getParent(object);

-		if(parent != null) {

-			appendQualifiedText(parent, buf);

-		}

-

-		if(buf.length() > 0) {

-			buf.append("::");

-		}

-

-		String name = getText(object);

-		if(name == null) {

-			name = String.format("<%s>", object.eClass().getName());

-		}

-		buf.append(name);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/HistoryContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/HistoryContentProvider.java
deleted file mode 100644
index 1dee49a7a56..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/HistoryContentProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.emf.providers;

-

-import java.util.List;

-

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-

-/**

- * Content provider for the history table

- * 

- * @deprecated Use the generic {@link org.eclipse.papyrus.infra.widgets.providers.CollectionContentProvider#instance} instead

- */

-@Deprecated

-public class HistoryContentProvider implements IStructuredContentProvider {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void dispose() {

-		// nothing here

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		// nothing here

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object[] getElements(Object inputElement) {

-		if(inputElement instanceof List<?>) {

-			return ((List<?>)inputElement).toArray();

-		}

-		return new Object[0];

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/MoDiscoContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/MoDiscoContentProvider.java
deleted file mode 100644
index de352fc6f25..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/MoDiscoContentProvider.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 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) - initial API and implementation

- *******************************************************************************/

-package org.eclipse.papyrus.infra.emf.providers;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelContentProvider;

-import org.eclipse.papyrus.infra.core.resource.AbstractBaseModel;

-import org.eclipse.papyrus.infra.core.resource.IModel;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.ModelUtils;

-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.emf.Activator;

-

-/**

- * the content provider that inherits of modisco properties

- * 

- * @deprecated Use SemanticUMLContentProvider instead

- */

-@Deprecated

-public class MoDiscoContentProvider extends CustomizableModelContentProvider {

-

-	/** The ModelSet containing all the models. This is the initial input. */

-	protected ModelSet modelSet;

-

-	/** The list of open pages (diagrams) */

-	protected IPageManager pageMngr;

-

-	/**

-	 * Creates a new MoDiscoContentProvider.

-	 */

-	public MoDiscoContentProvider() {

-		super(Activator.getDefault().getCustomizationManager());

-	}

-

-	@Override

-	public boolean hasChildren(Object element) {

-		return getChildren(element).length > 0;

-	}

-

-	@Override

-	public Object[] getChildren(final Object parentElement) {

-		Object[] children = super.getChildren(parentElement);

-		if(children == null) {

-			return new Object[0];

-		}

-		return children;

-	}

-

-	/**

-	 * Return the initial values from the input.

-	 * Input should be of type {@link UmlModel}.

-	 * 

-	 * @see org.eclipse.gmt.modisco.infra.browser.uicore.CustomizableModelContentProvider#getRootElements(java.lang.Object)

-	 * 

-	 * @param inputElement

-	 * @return

-	 */

-	@Override

-	public EObject[] getRootElements(Object inputElement) {

-

-		try {

-			if(!(inputElement instanceof ServicesRegistry)) {

-				return null;

-			}

-

-			ServicesRegistry servicesRegistry = (ServicesRegistry)inputElement;

-

-			modelSet = ModelUtils.getModelSetChecked(servicesRegistry);

-			pageMngr = servicesRegistry.getService(IPageManager.class);

-

-			return getRootElements(modelSet);

-		} catch (Exception e) {

-			Activator.log.error(e);

-		}

-

-		return new EObject[0];

-	}

-

-	/**

-	 * Get the roots elements from the {@link ModelSet} provided as input.

-	 * 

-	 * @return

-	 */

-	protected EObject[] getRootElements(ModelSet modelSet) {

-		//FIXME: Refactoring. Workaround to remove the explicit dependency to UMLModel in uml.tools. We should not depend on UML at all.

-		IModel umlIModel = modelSet.getModel("org.eclipse.papyrus.infra.core.resource.uml.UmlModel");

-

-		AbstractBaseModel umlModel = null;

-		if(umlIModel instanceof AbstractBaseModel) {

-			umlModel = (AbstractBaseModel)umlIModel;

-		}

-

-		if(umlModel == null) {

-			return null;

-		}

-

-		EList<EObject> contents = umlModel.getResource().getContents();

-		ArrayList<EObject> result = new ArrayList<EObject>();

-		Iterator<EObject> iterator = contents.iterator();

-		while(iterator.hasNext()) {

-			EObject eObject = iterator.next();

-			result.add(eObject);

-		}

-		return result.toArray(new EObject[result.size()]);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/SemanticFromModelExplorer.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/SemanticFromModelExplorer.java
deleted file mode 100644
index 50698bb43ed..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/SemanticFromModelExplorer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.providers;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.papyrus.infra.core.IElementWithSemantic;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-

-/**

- * This class is used to obtain the semantic element for element of the model explorer

- */

-//FIXME: Remove the dependency to gmf

-public class SemanticFromModelExplorer implements IElementWithSemantic {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	public Object getSemanticElement(Object wrapper) {

-		EObject semantic = EMFHelper.getEObject(wrapper);

-		if(semantic != null) {

-			return semantic;

-		}

-

-		if(wrapper instanceof Diagram) {

-			return wrapper;

-		}

-

-		return null;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/StandardEMFLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/StandardEMFLabelProvider.java
deleted file mode 100644
index 51d5774252f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/StandardEMFLabelProvider.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- *     Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Added support for enum literals

- *     Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Implementation of IDetailLabelProvider

- *******************************************************************************/

-package org.eclipse.papyrus.infra.emf.providers;

-

-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.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.util.Enumerator;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.services.labelprovider.service.IDetailLabelProvider;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * This class handles labels for EMF Objects

- * The class can handle the following cases :

- * - An EObject (Which can be resolved with {@link EMFHelper#getEObject(Object)})

- * - A IStructuredSelection containing EObject(s)

- * 

- * @author Jerome Benois

- */

-public class StandardEMFLabelProvider extends AdapterFactoryLabelProvider implements IDetailLabelProvider {

-

-	/** item provider class */

-	private static final Class<?> IItemLabelProviderClass = IItemLabelProvider.class;

-

-	/** list of adapter factories, identified by their Ids */

-	private static Map<String, AdapterFactory> factories = new HashMap<String, AdapterFactory>();

-

-	/** emf item provider factories */

-	private static final String EXT_FACTORIES = "org.eclipse.emf.edit.itemProviderAdapterFactories"; //$NON-NLS-1$

-

-	/**

-	 * Creates a new EMFObjectLabelProvider.

-	 */

-	public StandardEMFLabelProvider() {

-		super(new ReflectiveItemProviderAdapterFactory());

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public String getText(Object element) {

-		EObject eObject = EMFHelper.getEObject(element);

-		if(eObject != null) {

-			return getText(eObject);

-		}

-

-		if(element instanceof IStructuredSelection) {

-			return getText((IStructuredSelection)element);

-		}

-

-		return super.getText(element);

-	}

-

-	protected String getText(EObject element) {

-		String title = ""; //$NON-NLS-1$

-		if(element instanceof Enumerator) {

-			return ((Enumerator)element).getName();

-		}

-		EObject eObject = EMFHelper.getEObject(element);

-		IItemLabelProvider itemLabelProvider = getItemLabelProvider(eObject);

-		if(itemLabelProvider != null) {

-			title = itemLabelProvider.getText(eObject);

-		}

-

-		if("".equals(title)) { //$NON-NLS-1$

-			title = super.getText(eObject);

-		}

-

-		return title;

-	}

-

-	protected String getText(IStructuredSelection selection) {

-		if(selection.isEmpty()) {

-			return ""; //$NON-NLS-1$

-		}

-

-		//TODO : Implement a multi-selection label, instead of just the first element's label

-		Object element = selection.getFirstElement();

-		return getText(element);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public Image getImage(Object element) {

-		EObject eObject = EMFHelper.getEObject(element);

-		if(eObject != null) {

-			return getImage(eObject);

-		}

-

-		if(element instanceof IStructuredSelection) {

-			return getImage((IStructuredSelection)element);

-		}

-

-		return super.getImage(element);

-	}

-

-	protected Image getImage(EObject eObject) {

-		Image result = null;

-		IItemLabelProvider itemLabelProvider = getItemLabelProvider(eObject);

-		if(itemLabelProvider != null) {

-			result = getImageFromObject(itemLabelProvider.getImage(eObject));

-		}

-

-		return result;

-	}

-

-	protected Image getImage(IStructuredSelection selection) {

-		if(selection.isEmpty()) {

-			return null;

-		}

-

-		//TODO : Implement a multi-selection label, instead of just the first element's label

-		Object element = selection.getFirstElement();

-		return getImage(element);

-	}

-

-	/**

-	 * Returns the item provider for the given object

-	 * 

-	 * @param eObject

-	 *        the object to display

-	 * @return the item label provider for the given eobject

-	 */

-	private IItemLabelProvider getItemLabelProvider(EObject eObject) {

-		IItemLabelProvider itemLabelProvider = null;

-		if(eObject != null) {

-			AdapterFactory adapterFactory = getEditFactory(eObject);

-			if(adapterFactory != null) {

-				return (IItemLabelProvider)adapterFactory.adapt(eObject, IItemLabelProviderClass);

-			}

-		}

-		return itemLabelProvider;

-	}

-

-	/**

-	 * Gets the edit factory.

-	 * 

-	 * @param eobject

-	 *        the eobject

-	 * 

-	 * @return the edits the factory

-	 */

-	public static AdapterFactory getEditFactory(EObject eobject) {

-		String uri = eobject.eClass().getEPackage().getNsURI();

-		return getFactory(uri);

-	}

-

-	/**

-	 * Gets the factory from uri.

-	 * 

-	 * @param uri

-	 *        the uri

-	 * 

-	 * @return the factory

-	 */

-	public static AdapterFactory getFactory(String uri) {

-		AdapterFactory factory = factories.get(uri);

-		if(factory == null) {

-			IConfigurationElement[] extensions = Platform.getExtensionRegistry().getConfigurationElementsFor(EXT_FACTORIES);

-			for(IConfigurationElement e : extensions) {

-				if(uri.equals(e.getAttribute("uri"))) { //$NON-NLS-1$

-					try {

-						factory = (AdapterFactory)e.createExecutableExtension("class"); //$NON-NLS-1$

-						if(factory != null) {

-							factories.put(uri, factory);

-						}

-					} catch (CoreException e1) {

-						// do nothing

-					}

-				}

-			}

-		}

-		return factory;

-	}

-

-	public String getDetail(Object object) {

-		object = EMFHelper.getEObject(object);

-		return getText(object) + " - " + getQualifiedClassName(object); //$NON-NLS-1$

-	}

-

-	/**

-	 * Returns the qualified Class name of the given EObject, or an

-	 * empty String if the object is not an EObject

-	 * 

-	 * @param object

-	 * @return The qualified name of this object's class, or an empty

-	 *         String if the object is not an EObject

-	 */

-	protected String getQualifiedClassName(Object object) {

-		if(object instanceof EObject) {

-			EObject eObject = (EObject)object;

-			EClass eClass = eObject.eClass();

-			return EMFHelper.getQualifiedName(eClass, "::"); //$NON-NLS-1$

-		}

-		return ""; //$NON-NLS-1$

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/ContainmentBrowseStrategy.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/ContainmentBrowseStrategy.java
deleted file mode 100644
index 889ca013750..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/ContainmentBrowseStrategy.java
+++ /dev/null
@@ -1,344 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.providers.strategy;

-

-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.facet.infra.facet.FacetReference;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider;

-import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;

-import org.eclipse.swt.widgets.TreeItem;

-

-/**

- * A TreeBrowseStrategy based on the semantic model.

- * It can also retrieve a semantic element in a MoDisco tree, when the tree structure is close

- * to the semantic one (With optional EReferences).

- * 

- * Container1::Container2::EObject1 can be retrieved in a Tree representing

- * Container1::(Reference1)::Container2::(Reference2)::EObject1

- * 

- * @author Camille Letavernier

- */

-public class ContainmentBrowseStrategy extends ProviderBasedBrowseStrategy {

-

-	protected IAdaptableContentProvider adaptableProvider;

-

-	protected TreeViewer viewer;

-

-	public ContainmentBrowseStrategy(ITreeContentProvider provider) {

-		if(!(provider instanceof IAdaptableContentProvider)) {

-			throw new IllegalArgumentException("The provider must be an IAdaptableContentProvider");

-		}

-

-		setProvider(provider);

-		this.adaptableProvider = (IAdaptableContentProvider)super.provider;

-	}

-

-	//

-	//	Elements filtering

-	//

-

-	@Override

-	protected boolean browseElement(Object containerElement) {

-		Object semanticElement = adaptableProvider.getAdaptedValue(containerElement);

-

-		//Only browse Containment references and Facet references

-		if(semanticElement instanceof EReference) {

-			if(semanticElement instanceof FacetReference) {

-				return true;

-			}

-

-			return ((EReference)semanticElement).isContainment() && !((EReference)semanticElement).isDerived();

-		}

-

-		return true;

-	}

-

-	//

-	//	Elements search

-	//

-

-	//	/**

-	//	 * {@inheritDoc}

-	//	 */

-	//	@Override

-	//	public TreePath findPath(Object semanticElement, Object[] rootElements) {

-	//		List<Object> semanticPath = new LinkedList<Object>();

-	//		findSemanticPath(semanticElement, semanticPath);

-	//		return searchPath(semanticPath, rootElements);

-	//	}

-

-	//	/**

-	//	 * Fills the semantic path to the given element

-	//	 * 

-	//	 * @param element

-	//	 *        The element to retrieve

-	//	 * @param currentPath

-	//	 *        The path to fill (in-out)

-	//	 */

-	//	protected void findSemanticPath(Object element, List<Object> currentPath) {

-	//		if(element != null && element instanceof EObject) {

-	//			findSemanticPath(getSemanticParent(element), currentPath);

-	//			currentPath.add(element);

-	//		}

-	//	}

-	//

-	//	protected Object getSemanticParent(Object element) {

-	//		if(element instanceof EObject) {

-	//			return ((EObject)element).eContainer();

-	//		}

-	//		return null;

-	//	}

-	//

-	//	/**

-	//	 * Retrieve the graphical TreePath from the given semantic path

-	//	 * 

-	//	 * @param semanticPath

-	//	 * @return

-	//	 */

-	//	protected TreePath searchPath(List<Object> semanticPath, Object input) {

-	//		List<Object> graphicalPath = new LinkedList<Object>();

-	//		Object[] graphicalRootObjects = (Object[])input;

-	//		if(!searchPath(semanticPath, graphicalPath, graphicalRootObjects)) {

-	//			//Object not found

-	//			graphicalPath.clear();

-	//		}

-	//

-	//		return new TreePath(graphicalPath.toArray());

-	//	}

-	//

-	//	protected boolean searchPath(List<Object> semanticPath, List<Object> graphicalPath, Object[] graphicalRootObjects) {

-	//		if(semanticPath.isEmpty()) {

-	//			return true;

-	//		}

-	//

-	//		if(graphicalRootObjects == null) {

-	//			return false;

-	//		}

-	//

-	//		Object currentElement = semanticPath.get(0);

-	//		for(Object graphicalElement : graphicalRootObjects) {

-	//			Object semanticValue = adaptableProvider.getAdaptedValue(graphicalElement);

-	//

-	//			//Specific case for containment EReference

-	//			if(semanticValue instanceof EReference) {

-	//				EReference referenceToBrowse = (EReference)semanticValue;

-	//				if(referenceToBrowse.isContainment()) {

-	//					graphicalPath.add(graphicalElement);

-	//

-	//					if(searchPath(semanticPath, graphicalPath, provider.getChildren(graphicalElement))) {

-	//						//The element has been found

-	//						return true;

-	//					}

-	//

-	//					//The element has not been found ; we revert the modifications

-	//					graphicalPath.remove(graphicalElement);

-	//				}

-	//			}

-	//

-	//			if(semanticValue == currentElement) {

-	//				semanticPath.remove(0);

-	//				graphicalPath.add(graphicalElement);

-	//				if(searchPath(semanticPath, graphicalPath, provider.getChildren(graphicalElement))) {

-	//					return true;

-	//				}

-	//			}

-	//		}

-	//

-	//		return false;

-	//	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		if(viewer instanceof TreeViewer) {

-			this.viewer = (TreeViewer)viewer;

-		}

-		super.inputChanged(viewer, oldInput, newInput);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void revealSemanticElement(List<?> elementList) {

-		//for each element we reveal it

-		Iterator<?> elementListIterator = elementList.iterator();

-		ArrayList<Object> treeElementToSelect = new ArrayList<Object>();

-		while(elementListIterator.hasNext()) {

-			Object currentElement = elementListIterator.next();

-			//test if the type is an EObject

-			if(currentElement instanceof EObject) {

-				EObject currentEObject = (EObject)currentElement;

-				//the content provider exist?

-				if(provider != null) {

-					//need the root in order to find all element in the tree

-					Object root = provider.getElements(null)[0];

-					//look for the path in order to access to this element

-					List<Object> path = searchPath(currentEObject, Arrays.asList(provider.getElements(root)));

-					if(path.size() > 0) {

-						//expand in the common viewer the path

-						expandItems(path, viewer.getTree().getItems());

-						treeElementToSelect.add(path.get(path.size() - 1));

-					}

-				}

-			}

-			selectReveal(new StructuredSelection(treeElementToSelect));

-		}

-	}

-

-	public void expandItems(List<Object> treeElementList, TreeItem[] list) {

-		//the treeElement has more tan one element

-		viewer.getTree().setRedraw(false);

-		if(treeElementList.size() > 0) {

-			for(int i = 0; i < list.length; i++) {

-				if(list[i].getData() != null && list[i].getData().equals(treeElementList.get(0))) {

-					if(treeElementList.size() > 1) {//Do no expand the last element

-						Object[] toexpand = { treeElementList.get(0) };

-						viewer.setExpandedElements(toexpand);

-					}

-					ArrayList<Object> tmpList = new ArrayList<Object>();

-					tmpList.addAll(treeElementList);

-					tmpList.remove(tmpList.get(0));

-					expandItems(tmpList, list[i].getItems());

-				}

-			}

-		}

-		viewer.getTree().setRedraw(true);

-	}

-

-	public void selectReveal(ISelection selection) {

-		if(viewer != null) {

-			viewer.setSelection(selection, true);

-		}

-	}

-

-	/**

-	 * Simple search, based on containment references

-	 * 

-	 * @param eobject

-	 * @param objects

-	 * @return

-	 */

-	protected List<Object> searchDirectContainmentPath(EObject eobject, List<Object> wrappedElements) {

-		List<Object> path = new ArrayList<Object>();

-

-		List<EObject> emfPath = EMFHelper.getContainmentPath(eobject);

-

-		for(Object wrappedElement : wrappedElements) {

-			EObject element = EMFHelper.getEObject(wrappedElement);

-

-			if(eobject.equals(element)) {

-				//We found the leaf element

-				return Collections.singletonList(wrappedElement);

-			}

-

-			if(browseElementForDirectContainment(emfPath, element)) {

-				List<Object> wrappedChildren = Arrays.asList(provider.getChildren(wrappedElement));

-				List<Object> childPath = searchDirectContainmentPath(eobject, wrappedChildren);

-				if(!childPath.isEmpty()) {

-					//We (indirectly) found the leaf element

-					path.add(wrappedElement);

-					path.addAll(childPath);

-					break;

-				}

-			} //Else: dead end

-		}

-

-		return path;

-	}

-

-	protected boolean browseElementForDirectContainment(List<EObject> emfPath, EObject element) {

-		if(emfPath.contains(element)) {

-			return true;

-		}

-

-		if(element instanceof EReference) {

-			EReference reference = (EReference)element;

-			if(reference.isContainment() && !reference.isDerived()) {

-				return true;

-			}

-		}

-

-		return false;

-	}

-

-	/**

-	 * look for the path the list of element (from the content provider) to go the eObject

-	 * 

-	 * @param eobject

-	 *        that we look for.

-	 * @param objects

-	 *        a list of elements where eobject can be wrapped.

-	 * @return the list of modelElementItem (from the root to the element that wrap the eobject)

-	 */

-	protected List<Object> searchPath(EObject eobject, List<Object> objects) {

-		//Simple/quick search (Based on containment)

-		List<Object> path = searchDirectContainmentPath(eobject, objects);

-		if(!path.isEmpty()) {

-			return path;

-		}

-

-		//Advanced search

-		path = new ArrayList<Object>();

-

-		for(Object o : objects) {

-			// Search matches in this level

-			if(!(o instanceof Diagram)) {

-				if(eobject.equals(EMFHelper.getEObject(o))) {

-					path.add(o);

-					return path;

-				}

-			}

-

-			// Find childs only for feature container

-			for(int i = 0; i < provider.getChildren(o).length; i++) {

-				Object treeItem = provider.getChildren(o)[i];

-

-				List<Object> tmppath = new ArrayList<Object>();

-				Object element = EMFHelper.getEObject(treeItem);

-

-				if(browseElement(element)) {

-					List<Object> childs = new ArrayList<Object>();

-					childs.add(treeItem);

-					tmppath = searchPath(eobject, childs);

-				}

-

-				// if tmppath contains the wrapped eobject we have found the good path

-				if(tmppath.size() > 0) {

-					Object last = tmppath.get(tmppath.size() - 1);

-					EObject lastEObject = EMFHelper.getEObject(last);

-					if(eobject.equals(lastEObject)) {

-						path.add(o);

-						path.addAll(tmppath);

-						return path;

-					}

-				}

-			}

-		}

-

-		return new ArrayList<Object>();

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/SemanticEMFContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/SemanticEMFContentProvider.java
deleted file mode 100644
index 3dad19455c9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/strategy/SemanticEMFContentProvider.java
+++ /dev/null
@@ -1,197 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.providers.strategy;

-

-import java.util.Collections;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelContentProvider;

-import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;

-import org.eclipse.papyrus.infra.emf.Activator;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.widgets.providers.IAdaptableContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-

-

-public class SemanticEMFContentProvider extends CustomizableModelContentProvider implements IAdaptableContentProvider, IHierarchicContentProvider, IStaticContentProvider {

-

-	protected EObject[] roots;

-

-	protected List<?> metaclasses = new LinkedList<Object>();

-

-	protected List<?> notWantedMetaclasses = new LinkedList<Object>();

-

-	protected EObject eObject;

-

-	protected EStructuralFeature feature;

-

-	protected AdapterFactory factory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-	public SemanticEMFContentProvider(EObject editedEObject, EStructuralFeature feature, EObject[] roots, CustomizationManager customizationManager) {

-		super(customizationManager);

-		this.roots = roots;

-

-		configureMetaclasses(feature);

-

-		this.eObject = editedEObject;

-		this.feature = feature;

-	}

-

-	public SemanticEMFContentProvider(EObject editedEObject, EStructuralFeature feature, EObject[] roots) {

-		this(editedEObject, feature, roots, Activator.getDefault().getCustomizationManager());

-	}

-

-	protected void configureMetaclasses(EStructuralFeature feature) {

-		if(feature != null) {

-			setWantedMetaclasses(Collections.singletonList(feature.getEType()));

-		}

-	}

-

-	public SemanticEMFContentProvider(EObject editedEObject, EStructuralFeature feature) {

-		this(editedEObject, feature, findRoots(editedEObject));

-	}

-

-	public SemanticEMFContentProvider(EObject[] roots) {

-		this(null, null, roots);

-	}

-

-	public SemanticEMFContentProvider(EObject[] roots, CustomizationManager customizationManager) {

-		this(null, null, roots, customizationManager);

-	}

-

-	public SemanticEMFContentProvider(ResourceSet root) {

-		this(null, null, root);

-	}

-

-	public SemanticEMFContentProvider(EObject editedEObject, EStructuralFeature feature, ResourceSet root) {

-		this(editedEObject, feature, getRoots(root));

-	}

-

-	protected static EObject[] getRoots(ResourceSet root) {

-		List<EObject> roots = new LinkedList<EObject>();

-		if(root != null) {

-			for(Resource resource : root.getResources()) {

-				roots.addAll(resource.getContents());

-			}

-		}

-		return roots.toArray(new EObject[roots.size()]);

-	}

-

-	protected static EObject[] findRoots(EObject source) {

-

-		//The EObject is not contained in a resource : we return the top-level EObject

-		if(source.eResource() == null) {

-			while(source.eContainer() != null) {

-				source = source.eContainer();

-			}

-

-			return new EObject[]{ source };

-		}

-

-		//The resource is not contained in a resource set : we return the resource's contents

-		if(source.eResource().getResourceSet() == null) {

-			return source.eResource().getContents().toArray(new EObject[0]);

-		}

-

-		//We have a full resourceSet : we return its contents

-		return getRoots(source.eResource().getResourceSet());

-	}

-

-	@Override

-	public EObject[] getRootElements(final Object inputElement) {

-		return roots;

-	}

-

-	public Object getAdaptedValue(Object containerElement) {

-		return EMFHelper.getEObject(containerElement);

-	}

-

-	@Override

-	public boolean hasChildren(Object parent) {

-		//May be expensive

-		Object[] children = getChildren(parent);

-		return children != null && children.length > 0;

-	}

-

-	public boolean isValidValue(Object containerElement) {

-		// get the semantic object form the element

-		Object semanticObject = getAdaptedValue(containerElement);

-

-		//return false for EReference and non-semantic objects

-		if(semanticObject instanceof EReference || semanticObject == null) {

-			return false;

-		}

-

-		//Tests whether the element is compatible with at least one metaclass

-		if(metaclasses != null && !metaclasses.isEmpty()) {

-			boolean compatible = false;

-

-			for(Object metaclass : metaclasses) {

-				if(isCompatibleMetaclass(containerElement, metaclass)) {

-					compatible = true;

-					break;

-				}

-			}

-

-			if(!compatible) {

-				return false;

-			}

-		}

-

-		//If the element is compatible with at least one metaclass from notWanted, then it is not valid

-		for(Object metaclass : notWantedMetaclasses) {

-			if(isCompatibleMetaclass(containerElement, metaclass)) {

-				return false;

-			}

-		}

-

-		return true;

-	}

-

-	protected boolean isCompatibleMetaclass(Object containerElement, Object metaclass) {

-		if(metaclass instanceof EClassifier) {

-			Object semanticElement = getAdaptedValue(containerElement);

-			return ((EClassifier)metaclass).isInstance(semanticElement);

-		}

-		return false;

-	}

-

-	public void setWantedMetaclasses(List<?> metaclasses) {

-		this.metaclasses = metaclasses;

-	}

-

-	public void setNotWantedMetaclasses(List<?> notWantedMetaclasses) {

-		this.notWantedMetaclasses = notWantedMetaclasses;

-	}

-

-	public Object[] getElements() {

-		return super.getElements(null);

-	}

-

-	public List<?> getWantedMetaclasses() {

-		return metaclasses;

-	}

-

-	public List<?> getNotWantedMetaclasses() {

-		return notWantedMetaclasses;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/BusinessModelResolver.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/BusinessModelResolver.java
deleted file mode 100644
index eb840db7f3b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/BusinessModelResolver.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.emf.utils;

-

-

-/**

- * This class allows to retrieve the business object from an object representing

- * a graphical artifact in a diagram. Each diagram can register its resolver

- * which will be added to the list of resolvers. Some common resolvers are

- * already registered : gef.EditPart TODO Use extensions to register additional

- * resolvers.

- */

-//Refactoring 0.10: This class has been moved from infra.core to infra.emf.

-//It should be re-implemented as a Service.

-public class BusinessModelResolver {

-

-	/**

-	 * The unique instance

-	 */

-	public static BusinessModelResolver instance = new BusinessModelResolver();

-

-	public BusinessModelResolver() {

-

-	}

-

-	/**

-	 * Get the business object associated to this object, if any. This method

-	 * navigate throw the object if the object is an graphical artefact or a

-	 * diagram artifact.

-	 * 

-	 * @param object

-	 * @return Object

-	 */

-	public Object getBusinessModel(Object object) {

-		return EMFHelper.getEObject(object);

-	}

-

-	/**

-	 * @return BusinessModelResolver

-	 */

-	public static BusinessModelResolver getInstance() {

-		return instance;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ConvertedValueContainer.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ConvertedValueContainer.java
deleted file mode 100644
index 4760ce6be06..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ConvertedValueContainer.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.utils;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IStatus;

-

-

-/**

- * 

- * This class allows to store the value created for a pasted String AND a result status associated to this pasted String

- * 

- * @param <T>

- */

-

-public class ConvertedValueContainer<T> {

-

-	/**

-	 * this field is used when the pasted value is monovalued

-	 */

-	private final T value;

-

-	/**

-	 * the resulting status of the parsing

-	 */

-	private final IStatus status;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param realValue

-	 *        a monovalued Value (can be <code>null</code>)

-	 * @param realListValue

-	 *        a collection value (can be <code>null</code>)

-	 * @param status

-	 *        a status (can be <code>null</code>)

-	 */

-	public ConvertedValueContainer(final T realValue, final IStatus status) {

-		this.value = realValue;

-		this.status = status;

-		Assert.isNotNull(status);

-	}

-

-

-

-	public final IStatus getStatus() {

-		return this.status;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the value

-	 */

-	public final T getConvertedValue() {

-		return this.value;

-	}

-	

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EClassNameComparator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EClassNameComparator.java
deleted file mode 100644
index 0d559144ede..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EClassNameComparator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.emf.utils;

-

-import java.text.Collator;

-import java.util.Comparator;

-

-import org.eclipse.emf.ecore.EClass;

-

-/**

- * A class for comparing EClasses by name

- * 

- * @author Camille Letavernier

- * 

- */

-public class EClassNameComparator implements Comparator<EClass> {

-

-	public int compare(EClass class1, EClass class2) {

-		if(class1 == null) {

-			return class2 == null ? 0 : -1;

-		}

-

-		return Collator.getInstance().compare(class1.getName(), class2.getName());

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFContants.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFContants.java
deleted file mode 100644
index 86c9f1d40d2..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFContants.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.emf.utils;

-

-/**

- * Thyis class defines some useful constants for EMF

- * 

- * @author vl222926

- * 

- */

-public class EMFContants {

-

-

-	private EMFContants() {

-		//to prevent instanciation

-	}

-

-	public static final String ESTRING = "EString";

-

-	public static final String EBOOLEAN = "EBoolean";

-

-	public static final String EINT = "EInt";

-

-	public static final String EDOUBLE = "EDouble";

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFHelper.java
deleted file mode 100644
index bdcc1864b2e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFHelper.java
+++ /dev/null
@@ -1,744 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010, 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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

- *  Christian W. Damus (CEA) - filter out EObjects that are Resources (CDO)

- *  Christian W. Damus (CEA) - Support read-only state at object level (CDO)

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.LinkedHashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.common.util.TreeIterator;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.EStructuralFeature.Setting;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.URIConverter;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-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.facet.custom.ui.CustomizedContentProviderUtils;

-import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;

-import org.eclipse.papyrus.infra.emf.Activator;

-import org.eclipse.papyrus.infra.tools.util.PlatformHelper;

-

-/**

- * A Helper class for manipulating EMF Objects

- * 

- * @author Camille Letavernier

- */

-//TODO : Check implementations. Most of them are old and don't always match the specification

-public class EMFHelper {

-

-	/**

-	 * Returns the EClass corresponding to the given nsUri and className

-	 * 

-	 * @param nsUri

-	 *        The NSURI of the EClass' EPackage

-	 * @param className

-	 *        The EClass' name

-	 * @return

-	 *         The EClass instance, or null if the EClass couldn't be found

-	 */

-	public static EClass getEClass(final String nsUri, final String className) {

-		EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsUri);

-		if(ePackage == null) {

-			Activator.log.warn("Cannot find an EPackage matching the nsURI " + nsUri); //$NON-NLS-1$

-			return null;

-		}

-		return getEClass(ePackage, className);

-	}

-

-	/**

-	 * Return the EClass corresponding to the given EPackage and className

-	 * 

-	 * @param metamodel

-	 *        The EClass' EPackage

-	 * @param className

-	 *        The EClass' name

-	 * @return

-	 *         The EClass instance, or null if the EClass couldn't be found

-	 */

-	public static EClass getEClass(final EPackage metamodel, final String className) {

-		EClassifier classifier = metamodel.getEClassifier(className);

-		if(classifier == null) {

-			Activator.log.warn("Classifier " + className + " not found in metamodel " + metamodel.getName() + " (" + metamodel.getNsURI() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

-		}

-		if(classifier instanceof EClass) {

-			return (EClass)classifier;

-		} else {

-			Activator.log.warn("Classifier " + className + " in " + metamodel.getName() + " (" + metamodel.getNsURI() + ") is not an EClass"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

-		}

-

-		return null;

-	}

-

-	/**

-	 * Tests if an Object is an instance of the given EClass

-	 * 

-	 * @param element

-	 *        The EObject to test

-	 * @param className

-	 *        The name of the EClass

-	 * @param metamodel

-	 *        The EPackage owning the EClass

-	 * @return

-	 *         True if the EObject is an instance of the EClass, or of one of the EClass' subtypes

-	 */

-	public static boolean isInstance(final EObject element, final String className, final EPackage metamodel) {

-

-		EClassifier theClass = metamodel.getEClassifier(className);

-

-		if(theClass == null) {

-			Activator.log.warn("Class " + className + " not found in Metamodel : " + metamodel.getName() + " (" + metamodel.getNsURI() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

-			return false;

-		}

-

-		return theClass.isInstance(element);

-	}

-

-	/**

-	 * Tests if the given eClass is a Subclass of fromClass

-	 * Also returns true when eClass == fromClass

-	 * 

-	 * @param eClass

-	 * @param fromClass

-	 * @return

-	 *         true if eClass is a subclass of fromClass

-	 */

-	public static boolean isSubclass(final EClass eClass, final EClass fromClass) {

-		//Everything is an EObject

-		if(eClass != null && fromClass == EcorePackage.eINSTANCE.getEObject()) {

-			return true;

-		}

-

-		if(eClass == fromClass) {

-			return true;

-		}

-

-		List<EClass> superTypes = eClass.getEAllSuperTypes();

-		if(superTypes.contains(fromClass)) {

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * Returns the EObject corresponding to the input object

-	 * Tests if the input is an EObject, or if it is Adaptable

-	 * to an EObject

-	 * 

-	 * @param source

-	 * @return An EObject corresponding to the input source, or null

-	 *         if the EObject could not be resolved

-	 */

-	public static EObject getEObject(final Object source) {

-

-		//Support for EMF 0.2 CustomizedTree: The TreeElements are EObjects, and do not implement IAdatapble.

-		//FIXME: Use an AdapterFactory instead, to remove the dependency to EMF Facet 0.2

-		Object resolved = CustomizedContentProviderUtils.resolve(source);

-		if(resolved != source && isEMFModelElement(resolved)) {

-			return (EObject)resolved;

-		}

-

-		//General case

-		if(isEMFModelElement(source)) {

-			return (EObject)source;

-		} else if(source instanceof IAdaptable) {

-			EObject eObject = (EObject)((IAdaptable)source).getAdapter(EObject.class);

-			if(eObject == null) { //EMF Facet 0.1

-				eObject = (EObject)((IAdaptable)source).getAdapter(EReference.class);

-			}

-			return asEMFModelElement(eObject); // in case the adapter is a CDOResource

-		}

-

-		return null;

-	}

-

-	/**

-	 * Queries whether an {@code object} is an EMF model element, an instance of

-	 * some {@link EClass} from an EMF model. This isn't as simple as checking

-	 * whether the object is an {@link EObject} because there are edge cases

-	 * where objects are {@code EObject}s but shouldn't be treated as

-	 * "model content". But, a minimum requirement is that the {@code object} is

-	 * an {@link EObject}.

-	 * 

-	 * @param object

-	 *        an object

-	 * @return whether it is "model content"

-	 * 

-	 * @see EMFHelper#asEMFModelElement(Object)

-	 */

-	public static boolean isEMFModelElement(Object object) {

-		return (object instanceof EObject) && !(object instanceof Resource);

-	}

-

-	/**

-	 * Casts an {@code object} as an EMF model element, if appropriate.

-	 * 

-	 * @param object

-	 *        an object

-	 * @return the object as an EMF model element, or {@code null} if it is not

-	 *         an EMF model element

-	 * 

-	 * @see #isEMFModelElement(Object)

-	 */

-	public static EObject asEMFModelElement(Object object) {

-		return isEMFModelElement(object) ? (EObject)object : null;

-	}

-

-	/**

-	 * Retrieve the EditingDomain for the given source object. The object is first

-	 * resolved to an EObject through #getEObject when possible.

-	 * 

-	 * @param source

-	 * @return

-	 *         The source object's editing domain, or null if it couldn't be found

-	 */

-	public static EditingDomain resolveEditingDomain(final Object source) {

-		return resolveEditingDomain(getEObject(source));

-	}

-

-	/**

-	 * Retrieve the EditingDomain for the given source EObject

-	 * 

-	 * @param source

-	 * @return

-	 *         The source eObject's editing domain, or null if it couldn't be found

-	 */

-	public static EditingDomain resolveEditingDomain(final EObject source) {

-		EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(source);

-		if(domain == null) {

-			try {

-				domain = ServiceUtilsForActionHandlers.getInstance().getTransactionalEditingDomain();

-			} catch (ServiceException e) {

-				//Ignore: We cannot find the domain

-			}

-		}

-		return domain;

-	}

-

-	/**

-	 * Return the eClassifier' qualified name. The qualified name is obtained by the concatenation

-	 * of its package hierarchy with the class name, separated by the given separator

-	 * 

-	 * @param eClassifier

-	 * @param separator

-	 *        The separator used between each package name

-	 * @return

-	 *         The EClassifier' qualified name

-	 */

-	public static String getQualifiedName(final EClassifier eClassifier, final String separator) {

-		return getQualifiedName(eClassifier.getEPackage(), separator) + separator + eClassifier.getName();

-	}

-

-	/**

-	 * Return the ePackage's qualified name. The qualified name is obtained by the concatenation

-	 * of its superPackage hierarchy with the ePackage name, separated by the given separator

-	 * 

-	 * @param ePackage

-	 * @param separator

-	 *        The separator used between each package name

-	 * @return

-	 *         The EPackage's qualified name

-	 */

-	public static String getQualifiedName(final EPackage ePackage, final String separator) {

-		if(ePackage.getESuperPackage() == null) {

-			return ePackage.getName();

-		}

-		return getQualifiedName(ePackage.getESuperPackage(), separator) + separator + ePackage.getName();

-	}

-

-

-	/**

-	 * Loads and returns the first EObject at the given URI.

-	 * The EObject is loaded in the given resourceSet.

-	 * 

-	 * @param resourceSet

-	 *        The ResourceSet in which the model will be loaded

-	 * @param uri

-	 *        The URI describing the location of the model to load

-	 * @return

-	 *         The first EObject located at the given URI

-	 * @throws IOException

-	 *         When the URI cannot be loaded

-	 */

-	public static EObject loadEMFModel(ResourceSet resourceSet, final URI uri) throws IOException {

-		if(resourceSet == null) {

-			resourceSet = new ResourceSetImpl();

-		}

-		try {

-			Resource resource = resourceSet.getResource(uri, true);

-			if(resource != null) {

-				if(!resource.getContents().isEmpty()) {

-					return resource.getContents().get(0);

-				}

-			}

-		} catch (Exception ex) {

-			IOException exception = new IOException(ex.toString());

-			exception.initCause(ex);

-			throw exception;

-		}

-

-		return null;

-	}

-

-	/**

-	 * Return the root package containing the given package, or the package

-	 * itself if it is already the root

-	 * 

-	 * @param ePackage

-	 * @return

-	 *         The Root package

-	 */

-	public static EPackage getRootPackage(final EPackage ePackage) {

-		if(ePackage == null) {

-			return null;

-		}

-

-		if(ePackage.getESuperPackage() == null) {

-			return ePackage;

-		}

-		return getRootPackage(ePackage.getESuperPackage());

-	}

-

-

-	/**

-	 * Return the list of EClasses that are subtypes

-	 * of the given EClass

-	 * 

-	 * @param type

-	 * @param concreteClassesOnly

-	 *        If true, only Concrete EClasses will be returned. Abstract and Interface EClasses will be filtered

-	 * @return

-	 *         The list of EClasses implementing or extending the given EClass

-	 */

-	public static List<EClass> getSubclassesOf(final EClass type, final boolean concreteClassesOnly) {

-		Set<EClass> result = new LinkedHashSet<EClass>();

-		if(!concreteClassesOnly || (!type.isAbstract() && !type.isInterface())) {

-			result.add(type);

-		}

-

-		EPackage ePackage = getRootPackage(type.getEPackage());

-		getSubclassesOf(type, ePackage, result, concreteClassesOnly);

-		return new LinkedList<EClass>(result);

-	}

-

-	/**

-	 * Return the list of EClasses that are sub types

-	 * of the given EClass

-	 * 

-	 * @param type

-	 * @param concreteClassesOnly

-	 *        If true, only Concrete EClasses will be returned. Abstract and Interface EClasses will be filtered

-	 * @param packagesToBrowse

-	 *        The EPackages in which the EClasses should be retrieved

-	 * @return

-	 *         The list of EClasses implementing or extending the given EClass

-	 */

-	public static List<EClass> getSubclassesOf(final EClass type, final boolean concreteClassesOnly, Collection<EPackage> packagesToBrowse) {

-		Set<EClass> result = new LinkedHashSet<EClass>();

-		if(!concreteClassesOnly || (!type.isAbstract() && !type.isInterface())) {

-			result.add(type);

-		}

-

-		for(EPackage ePackage : packagesToBrowse) {

-			getSubclassesOf(type, ePackage, result, concreteClassesOnly);

-		}

-

-		return new LinkedList<EClass>(result);

-	}

-

-	/**

-	 * Return the list of EClasses that are sub types of the given EClass

-	 * 

-	 * @param type

-	 * @param concreteClassesOnly

-	 *        If true, only Concrete EClasses will be returned. Abstract and Interface EClasses will be filtered

-	 * @param browseAllRegisteredPackages

-	 *        If true, all registered EPackages will be navigated to retrieve the matching EClasses. Otherwise,

-	 *        only the current EPackage will be used.

-	 * @return

-	 *         The list of EClasses implementing or extending the given EClass

-	 */

-	public static List<EClass> getSubclassesOf(final EClass type, final boolean concreteClassesOnly, final boolean browseAllRegisteredPackages) {

-		//If the current package is a dynamic package, it may not be registered (?). Add it directly

-		EPackage currentPackage = getRootPackage(type.getEPackage());

-

-		Set<EPackage> allPackages = new LinkedHashSet<EPackage>();

-		allPackages.add(currentPackage);

-

-		if(browseAllRegisteredPackages) {

-			//FIXME // WARNING: This loop will load all EPackages. The first call is expensive.

-			Set<String> allUris = new HashSet<String>(EPackage.Registry.INSTANCE.keySet());

-

-			for(String nsURI : allUris) {

-				allPackages.add(EPackage.Registry.INSTANCE.getEPackage(nsURI));

-			}

-		}

-

-		return getSubclassesOf(type, concreteClassesOnly, allPackages);

-	}

-

-	private static void getSubclassesOf(final EClass type, final EPackage fromPackage, final Set<EClass> result, final boolean concreteClassesOnly) {

-		for(EClassifier classifier : fromPackage.getEClassifiers()) {

-			if(classifier instanceof EClass) {

-				EClass eClass = (EClass)classifier;

-				if(eClass.getEAllSuperTypes().contains(type)) {

-					if(!concreteClassesOnly || (!eClass.isAbstract() && !eClass.isInterface())) {

-						result.add(eClass);

-					}

-				}

-			}

-		}

-

-		for(EPackage subPackage : fromPackage.getESubpackages()) {

-			getSubclassesOf(type, subPackage, result, concreteClassesOnly);

-		}

-	}

-

-	/**

-	 * Tests if an EObject is read only

-	 * Delegates to the EObject's editing domain if it can be found

-	 * 

-	 * @param eObject

-	 * @return

-	 *         True if the EObject is read only

-	 */

-	public static boolean isReadOnly(final EObject eObject) {

-		EditingDomain domain = resolveEditingDomain(eObject);

-		return isReadOnly(eObject, domain);

-	}

-

-	/**

-	 * Tests if an EObject is read only

-	 * Delegates to the given editing domain if it isn't null

-	 * 

-	 * @param eObject

-	 * 

-	 * @param domain

-	 * @return

-	 *         True if the EObject is read only

-	 */

-	public static boolean isReadOnly(final EObject eObject, final EditingDomain domain) {

-		if(domain != null) {

-			Object handler = PlatformHelper.getAdapter(domain, IReadOnlyHandler.class);

-			if(handler instanceof IReadOnlyHandler) {

-				return ((IReadOnlyHandler)handler).isReadOnly(eObject).get();

-			}

-

-			if(eObject.eResource() != null) {

-				return domain.isReadOnly(eObject.eResource());

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * Tests if the Resource is read only

-	 * Delegates to the given editing domain if it isn't null

-	 * 

-	 * @param resource

-	 * @param domain

-	 * @return

-	 *         True if the Resource is read only

-	 */

-	public static boolean isReadOnly(final Resource resource, final EditingDomain domain) {

-		if(resource == null) {

-			return false;

-		}

-

-		if(domain != null && resource.getURI() != null) {

-			Object handler = PlatformHelper.getAdapter(domain, IReadOnlyHandler.class);

-			if(handler instanceof IReadOnlyHandler) {

-				return ((IReadOnlyHandler)handler).anyReadOnly(new URI[]{ resource.getURI() }).get();

-			}

-			return domain.isReadOnly(resource);

-		}

-

-		// no editing domain : use file system attribute

-		ResourceSet resourceSet = resource.getResourceSet();

-

-		if(resourceSet == null) {

-			return false;

-		}

-

-		Map<String, ?> attributes = resourceSet.getURIConverter().getAttributes(resource.getURI(), null);

-		Boolean readOnly = (Boolean)attributes.get(URIConverter.ATTRIBUTE_READ_ONLY);

-

-		return readOnly == null ? false : readOnly;

-	}

-

-	/**

-	 * Tests if the given EStructuralFeature is required (ie. should always

-	 * have a value)

-	 * 

-	 * A feature is required if at least of one the following conditions if

-	 * true :

-	 * 

-	 * - It has a defaultValue

-	 * - Its lowerBound is at least 1

-	 * - It is an enumeration (Enumerations always have a default value)

-	 * - It is a Java primitive type, and is not marked as Unsettable

-	 * 

-	 * @param feature

-	 *        the feature to test

-	 * @return

-	 *         true if the feature is required, false otherwise

-	 */

-	public static boolean isRequired(final EStructuralFeature feature) {

-		//EEnums are always required, as an EEnum always has a default value

-		if(feature.getEType() instanceof EEnum) {

-			return true;

-		}

-

-		//At least one value means it is required

-		if(feature.getLowerBound() >= 1) {

-			return true;

-		}

-

-		//Java primitive types cannot have a null value

-		//if the feature is not specifically marked as unsettable, then it is required

-		if(feature.getEType().getInstanceClass().isPrimitive() && !feature.isUnsettable()) {

-			return true;

-		}

-

-		//If there is a default value, there is always a value

-		if(feature.getDefaultValueLiteral() != null) {

-			return true;

-		}

-

-		return false; //The property if not required

-	}

-

-	/**

-	 * Returns all objects of type T contained in the resource

-	 * 

-	 * @param resource

-	 * @param type

-	 * @return

-	 */

-	public static <T> Set<T> allInstances(final Resource resource, Class<T> type) {

-		TreeIterator<EObject> iterator = resource.getAllContents();

-		Set<T> result = new LinkedHashSet<T>();

-

-		while(iterator.hasNext()) {

-			EObject element = iterator.next();

-			if(type.isInstance(element)) {

-				result.add(type.cast(element));

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * Returns all the EPackages and nested EPackages contained in this resource

-	 * 

-	 * @param resource

-	 * @return

-	 */

-	public static Set<EPackage> getAllEPackages(final Resource resource) {

-		Set<EPackage> result = new LinkedHashSet<EPackage>();

-

-		for(EObject rootElement : resource.getContents()) {

-			if(rootElement instanceof EPackage) {

-				result.add((EPackage)rootElement);

-				result.addAll(getAllNestedPackages((EPackage)rootElement));

-			}

-		}

-

-		return result;

-	}

-

-	/**

-	 * Returns all packages nested in the given EPackage (recursively). Does not

-	 * include the base EPackage.

-	 * 

-	 * @param basePackage

-	 * @return

-	 */

-	public static Set<EPackage> getAllNestedPackages(EPackage basePackage) {

-		Set<EPackage> result = new LinkedHashSet<EPackage>();

-

-		for(EPackage nestedPackage : basePackage.getESubpackages()) {

-			result.add(nestedPackage);

-			result.addAll(getAllNestedPackages(nestedPackage));

-		}

-

-		return result;

-	}

-

-	/**

-	 * 

-	 * @param resource

-	 *        a resource

-	 * 

-	 * @return

-	 *         the list of the metamodels known by the resource

-	 */

-	public static Set<EPackage> getMetamodels(final Resource resource) {

-		Set<EPackage> metamodels = new HashSet<EPackage>();

-		if(resource != null) {

-			final List<EObject> contents = new ArrayList<EObject>(resource.getContents());

-			for(final EObject current : contents) {

-				metamodels.add(current.eClass().getEPackage());

-			}

-		}

-		return metamodels;

-	}

-

-	/**

-	 * 

-	 * Returns the XMI ID of the given {@link EObject} or <code>null</code> if it cannot be resolved.

-	 * 

-	 * @param object

-	 *        Object which we seek the XMI ID of.

-	 * @return <code>object</code>'s XMI ID, <code>null</code> if not applicable.

-	 */

-	public static final String getXMIID(final EObject object) {

-		String objectID = null;

-		if(object != null && object.eResource() instanceof XMIResource) {

-			objectID = ((XMIResource)object.eResource()).getID(object);

-		}

-		return objectID;

-	}

-

-

-

-	/**

-	 * Gets the usages.

-	 * 

-	 * @param source

-	 *        the source

-	 * 

-	 * @return the usages or null if there is no usages

-	 */

-	public static Collection<Setting> getUsages(EObject source) {

-		// the functional code is defined in core because we need it in infra.core

-		// but infra.core can't depend on infra.emf (circular dependency)

-		return org.eclipse.papyrus.infra.core.utils.EMFHelper.getUsages(source);

-	}

-

-

-	/**

-	 * <pre>

-	 * Test if the used element is referenced by other elements than the known

-	 * referencer (except its container). It ignores references from an other meta-model.

-	 * </pre>

-	 * 

-	 * @param usedObject

-	 *        the used object

-	 * @param knownReferencer

-	 *        the known referencer

-	 * @return true if the known referencer is the only referencer.

-	 */

-	public static boolean isOnlyUsage(EObject usedObject, EObject knownReferencer) {

-		boolean isUsed = false;

-		EPackage mmPackage = usedObject.eClass().getEPackage();

-

-		// Retrieve the list of elements referencing the usedObject.

-		Set<EObject> crossReferences = new HashSet<EObject>();

-		for(Setting setting : getUsages(usedObject)) {

-			EObject eObj = setting.getEObject();

-			if(eObj.eClass().getEPackage().equals(mmPackage)) {

-				crossReferences.add(eObj);

-			}

-		}

-

-		// Remove the container of used object.

-		crossReferences.remove(usedObject.eContainer());

-		// Remove the knownReferencer from the list of references.

-		crossReferences.remove(knownReferencer);

-

-		// If no referencer remains in the list, the known element is the only

-		// usage.

-		if(crossReferences.isEmpty()) {

-			isUsed = true;

-		}

-

-		return isUsed;

-	}

-

-	/**

-	 * 

-	 * @param superType

-	 *        an eclassifier

-	 * @param subType

-	 *        another eClassifier

-	 * @return

-	 *         <code>true</code> if the 2nd {@link EClassifier} is a subtype of the first one

-	 */

-	public static boolean isSuperType(final EClassifier superType, final EClassifier subType) {

-		if(superType == subType) {

-			return true;

-		}

-

-		if(superType instanceof EClass && subType instanceof EClass) {

-			// special case because isSuperTypeOf doesn't handle it

-			if(superType == EcorePackage.eINSTANCE.getEObject()) {

-				return true;

-			}

-

-			EClass superTypeEClass = (EClass)superType;

-			EClass subTypeEClass = (EClass)subType;

-			return superTypeEClass.isSuperTypeOf(subTypeEClass);

-		}

-

-		//manage EDtataType

-		if(superType == EcorePackage.eINSTANCE.getEDataType() && subType instanceof EDataType) {

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * Computes the path from the root EObject to the given element, as a List of EObjects

-	 * 

-	 * @param element

-	 * @return

-	 */

-	public static List<EObject> getContainmentPath(EObject element) {

-		List<EObject> result;

-		if(element.eContainer() == null) {

-			result = new LinkedList<EObject>();

-			result.add(element);

-			return result;

-		} else {

-			result = getContainmentPath(element.eContainer());

-			result.add(element);

-		}

-		return result;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFStringValueConverter.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFStringValueConverter.java
deleted file mode 100644
index 8f92a241737..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFStringValueConverter.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.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.utils;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.emf.Activator;

-import org.eclipse.papyrus.infra.tools.util.BooleanHelper;

-import org.eclipse.papyrus.infra.tools.util.TypesConstants;

-import org.eclipse.ui.services.IDisposable;

-

-/**

- * Value solver for EMF

- * 

- * WARNING : incomplete implementations

- * 

- * @author vl222926

- * 

- */

-

-public class EMFStringValueConverter implements IDisposable {

-

-	protected static final String THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y = "The String {0} is not valid to create {1}";

-

-	protected static final String THE_FEATURE_X_CANT_BE_RESOLVED = "The feature {0} can't be resolved";

-

-	protected static final String THE_STRING_VALUE_X_CANT_BE_RESOLVED = "The string value {0} can't be resolved";

-

-	protected static final String SOME_STRING_ARE_NOT_VALID_TO_CREATE_X = "Some String are not valid to create {0}";

-

-	/**

-	 * Context used for the resolution of the string

-	 */

-	private EObject resolutionContext;

-

-	/**

-	 * The separator used for multivalue

-	 */

-	protected final String multiValueSeparator;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param resolutionContext

-	 *        the context used for the resolution of the string

-	 */

-	public EMFStringValueConverter(final EObject resolutionContext, final String multiValueSeparator) {

-		this.resolutionContext = resolutionContext;

-		this.multiValueSeparator = multiValueSeparator;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the context to use for the resolution

-	 */

-	public EObject getResolutionContext() {

-		return resolutionContext;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.ui.services.IDisposable#dispose()

-	 * 

-	 */

-	public void dispose() {

-		this.resolutionContext = null;

-	}

-

-	/**

-	 * 

-	 * @param resolutionContext

-	 *        the table context

-	 * @param feature

-	 *        the feature

-	 * @param valueAsString

-	 *        the pasted string for this feature

-	 * @return

-	 *         the value for the pasted string or <code>null</code> if not found

-	 */

-	public ConvertedValueContainer<?> deduceValueFromString(final Object feature, final String valueAsString) {

-		final EClassifier featureType = getFeatureType(feature);

-		if(feature instanceof EStructuralFeature) {

-			return deduceValueFromString(feature, featureType, valueAsString);

-		}

-		final IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_FEATURE_X_CANT_BE_RESOLVED, feature));

-		return new ConvertedValueContainer<Object>(null, status);

-	}

-

-	/**

-	 * 

-	 * @param feature

-	 * @param featureType

-	 * @param valueAsString

-	 * @return

-	 */

-	protected ConvertedValueContainer<?> deduceValueFromString(final Object feature, final EClassifier featureType, final String valueAsString) {

-		ConvertedValueContainer<?> realValue = null;

-//		if(feature instanceof EStructuralFeature) {

-			final int upperbound = getFeatureUpperBound(feature);

-			boolean isMany = (upperbound > 1 || upperbound == -1);

-			if(featureType instanceof EDataType) {

-				//move these strings

-				final String typeName = featureType.getName();

-				if(TypesConstants.STRING.equals(typeName) || EMFContants.ESTRING.equals(typeName)) {

-					realValue = deduceStringValue(isMany, valueAsString);

-				} else if(EMFContants.EBOOLEAN.equals(typeName) || TypesConstants.BOOLEAN.equals(typeName)) {

-					realValue = deduceBooleanValue(isMany, valueAsString);

-				} else if(EMFContants.EINT.equals(typeName) || TypesConstants.INTEGER.equals(typeName)) {

-					realValue = deduceIntValue(isMany, valueAsString);

-				} else if(EMFContants.EDOUBLE.equals(typeName)) {

-					realValue = deduceDoubleValue(isMany, valueAsString);

-				}

-			} else if(featureType instanceof EClass) {

-				realValue = deduceEObjectValue((EObject)getResolutionContext(), feature, (EClass)featureType, isMany, valueAsString);

-			}

-		//		} else {

-		//			final IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_VALUE_X_CANT_BE_RESOLVED, valueAsString));

-		//			return new SolvedValueContainer<Object>(null, status);

-		//		}

-		return realValue;

-	}

-

-	protected int getFeatureUpperBound(final Object feature) {

-		return ((EStructuralFeature)feature).getUpperBound();

-	}

-

-

-	/**

-	 * 

-	 * @param resolutionContext

-	 *        the context used for the resolution

-	 * @param feature

-	 *        the feature

-	 * @param featureType

-	 *        the type of the feature

-	 * @param isMany

-	 *        <code>true</code> if the feature isMany

-	 * @param valueAsString

-	 *        the string value to resolve

-	 * @return

-	 *         a value container referencing the eobject represented by the string

-	 * @throws StringValueSolverException

-	 */

-	protected ConvertedValueContainer<?> deduceEObjectValue(EObject resolutionContext, Object feature, EClass featureType, boolean isMany, String valueAsString) {

-		if(valueAsString==null || valueAsString.equals("")){

-			return new ConvertedValueContainer<EObject>(null, Status.OK_STATUS);

-		}

-		final IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_VALUE_X_CANT_BE_RESOLVED, valueAsString));

-		return new ConvertedValueContainer<EObject>(null, status);

-	}

-

-	/**

-	 * 

-	 * @param feature

-	 *        an object representing a feature

-	 * @return

-	 *         the type of the feature

-	 */

-	protected EClassifier getFeatureType(final Object feature) {

-		final EClassifier featureType;

-		if(feature instanceof EStructuralFeature) {

-			return ((EStructuralFeature)feature).getEType();

-		} else {

-			featureType = null;

-		}

-		return featureType;

-	}

-

-	/**

-	 * 

-	 * @param isMany

-	 *        <code>true</code> if the feature isMany

-	 * @param valueAsString

-	 *        the value to parse

-	 * @return

-	 *         the result of the parsing

-	 */

-	protected ConvertedValueContainer<?> deduceBooleanValue(final boolean isMany, final String valueAsString) {

-		ConvertedValueContainer<?> returnedValue = null;

-		IStatus iStatus = Status.OK_STATUS;

-		final Collection<String> unresolvedValues = new ArrayList<String>();

-		if(isMany) {

-			final Collection<Boolean> values = new ArrayList<Boolean>();

-			for(final String str : valueAsString.split(this.multiValueSeparator)) {

-				if(BooleanHelper.isBoolean(str)) {

-					values.add(Boolean.valueOf(valueAsString));

-				} else {

-					unresolvedValues.add(str);

-				}

-			}

-			if(!unresolvedValues.isEmpty()) {

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(SOME_STRING_ARE_NOT_VALID_TO_CREATE_X, TypesConstants.BOOLEAN), unresolvedValues);

-			}

-			returnedValue = new MultiConvertedValueContainer<Boolean>(values, iStatus);

-		} else {

-			if(BooleanHelper.isBoolean(valueAsString)) {

-				returnedValue = new ConvertedValueContainer<Boolean>(Boolean.valueOf(valueAsString), iStatus);

-			} else {

-				unresolvedValues.add(valueAsString);

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y, valueAsString, TypesConstants.BOOLEAN), unresolvedValues);

-				returnedValue = new ConvertedValueContainer<Boolean>(null, iStatus);

-			}

-		}

-		return returnedValue;

-	}

-

-	/**

-	 * 

-	 * @param isMany

-	 *        <code>true</code> if the feature isMany

-	 * @param valueAsString

-	 *        the value to parse

-	 * @return

-	 *         the result of the parsing

-	 */

-	protected ConvertedValueContainer<?> deduceDoubleValue(final boolean isMany, final String valueAsString) {

-		ConvertedValueContainer<?> returnedValue = null;

-		IStatus iStatus = Status.OK_STATUS;

-		final Collection<String> unresolvedValues = new ArrayList<String>();

-		if(isMany) {

-			final Collection<Double> values = new ArrayList<Double>();

-			for(final String str : valueAsString.split(this.multiValueSeparator)) {

-				final Double value = Double.valueOf(str);

-				if(value != null) {

-					values.add(value);

-				} else {

-					unresolvedValues.add(str);

-				}

-			}

-			if(!unresolvedValues.isEmpty()) {

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(SOME_STRING_ARE_NOT_VALID_TO_CREATE_X, TypesConstants.DOUBLE), unresolvedValues);

-			}

-			returnedValue = new MultiConvertedValueContainer<Double>(values, iStatus);

-		} else {

-			try {

-				returnedValue = new ConvertedValueContainer<Double>(Double.valueOf(valueAsString), iStatus);

-			} catch (final NumberFormatException e) {

-				unresolvedValues.add(valueAsString);

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y, valueAsString, TypesConstants.DOUBLE), unresolvedValues);

-				returnedValue = new ConvertedValueContainer<Boolean>(null, iStatus);

-			}

-		}

-		return returnedValue;

-	}

-

-	/**

-	 * 

-	 * @param isMany

-	 *        <code>true</code> if the feature isMany

-	 * @param valueAsString

-	 *        the value to parse

-	 * @return

-	 *         the result of the parsing

-	 */

-	protected ConvertedValueContainer<?> deduceIntValue(final boolean isMany, final String valueAsString) {

-		ConvertedValueContainer<?> returnedValue = null;

-		IStatus iStatus = Status.OK_STATUS;

-		final Collection<String> unresolvedValues = new ArrayList<String>();

-		if(isMany) {

-			final Collection<Integer> values = new ArrayList<Integer>();

-			for(final String str : valueAsString.split(this.multiValueSeparator)) {

-				try {

-					values.add(Integer.valueOf(str));

-				} catch (final NumberFormatException e) {

-					unresolvedValues.add(str);

-				}

-			}

-			if(!unresolvedValues.isEmpty()) {

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(SOME_STRING_ARE_NOT_VALID_TO_CREATE_X, TypesConstants.INTEGER), unresolvedValues);

-			}

-			returnedValue = new MultiConvertedValueContainer<Integer>(values, iStatus);

-		} else {

-			try {

-				returnedValue = new ConvertedValueContainer<Integer>(Integer.valueOf(valueAsString), iStatus);

-			} catch (final NumberFormatException e) {

-				unresolvedValues.add(valueAsString);

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_STRING_X_IS_NOT_VALID_TO_CREATE_Y, valueAsString, TypesConstants.INTEGER), unresolvedValues);

-				returnedValue = new ConvertedValueContainer<Boolean>(null, iStatus);

-			}

-		}

-		return returnedValue;

-	}

-

-

-	/**

-	 * 

-	 * @param isMany

-	 *        <code>true</code> if the feature is many

-	 * @param valueAsString

-	 *        the value as string

-	 * @return

-	 *         the value container with the real value(s)

-	 */

-	protected ConvertedValueContainer<?> deduceStringValue(final boolean isMany, final String valueAsString) {

-		ConvertedValueContainer<?> returnedValue = null;

-		final IStatus iStatus = Status.OK_STATUS;

-		if(isMany) {

-			final Collection<String> values = new ArrayList<String>();

-			for(final String str : valueAsString.split(this.multiValueSeparator)) {

-				values.add(str);

-			}

-			returnedValue = new MultiConvertedValueContainer<String>(values, iStatus);

-		} else {

-			returnedValue = new ConvertedValueContainer<String>(valueAsString, iStatus);

-		}

-		return returnedValue;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ENamedElementComparator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ENamedElementComparator.java
deleted file mode 100644
index f2928885c13..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ENamedElementComparator.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.emf.utils;

-

-import java.text.Collator;

-import java.util.Comparator;

-

-import org.eclipse.emf.ecore.ENamedElement;

-

-/**

- * 

- * A comparator for ENamedElement

- *

- */

-public class ENamedElementComparator implements Comparator<ENamedElement> {

-

-	public int compare(final ENamedElement namedElement1, final ENamedElement namedElement2) {

-		if(namedElement1 == null) {

-			return namedElement2 == null ? 0 : -1;

-		}

-

-		return Collator.getInstance().compare(namedElement1.getName(), namedElement2.getName());

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/HistoryUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/HistoryUtil.java
deleted file mode 100644
index 50d10a12b9f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/HistoryUtil.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.emf.utils;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-

-public class HistoryUtil {

-

-	/**

-	 * Returns a String identifying the History of selected values for the given object/feature

-	 * 

-	 * @param editedObject

-	 * @param feature

-	 * @return

-	 */

-	public static String getHistoryID(EObject editedObject, EStructuralFeature feature) {

-		return getHistoryID(editedObject, feature, "");

-	}

-

-	/**

-	 * Returns a String identifying the History of selected values for the given object/feature,

-	 * and prepends the given prefix

-	 * 

-	 * @param editedObject

-	 * @param feature

-	 * @return

-	 */

-	public static String getHistoryID(EObject editedObject, EStructuralFeature feature, String prefix) {

-		//		return String.format("history_%s:%s:%s", feature.getEType().getEPackage().getName(), feature.getEType().getName(), feature.getName()); //$NON-NLS-1$

-		if(editedObject.eResource() == null) {

-			return String.format("history_%s_%s:%s", prefix, EMFHelper.getQualifiedName(feature.getEType(), ":"), feature.getName()); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-

-		return String.format("history_%s_%s:%s:%s", prefix, editedObject.eResource().getURI(), EMFHelper.getQualifiedName(feature.getEType(), ":"), feature.getName()); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/MultiConvertedValueContainer.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/MultiConvertedValueContainer.java
deleted file mode 100644
index 8cb52536ecd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/MultiConvertedValueContainer.java
+++ /dev/null
@@ -1,39 +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.utils;

-

-import java.util.Collection;

-

-import org.eclipse.core.runtime.IStatus;

-

-/**

- * 

- * This class allows to store the value created for a pasted String AND a result status associated to this pasted String

- * 

- * @param <T>

- */

-public class MultiConvertedValueContainer<T> extends ConvertedValueContainer<Collection<T>> {

-

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param realValue

-	 * @param status

-	 */

-	public MultiConvertedValueContainer(final Collection<T> realValue, final IStatus status) {

-		super(realValue, status);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ProviderHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ProviderHelper.java
deleted file mode 100644
index d3d919225bd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ProviderHelper.java
+++ /dev/null
@@ -1,59 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.papyrus.infra.emf.providers.EMFGraphicalContentProvider;

-import org.eclipse.papyrus.infra.emf.providers.strategy.ContainmentBrowseStrategy;

-import org.eclipse.papyrus.infra.widgets.strategy.ProviderBasedBrowseStrategy;

-import org.eclipse.papyrus.infra.widgets.strategy.StrategyBasedContentProvider;

-import org.eclipse.papyrus.infra.widgets.strategy.TreeBrowseStrategy;

-

-

-public class ProviderHelper {

-

-	/**

-	 * Encapsulates the given content provider in a higher-level content provider

-	 * The returned provider uses two different strategies to display and search

-	 * elements, and adds a pattern filter and an History

-	 * 

-	 * @param provider

-	 *        The ContentProvider to encapsulate

-	 * @return

-	 */

-	public static EMFGraphicalContentProvider encapsulateProvider(ITreeContentProvider provider, ResourceSet resourceSet, String historyId) {

-		TreeBrowseStrategy browseStrategy = new ProviderBasedBrowseStrategy(provider);

-		TreeBrowseStrategy revealStrategy = new ContainmentBrowseStrategy(provider);

-		IStructuredContentProvider strategyProvider = new StrategyBasedContentProvider(browseStrategy, revealStrategy);

-		EMFGraphicalContentProvider graphicalProvider = new EMFGraphicalContentProvider(strategyProvider, resourceSet, historyId);

-

-		return graphicalProvider;

-	}

-

-	/**

-	 * Encapsulates the given content provider in a higher-level content provider

-	 * The returned provider uses two different strategies to display and search

-	 * elements, and adds a pattern filter and an History

-	 * 

-	 * @param provider

-	 *        The ContentProvider to encapsulate

-	 * @return

-	 */

-	public static EMFGraphicalContentProvider encapsulateProvider(ITreeContentProvider provider, EObject editedEObject, EStructuralFeature feature) {

-		ResourceSet rs = editedEObject == null ? null : editedEObject.eResource() == null ? null : editedEObject.eResource().getResourceSet();

-		return encapsulateProvider(provider, rs, HistoryUtil.getHistoryID(editedEObject, feature));

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ResourceUtils.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ResourceUtils.java
deleted file mode 100644
index 225e5b57eae..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ResourceUtils.java
+++ /dev/null
@@ -1,81 +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.utils;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.Path;

-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.xmi.XMIResource;

-

-/**

- * 

- * This class provides methods for EMF Resource

- * 

- */

-public class ResourceUtils {

-

-	private ResourceUtils() {

-		//to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param resource

-	 *        an EMF resource

-	 * @return

-	 *         the IFile corresponding to this resource, or <code>null</code> if not found

-	 */

-	public static IFile getFile(final Resource resource) {

-		if(resource != null) {

-			URI uri = resource.getURI();

-			uri = resource.getResourceSet().getURIConverter().normalize(uri);

-			if(uri.isPlatformResource()) { 

-				String uriPlatformString = uri.toPlatformString(true) ;

-				return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(uriPlatformString));

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * 

-	 * @param resource

-	 *        a resource

-	 * @return

-	 *         a collection with all existing id in the resource

-	 * 

-	 */

-	public static Collection<String> getAllResourceIds(final XMIResource resource) {

-		final Set<String> ids = new HashSet<String>();

-		final Iterator<EObject> iterator = resource.getAllContents();

-		while(iterator.hasNext()) {

-			final EObject current = iterator.next();

-			final String id = resource.getID(current);

-			Assert.isNotNull(id);

-			Assert.isTrue(!ids.contains(id));

-			ids.add(id);

-		}

-		return ids;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceRegistryAdapterFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceRegistryAdapterFactory.java
deleted file mode 100644
index 596451c8444..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceRegistryAdapterFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 Cedric Dumoulin.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-

-/**

- * This AdapterFactory is used to attach a reference on the ServiceRegiqtry to an EMF ResourceSet.

- * 

- * This adapterFactory is not a real factory: no adapter is created.

- * 

- * @author cedric dumoulin

- * 

- */

-public class ServiceRegistryAdapterFactory extends AdapterFactoryImpl {

-

-	/**

-	 * ID used to register the factory in the ResourceSet.

-	 */

-	static final public String TYPE_ID = ServiceRegistryAdapterFactory.class.getName() + "TypeId";

-

-	/**

-	 * The reference to the ServiceRegistry.

-	 */

-	protected ServicesRegistry servicesRegistry;

-

-	/**

-	 * @param servicesRegistry

-	 */

-	public ServiceRegistryAdapterFactory(ServicesRegistry servicesRegistry) {

-		this.servicesRegistry = servicesRegistry;

-	}

-

-	/**

-	 * 

-	 * @return the associated {@link ServicesRegistry}

-	 */

-	public ServicesRegistry getServicesRegistry() {

-		return servicesRegistry;

-	}

-

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return type.equals(TYPE_ID);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForEObject.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForEObject.java
deleted file mode 100644
index 32e3b45d222..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForEObject.java
+++ /dev/null
@@ -1,45 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.AbstractServiceUtils;

-

-/**

- * A ServiceUtils instance for manipulating Papyrus services on an EObject

- * 

- * @author Camille Letavernier

- * 

- */

-public class ServiceUtilsForEObject extends AbstractServiceUtils<EObject> {

-

-	private static ServiceUtilsForEObject instance = new ServiceUtilsForEObject();

-

-	public static ServiceUtilsForEObject getInstance() {

-		return instance;

-	}

-

-	private ServiceUtilsForEObject() {

-		//Singleton

-	}

-

-	@Override

-	public ServicesRegistry getServiceRegistry(EObject from) throws ServiceException {

-		if(from == null) {

-			throw new ServiceException("The selected EObject must not be null");

-		}

-

-		return ServiceUtilsForResource.getInstance().getServiceRegistry(from.eResource());

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForHandlers.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForHandlers.java
deleted file mode 100644
index cdf46c2d5be..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForHandlers.java
+++ /dev/null
@@ -1,100 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.expressions.IEvaluationContext;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServiceNotFoundException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.AbstractServiceUtils;

-import org.eclipse.ui.ISources;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchPartSite;

-

-/**

- * ServicesUtils based on the Handler's ExecutionEvent

- * 

- * It first tests the current selection, then the IWorkbenchPart on which the handler is executed.

- * The IWorkbenchPart is expected to be adaptable to a ServiceRegistry.

- * 

- * @author Camille Letavernier

- * 

- * @see ServiceUtilsForSelection

- */

-public class ServiceUtilsForHandlers extends AbstractServiceUtils<ExecutionEvent> {

-

-	private ServiceUtilsForHandlers() {

-		//Singleton

-	}

-

-	@Override

-	public ServicesRegistry getServiceRegistry(ExecutionEvent from) throws ServiceException {

-

-		Object context = from.getApplicationContext();

-

-		if(context instanceof IEvaluationContext) {

-			IEvaluationContext evaluationContext = (IEvaluationContext)context;

-

-			//Search for the IWorkbenchPartSite from which the ExecutionEvent is sent (May be different that the Active one)

-			Object workbenchPartSite = evaluationContext.getVariable("org.eclipse.ui.IWorkbenchPartSite");

-			if(workbenchPartSite instanceof IWorkbenchPartSite) {

-				IWorkbenchPartSite site = (IWorkbenchPartSite)workbenchPartSite;

-				Object registry = site.getAdapter(ServicesRegistry.class);

-				if(registry != null && registry instanceof ServicesRegistry) {

-					return (ServicesRegistry)registry;

-				}

-

-				//Search for the IWorkbenchPart from which the ExecutionEvent is sent (May be different that the Active one)

-				IWorkbenchPart workbenchPart = site.getPart();

-				registry = workbenchPart.getAdapter(ServicesRegistry.class);

-				if(registry != null && registry instanceof ServicesRegistry) {

-					return (ServicesRegistry)registry;

-				}

-			}

-

-			Object selection = evaluationContext.getVariable(ISources.ACTIVE_CURRENT_SELECTION_NAME);

-

-			ServicesRegistry registry;

-

-			//Try to resolve the ServicesRegistry from the current selection

-			if(selection instanceof ISelection && !((ISelection)selection).isEmpty()) {

-				try {

-					registry = ServiceUtilsForSelection.getInstance().getServiceRegistry((ISelection)selection);

-					if(registry != null) {

-						return registry;

-					}

-				} catch (ServiceException ex) {

-					//Ignore and try another ServiceUtils

-				}

-			}

-

-			//We couldn't retrieve the ServiceRegistry from the current selection.

-

-			//Try to adapt the active part to the ServicesRegistry

-			IWorkbenchPart part = (IWorkbenchPart)evaluationContext.getVariable(ISources.ACTIVE_PART_NAME);

-			registry = (ServicesRegistry)(part).getAdapter(ServicesRegistry.class);

-			if(registry != null) {

-				return registry;

-			}

-		}

-

-		throw new ServiceNotFoundException("The ServiceRegistry cannot be resolved");

-	}

-

-	public static ServiceUtilsForHandlers getInstance() {

-		return instance;

-	}

-

-	private static final ServiceUtilsForHandlers instance = new ServiceUtilsForHandlers();

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForIEvaluationContext.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForIEvaluationContext.java
deleted file mode 100644
index 183fd824911..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForIEvaluationContext.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 Cedric Dumoulin.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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 - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.expressions.IEvaluationContext;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServiceNotFoundException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.AbstractServiceUtils;

-import org.eclipse.ui.ISources;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchPartSite;

-

-/**

- * ServicesUtils based on the Handler's IEvaluationContext.

- * This class can be used for both the {@link AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)} and the {@link AbstractHandler#setEnabled(Object)} methods.

- * 

- * 

- * @author Cedric Dumoulin

- * 

- */

-public class ServiceUtilsForIEvaluationContext extends AbstractServiceUtils<IEvaluationContext> {

-

-	private ServiceUtilsForIEvaluationContext() {

-		//Singleton

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.core.utils.AbstractServiceUtils#getServiceRegistry(java.lang.Object)

-	 *

-	 * @param from

-	 * @return

-	 * @throws ServiceException

-	 */

-	@Override

-	public ServicesRegistry getServiceRegistry(IEvaluationContext from) throws ServiceException {

-

-		IEvaluationContext evaluationContext = from;

-

-		//Search for the IWorkbenchPartSite from which the ExecutionEvent is sent (May be different that the Active one)

-		Object workbenchPartSite = evaluationContext.getVariable("org.eclipse.ui.IWorkbenchPartSite");

-		if(workbenchPartSite instanceof IWorkbenchPartSite) {

-			IWorkbenchPartSite site = (IWorkbenchPartSite)workbenchPartSite;

-			Object registry = site.getAdapter(ServicesRegistry.class);

-			if(registry != null && registry instanceof ServicesRegistry) {

-				return (ServicesRegistry)registry;

-			}

-

-			//Search for the IWorkbenchPart from which the ExecutionEvent is sent (May be different that the Active one)

-			IWorkbenchPart workbenchPart = site.getPart();

-			registry = workbenchPart.getAdapter(ServicesRegistry.class);

-			if(registry != null && registry instanceof ServicesRegistry) {

-				return (ServicesRegistry)registry;

-			}

-		}

-

-		Object selection = evaluationContext.getVariable(ISources.ACTIVE_CURRENT_SELECTION_NAME);

-

-		ServicesRegistry registry;

-

-		//Try to resolve the ServicesRegistry from the current selection

-		if(selection instanceof ISelection && !((ISelection)selection).isEmpty()) {

-			try {

-				registry = ServiceUtilsForSelection.getInstance().getServiceRegistry((ISelection)selection);

-				if(registry != null) {

-					return registry;

-				}

-			} catch (ServiceException ex) {

-				//Ignore and try another ServiceUtils

-			}

-		}

-

-		//We couldn't retrieve the ServiceRegistry from the current selection.

-

-		//Try to adapt the active part to the ServicesRegistry

-		Object _part = evaluationContext.getVariable(ISources.ACTIVE_PART_NAME);

-		if (_part instanceof IWorkbenchPart) {

-			IWorkbenchPart part = (IWorkbenchPart)_part;

-			registry = (ServicesRegistry)(part).getAdapter(ServicesRegistry.class);

-			if(registry != null) {

-				return registry;

-			}

-		}

-

-

-		// nothing found

-		throw new ServiceNotFoundException("The ServiceRegistry cannot be resolved");

-	}

-

-	public static ServiceUtilsForIEvaluationContext getInstance() {

-		return instance;

-	}

-

-	private static final ServiceUtilsForIEvaluationContext instance = new ServiceUtilsForIEvaluationContext();

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResource.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResource.java
deleted file mode 100644
index 0dc6349fd76..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResource.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 Cedric Dumoulin.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.emf.utils;

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServiceNotFoundException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.AbstractServiceUtils;

-

-/**

- * Get the {@link ServicesRegistry} from a {@link EObject} or a {@link Resource}.

- * This class allow to retrieve the {@link ServicesRegistry} associated to the {@link ResourceSet} owning the {@link Resource} owning the EObject.

- * 

- * <br>

- * To work properly, the EObject should be associated to a {@link Resource}, itself

- * registered in a {@link ResourceSet}.

- * Also, the ServicesRegistry should be associated to the ResourceSet with the help of the {@link ServiceRegistryAdapterFactory}. <br>

- * Normally, this is automatically done thanks to the {@link ServiceUtilsForResourceInitializerService} service. <br>

- * If you access this class from a service, you can ensure that the previous service is started by letting your service

- * depends on the <b>org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceInitializerService</b>.

- * 

- * 

- * @author cedric dumoulin

- * 

- */

-public class ServiceUtilsForResource extends AbstractServiceUtils<Resource> {

-

-	private final static ServiceUtilsForResource instance = new ServiceUtilsForResource();

-

-	/**

-	 * Get the singleton instance of the class.

-	 * 

-	 * @return

-	 */

-	public static final ServiceUtilsForResource getInstance() {

-		return instance;

-	}

-

-	/**

-	 * Get the {@link ServicesRegistry} from a {@link Resource}.

-	 * 

-	 * @param from

-	 *        The {@link Resource} from which we want the associated {@link ServicesRegistry}.

-	 * @return

-	 * @throws ServiceException

-	 *         If there is no {@link ServicesRegistry} associated to the {@link ResourceSet} owning the {@link Resource}.

-	 */

-	@Override

-	public ServicesRegistry getServiceRegistry(Resource from) throws ServiceException {

-		if(from == null) {

-			throw new ServiceNotFoundException("Can't find the ResourceSet needed retrieve the ServiceRegistry.");

-		}

-		return ServiceUtilsForResourceSet.getInstance().getServiceRegistry(from.getResourceSet());

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceInitializerService.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceInitializerService.java
deleted file mode 100644
index 25eba9bb364..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceInitializerService.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 Cedric Dumoulin.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.BadStateException;

-import org.eclipse.papyrus.infra.core.services.IService;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-

-/**

- * This service register inside the ResourceSet an AdapterFactory referencing the ServiceRegistry.

- * This will allows to get the ServicesRegistry from any EMF object (see {@link ServiceUtilsForResource}.

- * The AdapterFactory can't provide Adapters. It is only used to hold a reference on the ServiceRegistry.

- * 

- * This service depends on the ModelSet service.

- * 

- * 

- * @see ServiceRegistryAdapterFactory

- * @see ServiceUtilsForResource

- * 

- * @author cedric dumoulin

- * 

- */

-public class ServiceUtilsForResourceInitializerService implements IService {

-

-	ServicesRegistry servicesRegistry;

-	

-	/**

-	 * Create a {@link ServiceRegistryAdapterFactory} and associate it to the ResourceSet.

-	 * 

-	 */

-	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

-		

-		this.servicesRegistry = servicesRegistry;

-		ModelSet modelSet = ServiceUtils.getInstance().getModelSet(servicesRegistry);

-		

-		// Check if the Adapter Factory is already attached.

-		if( lookupServiceRegistryAdapterFactory(modelSet) != null ) {

-			return;

-		}

-		

-		// Attach the adapter

-		ServiceRegistryAdapterFactory factory = new ServiceRegistryAdapterFactory(servicesRegistry);

-		modelSet.getAdapterFactories().add(factory);

-		

-	}

-

-	/**

-	 * Return the AdapterFactory, or null if none is found.

-	 * @param resourceSet

-	 * @return

-	 */

-	private ServiceRegistryAdapterFactory lookupServiceRegistryAdapterFactory(ResourceSet resourceSet) {

-		ServiceRegistryAdapterFactory factory = (ServiceRegistryAdapterFactory)EcoreUtil.getAdapterFactory(resourceSet.getAdapterFactories(), ServiceRegistryAdapterFactory.TYPE_ID);

-

-		return factory;

-	}

-

-	/**

-	 * 

-	 */

-	public void startService() throws ServiceException {

-		// Do nothing

-		

-	}

-

-	/**

-	 * Detach the Adapter from the resourceSet

-	 */

-	public void disposeService() throws ServiceException {

-		

-		try {

-			ModelSet modelSet = ServiceUtils.getInstance().getModelSet(servicesRegistry);

-			ServiceRegistryAdapterFactory factory = lookupServiceRegistryAdapterFactory(modelSet);

-

-			modelSet.getAdapterFactories().remove(factory);

-		} catch (BadStateException e) {

-			// ModelSet is already disposed. Do nothing

-		}

-	}

-		

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceSet.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceSet.java
deleted file mode 100644
index 7dd7c3d4d1d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForResourceSet.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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServiceNotFoundException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.AbstractServiceUtils;

-

-

-public class ServiceUtilsForResourceSet extends AbstractServiceUtils<ResourceSet> {

-

-	private ServiceUtilsForResourceSet() {

-		//Singleton

-	}

-

-	private static ServiceUtilsForResourceSet instance = new ServiceUtilsForResourceSet();

-

-	public static ServiceUtilsForResourceSet getInstance() {

-		return instance;

-	}

-

-	@Override

-	public ServicesRegistry getServiceRegistry(ResourceSet from) throws ServiceException {

-		if(from == null) {

-			throw new ServiceNotFoundException("Can't find the ResourceSet needed retrieve the ServiceRegistry.");

-		}

-

-		// An AdapterFactory referencing the ServiceRegistry is attache to the REsourceSet.

-		// Try to get it.

-		ServiceRegistryAdapterFactory factory = (ServiceRegistryAdapterFactory)EcoreUtil.getAdapterFactory(from.getAdapterFactories(), ServiceRegistryAdapterFactory.TYPE_ID);

-		if(factory == null) {

-			throw new ServiceNotFoundException("Can't find the ServiceRegistry. No Adapter is attached to the ResourceSet. Check if the proper service is ");

-		}

-		return factory.getServicesRegistry();

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForSelection.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForSelection.java
deleted file mode 100644
index 729668d4160..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/ServiceUtilsForSelection.java
+++ /dev/null
@@ -1,59 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.AbstractServiceUtils;

-

-/**

- * ServiceUtils based on an ISelection.

- * 

- * Expects an IStructuredSelection containing at least one EObject (It then relies on ServiceUtilsForEObject to retrieve the ServicesRegistry)

- * 

- * @author Camille Letavernier

- */

-public class ServiceUtilsForSelection extends AbstractServiceUtils<ISelection> {

-

-	private ServiceUtilsForSelection() {

-		//Singleton

-	}

-

-	private static ServiceUtilsForSelection instance = new ServiceUtilsForSelection();

-

-	public static ServiceUtilsForSelection getInstance() {

-		return instance;

-	}

-

-	@Override

-	public ServicesRegistry getServiceRegistry(ISelection from) throws ServiceException {

-		if(from instanceof IStructuredSelection) {

-			IStructuredSelection selection = (IStructuredSelection)from;

-			Iterator<?> selectionIterator = selection.iterator();

-			while(selectionIterator.hasNext()) {

-				Object selectedElement = selectionIterator.next();

-				EObject selectedEObject = EMFHelper.getEObject(selectedElement);

-				if(selectedEObject != null) {

-					return ServiceUtilsForEObject.getInstance().getServiceRegistry(selectedEObject);

-				}

-			}

-		}

-

-		throw new ServiceException("Cannot retrieve the ServiceRegistry");

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/StringValueConverterStatus.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/StringValueConverterStatus.java
deleted file mode 100644
index bcb738add8d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/StringValueConverterStatus.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.emf.utils;

-

-import java.util.Collection;

-

-import org.eclipse.core.runtime.Status;

-

-/**

- * This status is used y the String Value solvers

- * 

- * @author vl222926

- * 

- */

-public class StringValueConverterStatus extends Status {

-

-	/**

-	 * the list of the uresolved strings

-	 */

-	private Collection<String> unresolvedString;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param severity

-	 *        the severity of the status

-	 * @param pluginId

-	 *        the plugin id providing this status

-	 * @param message

-	 *        the message for this status

-	 * @param unresolvedString

-	 *        the list of the unresolved string

-	 */

-	public StringValueConverterStatus(int severity, String pluginId, String message, Collection<String> unresolvedString) {

-		super(severity, pluginId, message);

-		this.unresolvedString = unresolvedString;

-	}

-

-

-	/**

-	 * 

-	 * @return

-	 *         the list of the unresolved string

-	 */

-	public final Collection<String> getUnresolvedString() {

-		return unresolvedString;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/TextReferencesHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/TextReferencesHelper.java
deleted file mode 100644
index e3ac8d92d7e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/TextReferencesHelper.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:

- *  Camille Letavernier (camille.letavernier@cea.fr) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.emf.utils;

-

-import java.util.regex.Matcher;

-import java.util.regex.Pattern;

-

-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.util.EcoreUtil;

-import org.eclipse.papyrus.infra.emf.Activator;

-

-/**

- * An abstract helper to replace references to EObjects (represented by their URI) with a label (related to this EObject).

- * 

- * It is typically used to introduce dynamic references to object's labels in free text areas (e.g. in a description)

- * 

- * The reference can be introduced with {@link #insertReference(EObject, String, int)}

- * 

- * The parsed string can be retrieved with {@link #replaceReferences(String)}

- * 

- * @author Camille Letavernier

- * 

- */

-public abstract class TextReferencesHelper {

-

-	public static final String URI_CHARS = "[^#]"; //Almost everything is allowed in a URI. It's simpler to exclude the fragment separator

-

-	public static final String FRAGMENT_CHARS = "[-A-Za-z0-9_/]"; //In Papyrus this is sufficient. Do we need a more complex expression?

-

-	public static final String URI_REGEX = String.format("%s*#%s+", URI_CHARS, FRAGMENT_CHARS); //The base uri is optional. The fragment is required.

-

-	public static String UNKNOWN_ELEMENT = "UNKNOWN"; //Replacement text for unknown elements

-

-	public static String PROXY_ELEMENT = "PROXY"; //Replacement text for proxy elements

-

-	protected Resource baseResource;

-

-	protected ResourceSet resourceSet;

-

-	protected TextReferencesHelper() {

-		//Empty

-	}

-

-	/**

-	 * 

-	 * @param baseResource

-	 *        The resource against which the link uris will be resolved

-	 */

-	protected TextReferencesHelper(Resource baseResource) {

-

-		if(baseResource != null) {

-			this.baseResource = baseResource;

-			this.resourceSet = baseResource.getResourceSet();

-		}

-	}

-

-	/**

-	 * Parses the specified text, and replace all references with their replacement String

-	 * 

-	 * @param text

-	 * @return

-	 * 

-	 * @see {@link #getReplacement(EObject, String)}

-	 */

-	public String replaceReferences(String text) {

-		if(text == null) {

-			return null;

-		}

-

-		if("".equals(text)) {

-			return text;

-		}

-

-		//Javadoc-like @link tag

-		String replaceRegex = String.format("\\{@link (%s)(\\|([^}]*))?\\}", URI_REGEX);

-

-		Pattern pattern = Pattern.compile(replaceRegex);

-		Matcher matcher = pattern.matcher(text);

-

-		String newText = text;

-

-		while(matcher.find()) {

-			String uriToReplace = matcher.group(1); //0 is the full pattern (e.g. {link myUri#myFragment}, 1 is the first group (e.g. myUri#myFragment)

-			String cachedValue = matcher.group(3); //group 2 is |CachedValue, group 3 is CachedValue

-

-			String replacement = decorate(getReplacement(uriToReplace, cachedValue));

-

-			newText = matcher.replaceFirst(replacement);

-			matcher = pattern.matcher(newText);

-		}

-

-		return newText;

-	}

-

-	/**

-	 * Insert a reference to the given element in the specified text, at the specified position

-	 * 

-	 * @param toElement

-	 *        The element to reference

-	 * @param inText

-	 *        The text in which the reference must be inserted

-	 * @param atPosition

-	 *        The position at which the reference must be inserted. 0 is the beginning, while text.length() is the end. For all "invalid" indexes (<0

-	 *        and > length()), the reference will be inserted at the end of the string

-	 * @return

-	 *         The text containing the new reference

-	 */

-	public String insertReference(EObject toElement, String inText, int atPosition) {

-		String result = inText;

-		if(inText == null) {

-			return null; //No change

-		}

-

-		if(toElement == null) {

-			return inText; //No change

-		}

-

-		//Use a Javadoc-like @link tag

-		URI elementURI = EcoreUtil.getURI(toElement);

-		if(baseResource != null) {

-			URI baseURI = baseResource.getURI();

-			if(baseURI != null) {

-				elementURI = elementURI.deresolve(baseURI);

-			}

-		}

-		String reference = "{@link " + elementURI + "}"; //The URI is already encoded 

-

-		if(atPosition == 0) {

-			return reference + result; //At the beginning

-		}

-

-		if(atPosition < 0 || atPosition >= inText.length()) {

-			result += reference; //Insert at the end

-		} else {

-			//Hello, world

-			//The whitespace is the character at position 6. Insert the reference at position 7 to add it after the whitespace

-			//It will result in Hello, <Replacement>world

-			result = inText.substring(0, atPosition); //Include the "afterPosition" character

-			result += reference; //Add the reference

-			result += inText.substring(atPosition, inText.length()); //Complete the string (Exclude the afterPosition character, as it has already been copied in the first part of the result string)

-		}

-

-		return result;

-	}

-

-	/**

-	 * Adds a (text) decoration to the replacement string.

-	 * This can be used for e.g. html-based texts, to add tags around the replaced string

-	 * 

-	 * The default implementation does nothing.

-	 */

-	protected String decorate(String text) {

-		return text;

-	}

-

-	protected String getReplacement(String uriToReplace, String cachedValue) {

-		String uri, fragment;

-

-		if(baseResource == null || resourceSet == null || baseResource.getURI() == null) {

-			return UNKNOWN_ELEMENT;

-		}

-

-		if(uriToReplace.contains("#")) {

-			uri = uriToReplace.substring(0, uriToReplace.indexOf('#'));

-			fragment = uriToReplace.substring(uriToReplace.indexOf('#') + 1, uriToReplace.length());

-		} else {

-			return UNKNOWN_ELEMENT;

-		}

-

-		URI targetURI;

-

-		URI resourceURI;

-

-		resourceURI = baseResource.getURI();

-

-		targetURI = URI.createURI(uri); //The URI must already be encoded

-

-		targetURI = targetURI.resolve(resourceURI);

-

-		if(targetURI == null) {

-			return UNKNOWN_ELEMENT;

-		}

-

-		targetURI = targetURI.appendFragment(fragment);

-

-		return getReplacement(targetURI, cachedValue);

-	}

-

-	protected String getReplacement(URI uriToReplace, String cachedValue) {

-		try {

-			EObject targetElement = resourceSet.getEObject(uriToReplace, true);

-			return getReplacement(targetElement, cachedValue);

-		} catch (Exception ex) {

-			//Log the error? If it happens once, it will happen many times (after each refresh). The UNKNOWN keyword may be enough.

-			//This error happens when the reference is broken (e.g. an element has been deleted). This is a "normal" behavior

-			Activator.log.debug("An error occurred while loading the following URI: " + uriToReplace + ". The reference cannot be replaced");

-		}

-

-		return UNKNOWN_ELEMENT;

-	}

-

-	protected abstract String getReplacement(EObject elementToReplace, String cachedValue);

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/TransactionalUnsetter.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/TransactionalUnsetter.java
deleted file mode 100644
index 1d4ab1791a6..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/TransactionalUnsetter.java
+++ /dev/null
@@ -1,61 +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.utils;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.emf.commands.UnsetCommand;

-

-/**

- * 

- * This class allows to do unset on a feature using a command

- * 

- */

-public class TransactionalUnsetter {

-

-

-	/**

-	 * the source eobject

-	 */

-	private final Command cmd;

-

-	/**

-	 * the editing domain used for the command

-	 */

-

-	private final TransactionalEditingDomain domain;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param source

-	 *        the eobject to modify

-	 * @param feature

-	 *        the feature on which we want to do an unset

-	 */

-	public TransactionalUnsetter(final EObject source, final EStructuralFeature feature) {

-		domain = (TransactionalEditingDomain)EMFHelper.resolveEditingDomain(source);

-		cmd = new UnsetCommand((TransactionalEditingDomain)domain, source, feature);

-	}

-

-	/**

-	 * this method do the unset

-	 */

-	public void doUnset() {

-		domain.getCommandStack().execute(cmd);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/.classpath b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/.classpath
deleted file mode 100644
index 361578420b1..00000000000
--- a/sandbox/pasteInNewTable/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/JavaSE-1.6"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/.project b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/.project
deleted file mode 100644
index 478d1af40ce..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index dcf31164296..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0

-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

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-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.1"

-Bundle-Vendor: %providerName

-Bundle-Version: 0.10.1.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableEditPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.edit;singleton:=true

-

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/about.html b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties
deleted file mode 100644
index a6bfdff8b76..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_EObjectLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_EObjectLabelProviderConfiguration.gif
deleted file mode 100644
index b67b16a9f33..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_EObjectLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_FeatureLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_FeatureLabelProviderConfiguration.gif
deleted file mode 100644
index 975c4746dad..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_FeatureLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_ObjectLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_ObjectLabelProviderConfiguration.gif
deleted file mode 100644
index c06a860ddcd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisConfiguration_labelConfiguration_ObjectLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_axisConfiguration_AbstractAxisConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_axisConfiguration_AbstractAxisConfiguration.gif
deleted file mode 100644
index 7c26822d0a3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_axisConfiguration_AbstractAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_axisConfiguration_DefaultAxisConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_axisConfiguration_DefaultAxisConfiguration.gif
deleted file mode 100644
index 0f9364baeeb..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_axisConfiguration_DefaultAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_labelConfiguration_FeatureLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_labelConfiguration_FeatureLabelProviderConfiguration.gif
deleted file mode 100644
index 75937a9df9f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractAxisProvider_labelConfiguration_FeatureLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_EStructuralFeatureValueFillingConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_EStructuralFeatureValueFillingConfiguration.gif
deleted file mode 100644
index c2326eff67c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_EStructuralFeatureValueFillingConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_FeatureAxisConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_FeatureAxisConfiguration.gif
deleted file mode 100644
index fdabbc265f7..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_FeatureAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_IPasteConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_IPasteConfiguration.gif
deleted file mode 100644
index dfe51cfa69b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_IPasteConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_PasteEObjectConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_PasteEObjectConfiguration.gif
deleted file mode 100644
index 3388fd398d0..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfiguration_PasteEObjectConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_EStructuralFeatureValueFillingConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_EStructuralFeatureValueFillingConfiguration.gif
deleted file mode 100644
index c2326eff67c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_EStructuralFeatureValueFillingConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_FeatureAxisConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_FeatureAxisConfiguration.gif
deleted file mode 100644
index fdabbc265f7..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_FeatureAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_IPasteConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_IPasteConfiguration.gif
deleted file mode 100644
index dfe51cfa69b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_IPasteConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_PasteEObjectConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_PasteEObjectConfiguration.gif
deleted file mode 100644
index 3388fd398d0..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedAxisConfigurations_PasteEObjectConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfiguration_FeatureLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfiguration_FeatureLabelProviderConfiguration.gif
deleted file mode 100644
index 7839cb59536..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfiguration_FeatureLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfiguration_ObjectLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfiguration_ObjectLabelProviderConfiguration.gif
deleted file mode 100644
index c5dab99a76c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfiguration_ObjectLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_FeatureLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_FeatureLabelProviderConfiguration.gif
deleted file mode 100644
index 7839cb59536..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_FeatureLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_ObjectLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_ObjectLabelProviderConfiguration.gif
deleted file mode 100644
index c5dab99a76c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractHeaderAxisConfiguration_ownedLabelConfigurations_ObjectLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_columnAxisProvider_DefaultAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_columnAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index d68f55cf8fb..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_columnAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_columnAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_columnAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index a3debc34b31..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_columnAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_rowAxisProvider_DefaultAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_rowAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index d68f55cf8fb..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_rowAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_rowAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_rowAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index a3debc34b31..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAbstractTableConfiguration_rowAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EObjectAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EObjectAxis.gif
deleted file mode 100644
index 5da9e2dfa83..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EObjectAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EStructuralFeatureAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EStructuralFeatureAxis.gif
deleted file mode 100644
index 85e79066b86..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_EStructuralFeatureAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_FeatureIdAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_FeatureIdAxis.gif
deleted file mode 100644
index 3ee6d16ecec..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_FeatureIdAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_ObjectIdAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_ObjectIdAxis.gif
deleted file mode 100644
index 8fc21667b15..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateAxisProvider_axis_ObjectIdAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultAxisProvider_axis_EObjectAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultAxisProvider_axis_EObjectAxis.gif
deleted file mode 100644
index f7330773c60..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultAxisProvider_axis_EObjectAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultAxisProvider_axis_IdAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultAxisProvider_axis_IdAxis.gif
deleted file mode 100644
index 79cec2bc9d9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultAxisProvider_axis_IdAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultContentProvider_axis_EObjectAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultContentProvider_axis_EObjectAxis.gif
deleted file mode 100644
index bc2d748f28d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultContentProvider_axis_EObjectAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultContentProvider_axis_IdAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultContentProvider_axis_IdAxis.gif
deleted file mode 100644
index b6c9d489e86..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateDefaultContentProvider_axis_IdAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateFeatureAxis_localLabelConfiguration_FeatureLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateFeatureAxis_localLabelConfiguration_FeatureLabelProviderConfiguration.gif
deleted file mode 100644
index 846943b6cb8..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateFeatureAxis_localLabelConfiguration_FeatureLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateLocalTableHeaderAxisConfiguration_axisManagerConfigurations_AxisManagerConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateLocalTableHeaderAxisConfiguration_axisManagerConfigurations_AxisManagerConfiguration.gif
deleted file mode 100644
index 30d6c628f9c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateLocalTableHeaderAxisConfiguration_axisManagerConfigurations_AxisManagerConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateObjectAxis_localLabelConfiguration_FeatureLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateObjectAxis_localLabelConfiguration_FeatureLabelProviderConfiguration.gif
deleted file mode 100644
index af07ba12a2b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateObjectAxis_localLabelConfiguration_FeatureLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateObjectAxis_localLabelConfiguration_ObjectLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateObjectAxis_localLabelConfiguration_ObjectLabelProviderConfiguration.gif
deleted file mode 100644
index 64cd1b08817..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateObjectAxis_localLabelConfiguration_ObjectLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnAxisProviders_MasterObjectAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnAxisProviders_MasterObjectAxisProvider.gif
deleted file mode 100644
index 4d51bba34ad..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnAxisProviders_MasterObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnAxisProviders_SlaveObjectAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnAxisProviders_SlaveObjectAxisProvider.gif
deleted file mode 100644
index 8526cb69d7e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnAxisProviders_SlaveObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnHeaderAxisConfiguration_TableHeaderAxisConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnHeaderAxisConfiguration_TableHeaderAxisConfiguration.gif
deleted file mode 100644
index c053c91fd2f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_columnHeaderAxisConfiguration_TableHeaderAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableCreationTester.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableCreationTester.gif
deleted file mode 100644
index 7b611480bea..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableCreationTester.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableTester.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableTester.gif
deleted file mode 100644
index ddf43a18246..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_creationTester_JavaTableTester.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowAxisProviders_MasterObjectAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowAxisProviders_MasterObjectAxisProvider.gif
deleted file mode 100644
index 4d51bba34ad..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowAxisProviders_MasterObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowAxisProviders_SlaveObjectAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowAxisProviders_SlaveObjectAxisProvider.gif
deleted file mode 100644
index 8526cb69d7e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowAxisProviders_SlaveObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowHeaderAxisConfiguration_TableHeaderAxisConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowHeaderAxisConfiguration_TableHeaderAxisConfiguration.gif
deleted file mode 100644
index c053c91fd2f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableConfiguration_rowHeaderAxisConfiguration_TableHeaderAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalAxisProvider_DefaultAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index 3ede289a77e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index df3eebc9432..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_DefaultAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_DefaultAxisProvider.gif
deleted file mode 100644
index 3ede289a77e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_DefaultContentProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_DefaultContentProvider.gif
deleted file mode 100644
index 3d00c57cebc..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_DefaultContentProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_EMFFeatureContentProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_EMFFeatureContentProvider.gif
deleted file mode 100644
index 549553f8eab..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_EMFFeatureContentProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_EMFFeatureValueAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index df3eebc9432..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultHorizontalContentProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalAxisProvider_DefaultAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index 3ede289a77e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index df3eebc9432..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_DefaultAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_DefaultAxisProvider.gif
deleted file mode 100644
index 3ede289a77e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_DefaultContentProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_DefaultContentProvider.gif
deleted file mode 100644
index 3d00c57cebc..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_DefaultContentProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_EMFFeatureContentProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_EMFFeatureContentProvider.gif
deleted file mode 100644
index 549553f8eab..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_EMFFeatureContentProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_EMFFeatureValueAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index df3eebc9432..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_defaultVerticalContentProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_horizontalAxisProvider_DefaultAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_horizontalAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index 3ede289a77e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_horizontalAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_horizontalAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_horizontalAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index df3eebc9432..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_horizontalAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_verticalAxisProvider_DefaultAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_verticalAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index 3ede289a77e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_verticalAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_verticalAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_verticalAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index df3eebc9432..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableEditorConfiguration_verticalAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableHeaderAxisConfiguration_axisManagers_AxisManagerRepresentation.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableHeaderAxisConfiguration_axisManagers_AxisManagerRepresentation.gif
deleted file mode 100644
index 3e4fc3f72c3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTableHeaderAxisConfiguration_axisManagers_AxisManagerRepresentation.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_cells_EObjectCell.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_cells_EObjectCell.gif
deleted file mode 100644
index f564476a4e1..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_cells_EObjectCell.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_cells_StringCell.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_cells_StringCell.gif
deleted file mode 100644
index 407220bf47e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_cells_StringCell.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_columnAxisProvidersHistory_MasterObjectAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_columnAxisProvidersHistory_MasterObjectAxisProvider.gif
deleted file mode 100644
index 7b5823c27e1..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_columnAxisProvidersHistory_MasterObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_columnAxisProvidersHistory_SlaveObjectAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_columnAxisProvidersHistory_SlaveObjectAxisProvider.gif
deleted file mode 100644
index 3799bd45b69..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_columnAxisProvidersHistory_SlaveObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_LocalTableEditorConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_LocalTableEditorConfiguration.gif
deleted file mode 100644
index 26da63c4c85..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_LocalTableEditorConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableConfiguration.gif
deleted file mode 100644
index 207b658fbb9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableEditorConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableEditorConfiguration.gif
deleted file mode 100644
index cbb9f425ab6..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_editorConfiguration_TableEditorConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalAxisProvider_DefaultAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index d31be0d688d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index cbb9f425ab6..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalContentProvider_DefaultContentProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalContentProvider_DefaultContentProvider.gif
deleted file mode 100644
index 011b758fdbc..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalContentProvider_DefaultContentProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalContentProvider_EMFFeatureContentProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalContentProvider_EMFFeatureContentProvider.gif
deleted file mode 100644
index b689e7a00bd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_horizontalContentProvider_EMFFeatureContentProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_localColumnHeaderAxisConfiguration_LocalTableHeaderAxisConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_localColumnHeaderAxisConfiguration_LocalTableHeaderAxisConfiguration.gif
deleted file mode 100644
index 407220bf47e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_localColumnHeaderAxisConfiguration_LocalTableHeaderAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_localRowHeaderAxisConfiguration_LocalTableHeaderAxisConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_localRowHeaderAxisConfiguration_LocalTableHeaderAxisConfiguration.gif
deleted file mode 100644
index 407220bf47e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_localRowHeaderAxisConfiguration_LocalTableHeaderAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_rowAxisProvidersHistory_MasterObjectAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_rowAxisProvidersHistory_MasterObjectAxisProvider.gif
deleted file mode 100644
index 7b5823c27e1..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_rowAxisProvidersHistory_MasterObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_rowAxisProvidersHistory_SlaveObjectAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_rowAxisProvidersHistory_SlaveObjectAxisProvider.gif
deleted file mode 100644
index 3799bd45b69..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_rowAxisProvidersHistory_SlaveObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalAxisProvider_DefaultAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalAxisProvider_DefaultAxisProvider.gif
deleted file mode 100644
index d31be0d688d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalAxisProvider_DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalAxisProvider_EMFFeatureValueAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalAxisProvider_EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index cbb9f425ab6..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalAxisProvider_EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalContentProvider_DefaultContentProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalContentProvider_DefaultContentProvider.gif
deleted file mode 100644
index 011b758fdbc..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalContentProvider_DefaultContentProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalContentProvider_EMFFeatureContentProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalContentProvider_EMFFeatureContentProvider.gif
deleted file mode 100644
index b689e7a00bd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/ctool16/CreateTable_verticalContentProvider_EMFFeatureContentProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AbstractAxisConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AbstractAxisConfiguration.gif
deleted file mode 100644
index 94c953e013b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AbstractAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AxisManagerConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AxisManagerConfiguration.gif
deleted file mode 100644
index 53500daf98e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AxisManagerConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AxisManagerRepresentation.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AxisManagerRepresentation.gif
deleted file mode 100644
index 89ad5da38ab..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/AxisManagerRepresentation.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultAxisConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultAxisConfiguration.gif
deleted file mode 100644
index 106881e5d9b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultAxisProvider.gif
deleted file mode 100644
index c673a5200a5..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultContentProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultContentProvider.gif
deleted file mode 100644
index 4365960a04b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/DefaultContentProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EMFFeatureContentProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EMFFeatureContentProvider.gif
deleted file mode 100644
index 30f0c48da8d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EMFFeatureContentProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EMFFeatureValueAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EMFFeatureValueAxisProvider.gif
deleted file mode 100644
index c414fe9f728..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EMFFeatureValueAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectAxis.gif
deleted file mode 100644
index 7b7c428c715..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectCell.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectCell.gif
deleted file mode 100644
index badaab0664a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectCell.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectLabelProviderConfiguration.gif
deleted file mode 100644
index b1f8afa4766..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EObjectLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EStructuralFeatureAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EStructuralFeatureAxis.gif
deleted file mode 100644
index c4a8af41844..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EStructuralFeatureAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EStructuralFeatureValueFillingConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EStructuralFeatureValueFillingConfiguration.gif
deleted file mode 100644
index 89ad5da38ab..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/EStructuralFeatureValueFillingConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureAxisConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureAxisConfiguration.gif
deleted file mode 100644
index 739ebbfa6ac..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureIdAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureIdAxis.gif
deleted file mode 100644
index 94c953e013b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureIdAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureLabelProviderConfiguration.gif
deleted file mode 100644
index c00aedf4135..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/FeatureLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/IPasteConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/IPasteConfiguration.gif
deleted file mode 100644
index 9250fecbffd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/IPasteConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/IdAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/IdAxis.gif
deleted file mode 100644
index e4bc22dd17e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/IdAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableCreationTester.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableCreationTester.gif
deleted file mode 100644
index b3643da048a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableCreationTester.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableTester.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableTester.gif
deleted file mode 100644
index e4b530eca17..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/JavaTableTester.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/LocalTableEditorConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/LocalTableEditorConfiguration.gif
deleted file mode 100644
index 5915591825a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/LocalTableEditorConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/LocalTableHeaderAxisConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/LocalTableHeaderAxisConfiguration.gif
deleted file mode 100644
index 94c953e013b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/LocalTableHeaderAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/MasterObjectAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/MasterObjectAxisProvider.gif
deleted file mode 100644
index 904159880b3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/MasterObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectIdAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectIdAxis.gif
deleted file mode 100644
index 9250fecbffd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectIdAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectLabelProviderConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectLabelProviderConfiguration.gif
deleted file mode 100644
index db7414e9372..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/ObjectLabelProviderConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/PasteEObjectConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/PasteEObjectConfiguration.gif
deleted file mode 100644
index a26660ec28f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/PasteEObjectConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/PasteProblem.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/PasteProblem.gif
deleted file mode 100644
index c4fb30e9687..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/PasteProblem.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/SlaveObjectAxisProvider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/SlaveObjectAxisProvider.gif
deleted file mode 100644
index 33a997a1606..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/SlaveObjectAxisProvider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/StringCell.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/StringCell.gif
deleted file mode 100644
index 94c953e013b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/StringCell.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/Table.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/Table.gif
deleted file mode 100644
index 4c9048708b0..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/Table.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableConfiguration.gif
deleted file mode 100644
index 90d10f94707..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableEditorConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableEditorConfiguration.gif
deleted file mode 100644
index c414fe9f728..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableEditorConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableHeaderAxisConfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableHeaderAxisConfiguration.gif
deleted file mode 100644
index 30f0c48da8d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/icons/full/obj16/TableHeaderAxisConfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.pdoc b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.pdoc
deleted file mode 100644
index 3efa63544f3..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
deleted file mode 100644
index d5865542cc8..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright (c) 2013 CEA LIST.

-# 

-# 

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and 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

-_UI_ICell_type = ICell

-_UI_StringCell_type = String Cell

-_UI_Table_cells_feature = Cells

-_UI_ICell_rowElement_feature = Row Element

-_UI_ICell_columnElement_feature = Column Element

-_UI_ICell_status_feature = Status

-_UI_StringCell_value_feature = Value

-_UI_Status_Normal_literal = NORMAL

-_UI_Status_Error_literal = ERROR

-_UI_Problem_type = Problem

-_UI_PasteProblem_type = Paste Problem

-_UI_EObjectCell_type = EObject Cell

-_UI_ICell_problems_feature = Problems

-_UI_PasteProblem_pastedText_feature = Pasted Text

-_UI_PasteProblem_unresolvedText_feature = Unresolved Text

-_UI_EObjectCell_rowElement_feature = Row Element

-_UI_EObjectCell_columnElement_feature = Column Element

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.xml
deleted file mode 100644
index bea95126aa4..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.java b/sandbox/pasteInNewTable/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 20d96f4d80d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EObjectAxisItemProvider.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.java b/sandbox/pasteInNewTable/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 fd5d1f03237..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/EStructuralFeatureAxisItemProvider.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java b/sandbox/pasteInNewTable/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 cf85ab26b30..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureAxisItemProvider.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.util.ResourceLocator;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.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.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.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);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Manager feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addManagerPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_manager_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__MANAGER,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Alias feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addAliasPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_alias_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__ALIAS,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((FeatureAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_FeatureAxis_type") : //$NON-NLS-1$

-			getString("_UI_FeatureAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(FeatureAxis.class)) {

-			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return NattableEditPlugin.INSTANCE;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.java b/sandbox/pasteInNewTable/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 87e6999ff54..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/FeatureIdAxisItemProvider.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.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.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.FeatureIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class FeatureIdAxisItemProvider extends IdAxisItemProvider 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);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns FeatureIdAxis.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureIdAxis")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((FeatureIdAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_FeatureIdAxis_type") : //$NON-NLS-1$

-			getString("_UI_FeatureIdAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(FeatureIdAxis.class)) {

-			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java b/sandbox/pasteInNewTable/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 b881b7ce7cd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/IdAxisItemProvider.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java b/sandbox/pasteInNewTable/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 3c1e9a0ed5a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/NattableaxisItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java b/sandbox/pasteInNewTable/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 777cfba7bfe..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectAxisItemProvider.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.util.ResourceLocator;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.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.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.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);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Manager feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addManagerPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_manager_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_manager_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__MANAGER,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Alias feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addAliasPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_IAxis_alias_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_IAxis_alias_feature", "_UI_IAxis_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattableaxisPackage.Literals.IAXIS__ALIAS,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ObjectAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_ObjectAxis_type") : //$NON-NLS-1$

-			getString("_UI_ObjectAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(ObjectAxis.class)) {

-			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-				return;

-			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

-	}

-

-	/**

-	 * 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.java b/sandbox/pasteInNewTable/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 adb4fac6b8a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/provider/ObjectIdAxisItemProvider.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.nattableaxis.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.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.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderFactory;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class ObjectIdAxisItemProvider extends IdAxisItemProvider 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);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns ObjectIdAxis.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ObjectIdAxis")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((ObjectIdAxis)object).getAlias();

-		return label == null || label.length() == 0 ?

-			getString("_UI_ObjectIdAxis_type") : //$NON-NLS-1$

-			getString("_UI_ObjectIdAxis_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(ObjectIdAxis.class)) {

-			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createObjectLabelProviderConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattableaxisPackage.Literals.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION,

-				 NattablelabelproviderFactory.eINSTANCE.createFeatureLabelProviderConfiguration()));

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java b/sandbox/pasteInNewTable/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 f3776e93f7a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AbstractHeaderAxisConfigurationItemProvider.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.EcorePackage;

-

-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.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 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 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(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);

-			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__EANNOTATIONS:

-			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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java b/sandbox/pasteInNewTable/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 324f3d0f384..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerConfigurationItemProvider.java
+++ /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

- */

-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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.java b/sandbox/pasteInNewTable/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 aee175db44b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/AxisManagerRepresentationItemProvider.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java b/sandbox/pasteInNewTable/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 94e7d7fe5a6..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/EStructuralFeatureValueFillingConfigurationItemProvider.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.java b/sandbox/pasteInNewTable/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 f17b3f2f923..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/FeatureAxisConfigurationItemProvider.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.java b/sandbox/pasteInNewTable/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 c1db57651dd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/IPasteConfigurationItemProvider.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java b/sandbox/pasteInNewTable/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 886fb8d6710..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/LocalTableHeaderAxisConfigurationItemProvider.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java b/sandbox/pasteInNewTable/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 4be7f8bffeb..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/NattableaxisconfigurationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java b/sandbox/pasteInNewTable/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 a909c8c3bd5..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/PasteEObjectConfigurationItemProvider.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java b/sandbox/pasteInNewTable/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 9777aa2c953..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/provider/TableHeaderAxisConfigurationItemProvider.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java b/sandbox/pasteInNewTable/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 6d689234ff2..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AbstractAxisProviderItemProvider.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.EStructuralFeature;

-import org.eclipse.emf.ecore.EcorePackage;

-

-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.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 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 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 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(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);

-		}

-		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 = ((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;

-			case NattableaxisproviderPackage.ABSTRACT_AXIS_PROVIDER__EANNOTATIONS:

-				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);

-	}

-

-	/**

-	 * 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java b/sandbox/pasteInNewTable/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 7c2a437b016..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/AxisProviderItemProvider.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java b/sandbox/pasteInNewTable/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 f4bdd276c96..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/MasterObjectAxisProviderItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.java b/sandbox/pasteInNewTable/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 a8048e1a67f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/NattableaxisproviderItemProviderAdapterFactory.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java b/sandbox/pasteInNewTable/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 ccaf1ece3b8..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/provider/SlaveObjectAxisProviderItemProvider.java
+++ /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

- */

-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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java b/sandbox/pasteInNewTable/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 bb24c13e995..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/NattableconfigurationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java b/sandbox/pasteInNewTable/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 4de8d9cc779..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableConfigurationItemProvider.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java b/sandbox/pasteInNewTable/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 85387799f08..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/provider/TableNamedElementItemProvider.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.EStructuralFeature;

-import org.eclipse.emf.ecore.EcorePackage;

-

-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.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 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 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 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(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);

-		}

-		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 = ((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;

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS:

-				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);

-	}

-

-	/**

-	 * 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java b/sandbox/pasteInNewTable/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 dfc931d2453..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/FeatureLabelProviderConfigurationItemProvider.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.java b/sandbox/pasteInNewTable/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 c21e29e3584..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/NattablelabelproviderItemProviderAdapterFactory.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java b/sandbox/pasteInNewTable/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 0925191c9a5..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/provider/ObjectLabelProviderConfigurationItemProvider.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.EStructuralFeature;

-import org.eclipse.emf.ecore.EcorePackage;

-

-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.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 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 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 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(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);

-		}

-		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 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;

-			case NattablelabelproviderPackage.OBJECT_LABEL_PROVIDER_CONFIGURATION__EANNOTATIONS:

-				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);

-	}

-

-	/**

-	 * 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.java b/sandbox/pasteInNewTable/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 f08c3c60642..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/AbstractTableTesterItemProvider.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.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.EStructuralFeature;

-import org.eclipse.emf.ecore.EcorePackage;

-

-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.emf.edit.provider.ViewerNotification;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.AbstractTableTester;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage;

-

-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 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 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 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(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_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);

-

-		switch (notification.getFeatureID(AbstractTableTester.class)) {

-			case NattabletesterPackage.ABSTRACT_TABLE_TESTER__EANNOTATIONS:

-				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);

-	}

-

-	/**

-	 * 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java b/sandbox/pasteInNewTable/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 eca7b149cd3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/JavaTableTesterItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java b/sandbox/pasteInNewTable/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 d3c7d5d2652..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/provider/NattabletesterItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/EObjectCellItemProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/EObjectCellItemProvider.java
deleted file mode 100644
index 1001ac9b486..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/EObjectCellItemProvider.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.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.NattablePackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class EObjectCellItemProvider

-	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 EObjectCellItemProvider(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);

-

-			addProblemsPropertyDescriptor(object);

-			addRowElementPropertyDescriptor(object);

-			addColumnElementPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Problems feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addProblemsPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_ICell_problems_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_ICell_problems_feature", "_UI_ICell_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablePackage.Literals.ICELL__PROBLEMS,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Row Element feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addRowElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_EObjectCell_rowElement_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_EObjectCell_rowElement_feature", "_UI_EObjectCell_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablePackage.Literals.EOBJECT_CELL__ROW_ELEMENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Column Element feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addColumnElementPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_EObjectCell_columnElement_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_EObjectCell_columnElement_feature", "_UI_EObjectCell_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablePackage.Literals.EOBJECT_CELL__COLUMN_ELEMENT,

-				 true,

-				 false,

-				 true,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns EObjectCell.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EObjectCell")); //$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_EObjectCell_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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.java
deleted file mode 100644
index 45367f1b12b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableEditPlugin.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
deleted file mode 100644
index 92524a22eb0..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/NattableItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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 keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected PasteProblemItemProvider pasteProblemItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createPasteProblemAdapter() {

-		if (pasteProblemItemProvider == null) {

-			pasteProblemItemProvider = new PasteProblemItemProvider(this);

-		}

-

-		return pasteProblemItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObjectCellItemProvider eObjectCellItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createEObjectCellAdapter() {

-		if (eObjectCellItemProvider == null) {

-			eObjectCellItemProvider = new EObjectCellItemProvider(this);

-		}

-

-		return eObjectCellItemProvider;

-	}

-

-	/**

-	 * 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();

-		if (pasteProblemItemProvider != null) pasteProblemItemProvider.dispose();

-		if (eObjectCellItemProvider != null) eObjectCellItemProvider.dispose();

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/PasteProblemItemProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/PasteProblemItemProvider.java
deleted file mode 100644
index caf80c0a2a4..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/PasteProblemItemProvider.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.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.PasteProblem;

-

-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.PasteProblem} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class PasteProblemItemProvider

-	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 PasteProblemItemProvider(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);

-

-			addPastedTextPropertyDescriptor(object);

-			addUnresolvedTextPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Pasted Text feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addPastedTextPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_PasteProblem_pastedText_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_PasteProblem_pastedText_feature", "_UI_PasteProblem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablePackage.Literals.PASTE_PROBLEM__PASTED_TEXT,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Unresolved Text feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addUnresolvedTextPropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_PasteProblem_unresolvedText_feature"), //$NON-NLS-1$

-				 getString("_UI_PropertyDescriptor_description", "_UI_PasteProblem_unresolvedText_feature", "_UI_PasteProblem_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-				 NattablePackage.Literals.PASTE_PROBLEM__UNRESOLVED_TEXT,

-				 true,

-				 false,

-				 false,

-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This returns PasteProblem.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PasteProblem")); //$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 = ((PasteProblem)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_PasteProblem_type") : //$NON-NLS-1$

-			getString("_UI_PasteProblem_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(PasteProblem.class)) {

-			case NattablePackage.PASTE_PROBLEM__PASTED_TEXT:

-			case NattablePackage.PASTE_PROBLEM__UNRESOLVED_TEXT:

-				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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
deleted file mode 100644
index 506f103237a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.edit/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/provider/TableItemProvider.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.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.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);

-			childrenFeatures.add(NattablePackage.Literals.TABLE__CELLS);

-		}

-		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:

-			case NattablePackage.TABLE__CELLS:

-				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()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(NattablePackage.Literals.TABLE__CELLS,

-				 NattableFactory.eINSTANCE.createEObjectCell()));

-	}

-

-	/**

-	 * 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/.classpath b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/.classpath
deleted file mode 100644
index 6fcb8da997b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src-gen"/>

-	<classpathentry kind="src" path="custom-src"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/.project b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/.project
deleted file mode 100644
index 73a89553556..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index 97b7f9287ad..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.nattable.model.editor.customeditors,

- 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

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="0.10.1";visibility:=reexport,

- 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.1"

-Bundle-Vendor: %providerName

-Bundle-Version: 0.10.1.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.pr

- esentation.NattableEditorPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.editor;s

- ingleton:=true

-

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/about.html b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/build.properties
deleted file mode 100644
index c53991b03c5..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableEditor.java
deleted file mode 100644
index 469b74e9c32..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableEditor.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMIResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- * 

- * @author vl222926

- * 

- */

-public class CustomNattableEditor extends NattableEditor {

-

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(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 : getEditingDomain().getResourceSet().getResources()) {

-					if((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if(resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisEditor.java
deleted file mode 100644
index c9f4bdd9909..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisEditor.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMIResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.presentation.NattableaxisEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- * 

- * @author vl222926

- * 

- */

-public class CustomNattableaxisEditor extends NattableaxisEditor {

-

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(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 : getEditingDomain().getResourceSet().getResources()) {

-					if((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if(resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisconfigurationEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisconfigurationEditor.java
deleted file mode 100644
index 78b188bd0d6..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisconfigurationEditor.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMIResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.presentation.NattableaxisconfigurationEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- * 

- * @author vl222926

- * 

- */

-public class CustomNattableaxisconfigurationEditor extends NattableaxisconfigurationEditor {

-

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(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 : getEditingDomain().getResourceSet().getResources()) {

-					if((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if(resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisproviderEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisproviderEditor.java
deleted file mode 100644
index ef77164ff01..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableaxisproviderEditor.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMIResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.presentation.NattableaxisproviderEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- * 

- * @author vl222926

- * 

- */

-public class CustomNattableaxisproviderEditor extends NattableaxisproviderEditor {

-

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(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 : getEditingDomain().getResourceSet().getResources()) {

-					if((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if(resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableconfigurationEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableconfigurationEditor.java
deleted file mode 100644
index d61f2f422a9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattableconfigurationEditor.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMIResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- * 

- * @author vl222926

- * 

- */

-public class CustomNattableconfigurationEditor extends NattableconfigurationEditor {

-

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(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 : getEditingDomain().getResourceSet().getResources()) {

-					if((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if(resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablelabelproviderEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablelabelproviderEditor.java
deleted file mode 100644
index a5a004895af..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattablelabelproviderEditor.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMIResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.presentation.NattablelabelproviderEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- * 

- * @author vl222926

- * 

- */

-public class CustomNattablelabelproviderEditor extends NattablelabelproviderEditor {

-

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(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 : getEditingDomain().getResourceSet().getResources()) {

-					if((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if(resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattabletesterEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattabletesterEditor.java
deleted file mode 100644
index cf7f43a0b44..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/custom-src/org/eclipse/papyrus/infra/nattable/model/editor/customeditors/CustomNattabletesterEditor.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.eclipse.papyrus.infra.nattable.model.editor.customeditors;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.XMIResource;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.presentation.NattableconfigurationEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.presentation.NattabletesterEditor;

-import org.eclipse.papyrus.infra.nattable.model.nattable.presentation.NattableEditorPlugin;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-/**

- * This class allows to override the save options

- * 

- * @author vl222926

- * 

- */

-public class CustomNattabletesterEditor extends NattabletesterEditor {

-

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated NOT

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-		saveOptions.put(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 : getEditingDomain().getResourceSet().getResources()) {

-					if((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !getEditingDomain().isReadOnly(resource)) {

-						try {

-							long timeStamp = resource.getTimeStamp();

-							resource.save(saveOptions);

-							if(resource.getTimeStamp() != timeStamp) {

-								savedResources.add(resource);

-							}

-						} catch (Exception exception) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-						first = false;

-					}

-				}

-			}

-		};

-

-		this.updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)this.editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		this.updateProblemIndication = true;

-		updateProblemIndication();

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableModelFile.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableModelFile.gif
deleted file mode 100644
index 7ede4ac8f48..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableModelFile.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisModelFile.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisModelFile.gif
deleted file mode 100644
index e5c6e175f7f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisModelFile.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisconfigurationModelFile.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisconfigurationModelFile.gif
deleted file mode 100644
index b7c1ce53490..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisconfigurationModelFile.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisproviderModelFile.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisproviderModelFile.gif
deleted file mode 100644
index 682f807656d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableaxisproviderModelFile.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableconfigurationModelFile.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableconfigurationModelFile.gif
deleted file mode 100644
index 53eb7d4f381..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattableconfigurationModelFile.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattablecontentproviderModelFile.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattablecontentproviderModelFile.gif
deleted file mode 100644
index 8315589c999..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattablecontentproviderModelFile.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattablelabelproviderModelFile.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattablelabelproviderModelFile.gif
deleted file mode 100644
index a28ab58d892..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattablelabelproviderModelFile.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattabletesterModelFile.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattabletesterModelFile.gif
deleted file mode 100644
index e33a30532a9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/obj16/NattabletesterModelFile.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattable.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattable.gif
deleted file mode 100644
index e3b9c14a6a6..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattable.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxis.gif
deleted file mode 100644
index caab2147182..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxisconfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxisconfiguration.gif
deleted file mode 100644
index 84d170d6289..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxisconfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxisprovider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxisprovider.gif
deleted file mode 100644
index 11a22401185..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableaxisprovider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableconfiguration.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableconfiguration.gif
deleted file mode 100644
index 5306a816d4c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattableconfiguration.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattablecontentprovider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattablecontentprovider.gif
deleted file mode 100644
index a6b42e7444a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattablecontentprovider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattablelabelprovider.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattablelabelprovider.gif
deleted file mode 100644
index 738d68dbfe7..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattablelabelprovider.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattabletester.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattabletester.gif
deleted file mode 100644
index a1aafe674b8..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/icons/full/wizban/NewNattabletester.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.pdoc b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.pdoc
deleted file mode 100644
index 0f9d81c7a7c..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
deleted file mode 100644
index 6fa9b96d89e..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
deleted file mode 100644
index fa7158fd1b9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.xml
+++ /dev/null
@@ -1,223 +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

-   <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

-   <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

-

-   <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

-

-   <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

-   <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

-</plugin>

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java b/sandbox/pasteInNewTable/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 5f675eb4a5d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisActionBarContributor.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java b/sandbox/pasteInNewTable/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 f6c0a0ce1f3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisEditor.java
+++ /dev/null
@@ -1,1847 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.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.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.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;

-

-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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-

-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.ui.actions.WorkspaceModifyOperation;

-

-

-/**

- * 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

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					for (Resource resource : editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java b/sandbox/pasteInNewTable/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 1f7362ff305..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/presentation/NattableaxisModelWizard.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java b/sandbox/pasteInNewTable/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 9c01fc20c8f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationActionBarContributor.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java b/sandbox/pasteInNewTable/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 c61ab8e20f3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationEditor.java
+++ /dev/null
@@ -1,1847 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.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.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.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;

-

-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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.provider.NattableaxisconfigurationItemProviderAdapterFactory;

-

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.provider.NattableaxisItemProviderAdapterFactory;

-

-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.ui.actions.WorkspaceModifyOperation;

-

-

-/**

- * 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

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					for (Resource resource : editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java b/sandbox/pasteInNewTable/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 bb1dd9f27bc..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/presentation/NattableaxisconfigurationModelWizard.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java b/sandbox/pasteInNewTable/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 38232d627ac..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderActionBarContributor.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java b/sandbox/pasteInNewTable/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 d7d35c69b7d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderEditor.java
+++ /dev/null
@@ -1,1847 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.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.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.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;

-

-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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.provider.NattableaxisproviderItemProviderAdapterFactory;

-

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-

-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.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.ui.actions.WorkspaceModifyOperation;

-

-

-/**

- * 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

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					for (Resource resource : editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java b/sandbox/pasteInNewTable/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 12f08992a97..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/presentation/NattableaxisproviderModelWizard.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java b/sandbox/pasteInNewTable/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 f8ed375cf80..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationActionBarContributor.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java b/sandbox/pasteInNewTable/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 9d135c0e622..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationEditor.java
+++ /dev/null
@@ -1,1847 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.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.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.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;

-

-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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.provider.NattableconfigurationItemProviderAdapterFactory;

-

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-

-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.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.ui.actions.WorkspaceModifyOperation;

-

-

-/**

- * 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

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					for (Resource resource : editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java b/sandbox/pasteInNewTable/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 4e867965460..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/presentation/NattableconfigurationModelWizard.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java b/sandbox/pasteInNewTable/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 946875ffbb6..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderActionBarContributor.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java b/sandbox/pasteInNewTable/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 b4aac8cae49..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderEditor.java
+++ /dev/null
@@ -1,1847 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.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.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.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;

-

-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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.provider.NattablelabelproviderItemProviderAdapterFactory;

-

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-

-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.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.ui.actions.WorkspaceModifyOperation;

-

-

-/**

- * 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

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					for (Resource resource : editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java b/sandbox/pasteInNewTable/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 120c5481284..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/presentation/NattablelabelproviderModelWizard.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java b/sandbox/pasteInNewTable/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 4f69b1fc04d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterActionBarContributor.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java b/sandbox/pasteInNewTable/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 d8e030b6216..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterEditor.java
+++ /dev/null
@@ -1,1847 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.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.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.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;

-

-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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.provider.NattabletesterItemProviderAdapterFactory;

-

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-

-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.presentation.NattableEditorPlugin;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-

-/**

- * 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

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					for (Resource resource : editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java b/sandbox/pasteInNewTable/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 dfc6fad1fba..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/presentation/NattabletesterModelWizard.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
deleted file mode 100644
index f759249ec5e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableActionBarContributor.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
deleted file mode 100644
index b5f35b1d20a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditor.java
+++ /dev/null
@@ -1,1845 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.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.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.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;

-

-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.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.provider.NattableItemProviderAdapterFactory;

-

-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

-

-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.ui.actions.WorkspaceModifyOperation;

-

-

-/**

- * 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

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-			new WorkspaceModifyOperation() {

-				// This is the method that gets invoked when the operation runs.

-				//

-				@Override

-				public void execute(IProgressMonitor monitor) {

-					// Save the resources to the file system.

-					//

-					boolean first = true;

-					for (Resource resource : editingDomain.getResourceSet().getResources()) {

-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-							try {

-								long timeStamp = resource.getTimeStamp();

-								resource.save(saveOptions);

-								if (resource.getTimeStamp() != timeStamp) {

-									savedResources.add(resource);

-								}

-							}

-							catch (Exception exception) {

-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-							}

-							first = false;

-						}

-					}

-				}

-			};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		}

-		catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			NattableEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		}

-		catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-			getActionBars().getStatusLineManager() != null ?

-				getActionBars().getStatusLineManager().getProgressMonitor() :

-				new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.java
deleted file mode 100644
index 4693b829f05..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableEditorPlugin.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
deleted file mode 100644
index 869411759bf..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model.editor/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/presentation/NattableModelWizard.java
+++ /dev/null
@@ -1,637 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/.classpath b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/.classpath
deleted file mode 100644
index 992d69411e1..00000000000
--- a/sandbox/pasteInNewTable/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/JavaSE-1.6"/>

-	<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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/.project b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/.project
deleted file mode 100644
index a3bcea911c8..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.core.resources.prefs b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index f05f0ea1319..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1

-encoding//model/nattable.ecorediag=UTF-8

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.jdt.ui.prefs b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 0aac03f3f7a..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
deleted file mode 100644
index 5a788a1afd9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,37 +0,0 @@
-Manifest-Version: 1.0

-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

-Bundle-ClassPath: .

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-Version: 0.10.1.qualifier

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model;singleton:=true

-

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/about.html b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/build.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/build.properties
deleted file mode 100644
index bf31424da52..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
deleted file mode 100644
index 1ac64d4c53b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
+++ /dev/null
@@ -1,653 +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">

-  <eAnnotations source="http://www.eclipse.org/OCL/Import">

-    <details key="ecore" value="http://www.eclipse.org/emf/2002/Ecore#/"/>

-  </eAnnotations>

-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">

-    <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>

-    <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>

-    <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>

-  </eAnnotations>

-  <eClassifiers xsi:type="ecore:EClass" name="Table" eSuperTypes="#//nattableconfiguration/TableNamedElement">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">

-      <details key="constraints" value="currentRowAxisInHistory currentColumnAxisInHistory"/>

-    </eAnnotations>

-    <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">

-      <details key="currentRowAxisInHistory" value="rowAxisProvidersHistory->includes(currentRowAxisProvider)"/>

-      <details key="currentColumnAxisInHistory" value="columnAxisProvidersHistory->includes(currentColumnAxisProvider)"/>

-    </eAnnotations>

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="This object represents the table. It is used to save the interesting informations of the graphical table.&#xD;&#xA;&#xD;&#xA;The currentAxisProviders can be : Master/Master, Master/Slave, Slave/Master and never Slave/Slave."/>

-    </eAnnotations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="context" lowerBound="1"

-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="The context is used for two things : &#xD;&#xA;&lt;ul> &lt;li>&quot;virtual&quot; parent to display the table in the Papyrus Model Explorer &lt;/li>&#xD;&#xA;&lt;li>container of the objects created in the table&lt;/li>&#xD;&#xA;&lt;/ul> &#xD;&#xA;The context can't be null;"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="tableConfiguration" lowerBound="1"

-        eType="#//nattableconfiguration/TableConfiguration">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Reference the configuration used by the table. This field can't be null."/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="invertAxis" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="If true, the axis will be inverted on the screen. When the user inverts the axis, &#xD;&#xA;only this boolean is changed. We must not invert the currentRowAxis and the currentColumnAxis neither the histories or the AxisConfiguration"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="columnAxisProvidersHistory"

-        lowerBound="1" upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider"

-        containment="true">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="This list contains all the columns configurations already used by the user and saved in this list by him."/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="rowAxisProvidersHistory"

-        lowerBound="1" upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider"

-        containment="true">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="This list contains all the rowsconfigurations already used by the user and saved in this list by him."/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="localRowHeaderAxisConfiguration"

-        eType="#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration" containment="true">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="This field contains the row headerAxisConfiguration. It could be null. &#xD;&#xA;In this case we use the row TableHeaderAxisConfiguration stored in the TableConfiguration of this table."/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="localColumnHeaderAxisConfiguration"

-        eType="#//nattableaxisconfiguration/LocalTableHeaderAxisConfiguration" containment="true">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="This field contains the columnheaderAxisConfiguration. It could be null. &#xD;&#xA;In this case we use the column TableHeaderAxisConfiguration stored in the TableConfiguration of this table."/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="currentRowAxisProvider"

-        lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="References the current row AxisProvider used in the table.&#xD;&#xA;The value must be owned by rowAxisProviderHistory"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="currentColumnAxisProvider"

-        lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="References the current column AxisProvider used in the table.&#xD;&#xA;The value must be owned by column AxisProviderHistory"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="cells" upperBound="-1"

-        eType="#//ICell" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ICell" abstract="true" interface="true">

-    <eOperations name="getRowElement" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-    <eOperations name="getColumnElement" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="problems" upperBound="-1"

-        eType="#//Problem"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Problem" abstract="true" interface="true"

-      eSuperTypes="#//nattableconfiguration/TableNamedElement"/>

-  <eClassifiers xsi:type="ecore:EClass" name="PasteProblem" eSuperTypes="#//Problem">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="pastedText" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unresolvedText" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="EObjectCell" eSuperTypes="#//ICell">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="rowElement" lowerBound="1"

-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="columnElement" lowerBound="1"

-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </eClassifiers>

-  <eSubpackages name="nattableconfiguration" nsURI="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"

-      nsPrefix="nattableconfiguration">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">

-      <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>

-      <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>

-      <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>

-    </eAnnotations>

-    <eClassifiers xsi:type="ecore:EClass" name="TableNamedElement" abstract="true"

-        eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EModelElement">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Abstract Element used in this metamodel for named element which have a description."/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The description of the named element."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The name of the named element."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="TableConfiguration" eSuperTypes="#//nattableconfiguration/TableNamedElement">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">

-        <details key="constraints" value="defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">

-        <details key="defaultRowAxisProviderExistsInCollection" value="rowAxisProviders->includes(defaultRowAxisProvider)"/>

-        <details key="defaultColumnAxisProviderExistsInCollection" value="columnAxisProviders->includes(defaultColumnAxisProvider)"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="This object is used to configure a table. To create a new type of table, you must create &#xD;&#xA;a new file *.nattableConfiguration and register it using the extension point org.eclipse.papyrus.infra.nattable.configuration&#xD;&#xA;&#xD;&#xA;the defaultAxisProviders can be : Master/Master, Master/Slave, Slave/Master and never Slave/Slave."/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The type of the table. This value is used to be able to open/close easily the table editor in Papyrus. &#xD;&#xA;Moreover it allows to distinghuish easily the table."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The path of the icon to use for the table which references this TableConfiguration."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="creationTester" eType="#//nattabletester/AbstractTableTester"

-          containment="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This value could be null. The tester is used to know if this tableConfiguration can be used&#xD;&#xA;to create a new table using as context the selected element."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="cellEditorDeclaration"

-          lowerBound="1" eType="#//nattableconfiguration/CellEditorDeclaration" defaultValueLiteral="COLUMN">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This value can't be null. Indicates how the CellEditor must be declared. &#xD;&#xA;In the common table, we display features as columns and objects as line. &#xD;&#xA;In this case the cell editors are specific to features, so the cell editor must be declared on the columns."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="rowHeaderAxisConfiguration"

-          lowerBound="1" eType="#//nattableaxisconfiguration/TableHeaderAxisConfiguration"

-          containment="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This value can't be null. Gives the initial row configuration of the table."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="columnHeaderAxisConfiguration"

-          lowerBound="1" eType="#//nattableaxisconfiguration/TableHeaderAxisConfiguration"

-          containment="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This value can't be null. Gives the initial column configuration of the table."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="columnAxisProviders"

-          lowerBound="1" upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider"

-          containment="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This list can't be empty. Contains list of possible column AxisProvider for the table."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="rowAxisProviders" lowerBound="1"

-          upperBound="-1" eType="#//nattableaxisprovider/AbstractAxisProvider" containment="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This list can't be empty. Contains a list of possible row AxisProvider for the table."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="defaultRowAxisProvider"

-          lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This value can't be null. References the Axis Provider to use by default for rows."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="defaultColumnAxisProvider"

-          lowerBound="1" eType="#//nattableaxisprovider/AbstractAxisProvider">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This value can't be null. References the Axis Provider to use by default for columns."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EEnum" name="CellEditorDeclaration">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Indicates how the CellEditor must be declared. &#xD;&#xA;In the common table, we display features as columns and objects as line. &#xD;&#xA;In this case the cell editors are specific to features, so the cell editor must be declared on the columns."/>

-      </eAnnotations>

-      <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="http://www.eclipse.org/emf/2002/Ecore#//EModelElement #//nattableconfiguration/TableNamedElement">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Abstract Element for the AxisProvider. This one only provides a method getAxis()."/>

-      </eAnnotations>

-      <eOperations name="getAxis" upperBound="-1" eType="#//nattableaxis/IAxis">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This method must returns the IAxis owned by the AxisProvider.&#xD;&#xA;Warning, in case of syncrhonized table, the list often will be empty. This method&#xD;&#xA;only returns the IAxis serialized in the model. Displayed elements are not necessary serialized.&#xD;&#xA;"/>

-        </eAnnotations>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="IMasterAxisProvider" abstract="true"

-        interface="true" eSuperTypes="#//nattableaxisprovider/AxisProvider">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Interface used to distinghuish master axis provider from slave axis provider. &#xD;&#xA;The master are able to disconnect the slave."/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="disconnectSlave" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="if true, the slave won't be updated when the elements owned by the master will be changed."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ISlaveAxisProvider" abstract="true"

-        interface="true" eSuperTypes="#//nattableaxisprovider/AxisProvider">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Interface used to distinghuish the master from the slave axis provider."/>

-      </eAnnotations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="AxisProvider" abstract="true" eSuperTypes="#//nattableaxisprovider/AbstractAxisProvider">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="AbstractAxisProvider. This one owns IAxis"/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="axis" upperBound="-1"

-          eType="#//nattableaxis/IAxis" containment="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="IAxis owned by the AxisProvider. The list can be empty in case of synchronized table."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="SlaveObjectAxisProvider" eSuperTypes="#//nattableaxisprovider/ISlaveAxisProvider">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Concret implementation of ISlaveAxisProvider"/>

-      </eAnnotations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="MasterObjectAxisProvider" eSuperTypes="#//nattableaxisprovider/IMasterAxisProvider">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Concret implementation of IMasterAxisProvider"/>

-      </eAnnotations>

-    </eClassifiers>

-  </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="http://www.eclipse.org/emf/2002/Ecore#//EModelElement">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Common Interface for LabelProviderConfiguration"/>

-      </eAnnotations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="FeatureLabelProviderConfiguration"

-        eSuperTypes="#//nattablelabelprovider/ObjectLabelProviderConfiguration">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="LabelProviderConfiguration for Feature. In case of Feature. we have two display options : &#xD;&#xA;&lt;ul>&lt;li>display the icon of the feature &lt;/li> &#xD;&#xA;&lt;li>display the label of the feature &lt;/li>&#xD;&#xA;&lt;li>display the multiplicity of the feature &lt;/li>&#xD;&#xA;&lt;li>display the type of the feature &lt;/li>&#xD;&#xA;&lt;li>display the '/' for isDerived of the feature &lt;/li>&#xD;&#xA;&lt;li>display the name of the feature &lt;/li>&#xD;&#xA; &lt;/ul>"/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayIsDerived" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

-          defaultValueLiteral="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="If true, we will display the '/' for isDerived"/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayType" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

-          defaultValueLiteral="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="If true, we will display the typeof the feature"/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayMultiplicity"

-          lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

-          defaultValueLiteral="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="If true, we will display the multiplicity of the feature"/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

-          defaultValueLiteral="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="If true, we will display the name of the feature"/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ObjectLabelProviderConfiguration"

-        eSuperTypes="#//nattablelabelprovider/ILabelProviderConfiguration">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="LabelProviderConfiguration for Object. In case of Object we have two display options : &#xD;&#xA;&lt;ul>&lt;li>display the icon of the object&lt;/li> &#xD;&#xA;&lt;li>display the label of the object&lt;/li> &lt;/ul>"/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayIcon" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

-          defaultValueLiteral="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="If true, we will display the icon of the object"/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayLabel" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

-          defaultValueLiteral="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="If true, we will display the label of the object"/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="nattableaxisconfiguration" nsURI="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration"

-      nsPrefix="nattableaxisconfiguration">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">

-      <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>

-      <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>

-      <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>

-    </eAnnotations>

-    <eClassifiers xsi:type="ecore:EClass" name="AbstractHeaderAxisConfiguration" abstract="true"

-        eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EModelElement">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">

-        <details key="constraints" value="oneObjectLabelConfigurationTypes oneFeatureLabelConfigurationTypes"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">

-        <details key="oneObjectLabelConfigurationTypes" value="ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::ObjectLabelProviderConfiguration))->size() &lt;= 1"/>

-        <details key="oneFeatureLabelConfigurationTypes" value="ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::FeatureLabelProviderConfiguration))->size() &lt;= 1"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Abstract Class for the HeaderAxisConfiguration. This class provides : &#xD;&#xA;&lt;ul>&lt;li>informations on the appearance of the header&lt;/li>&#xD;&#xA;&lt;li> a list of label configuration which can be used by the header&lt;/li>&#xD;&#xA;&lt;li> a list of axisConfiguration. These axis configuration are used to provide the contents of the axis&lt;/li>&#xD;&#xA;&lt;/ul>"/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="indexStyle" lowerBound="1"

-          eType="#//nattableaxisconfiguration/AxisIndexStyle">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This value can't be null. Indicates how to display the index of the Axis : using letter or using number."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayLabel" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

-          defaultValueLiteral="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="If true, the label header will be displayed."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayFilter" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

-          defaultValueLiteral="false">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="If true AND if the axisConfiguration is used as column, the row filter will be displayed."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayIndex" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

-          defaultValueLiteral="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="If true, the index header will be displayed."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="ownedLabelConfigurations"

-          upperBound="-1" eType="#//nattablelabelprovider/ILabelProviderConfiguration"

-          containment="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The list of the possible label configuration, referenced by the axis configuration."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAxisConfigurations"

-          upperBound="-1" eType="#//nattableaxisconfiguration/IAxisConfiguration"

-          containment="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The list of the owned axis configuration."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="AxisManagerRepresentation">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="This class is used to represents in the model the java Axis Manager."/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="axisManagerId" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This id allows to find the Java Axis Manager represented by this element.&#xD;&#xA;To find it you must use AxisManagerFactory.INSTANCE.getAxisManager(AxisManagerRepresentation)&#xD;&#xA;To register a Java Axis Manager,you must use the extension point  : org.eclipse.papyrus.infra.nattable.axismanager"/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelProviderContext"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The context on which the label provider to use for this AxisManagerRepresentation are declared.&#xD;&#xA;(see the Papyrus Label Provider Service for further informations)"/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="headerLabelConfiguration"

-          lowerBound="1" eType="#//nattablelabelprovider/ILabelProviderConfiguration">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The label provider configuration to use for the header of the axis provided by the represented AxisManager"/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="specificAxisConfigurations"

-          upperBound="-1" eType="#//nattableaxisconfiguration/IAxisConfiguration">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="A list of specific configurations to use for this axis."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="AxisManagerConfiguration">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="This object allows to define and configure a Java AxisManager"/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="localHeaderLabelConfiguration"

-          eType="#//nattablelabelprovider/ILabelProviderConfiguration">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="Reference the local header label configuration."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="axisManager" lowerBound="1"

-          eType="#//nattableaxisconfiguration/AxisManagerRepresentation">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This value can't be null. the axis manager representation"/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="localSpecificConfigurations"

-          upperBound="-1" eType="#//nattableaxisconfiguration/IAxisConfiguration">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="specific configurations for the axis manager."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="TableHeaderAxisConfiguration" eSuperTypes="#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">

-        <details key="constraints" value="axisManagersIdUnique"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">

-        <details key="axisManagersIdUnique" value="axisManagers->forAll(am1 : AxisManagerRepresentation, am2 : AxisManagerRepresentation | am1.axisManagerId &lt;> am2.axisManagerId)"/>

-      </eAnnotations>

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Defines the configuration of the axis in the TableConfiguration"/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="axisManagers" lowerBound="1"

-          upperBound="-1" eType="#//nattableaxisconfiguration/AxisManagerRepresentation"

-          containment="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This list can't be empty. The list of the AxisManager used to fill the axis."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="LocalTableHeaderAxisConfiguration"

-        eSuperTypes="#//nattableaxisconfiguration/AbstractHeaderAxisConfiguration">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Define the configuration of the axis (rows or columns) in the table."/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="axisManagerConfigurations"

-          upperBound="-1" eType="#//nattableaxisconfiguration/AxisManagerConfiguration"

-          containment="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This list contains the configuration of the axis managers used in the table."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="IAxisConfiguration" abstract="true"

-        interface="true">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Comon Interface for axis configuration."/>

-      </eAnnotations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="FeatureAxisConfiguration" eSuperTypes="#//nattableaxisconfiguration/IAxisConfiguration">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Configuration to use for Axis representing features"/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="showOnlyCommonFeature"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="If true, only the common features will be displayed on the axis."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="IFillingConfiguration" abstract="true"

-        interface="true" eSuperTypes="#//nattableaxisconfiguration/IAxisConfiguration">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Comon Interface for filling configurations."/>

-      </eAnnotations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="EStructuralFeatureValueFillingConfiguration"

-        eSuperTypes="#//nattableaxisconfiguration/IFillingConfiguration">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Configuration used to fill the table listening a feature of the context of the table"/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="listenFeature" lowerBound="1"

-          eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This field can't be null. References the feature of the context of the table to listen.&#xD;&#xA;It is possible that the context doesn't have this feature."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="IPasteConfiguration" eSuperTypes="#//nattableaxisconfiguration/IAxisConfiguration">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Common Interface for the paste configuration."/>

-      </eAnnotations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="PasteEObjectConfiguration" eSuperTypes="#//nattableaxisconfiguration/IPasteConfiguration">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Configuration to use to paste EObject in the table."/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="pastedElementId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The String representing the EClass of the elements to create (see papyrus services types for further information)"/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="pasteElementContainementFeature"

-          eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This field references the feature of the context of the table in which the created element will be added."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EEnum" name="AxisIndexStyle">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Enumeration used to describe the possible style of the index of the headers."/>

-      </eAnnotations>

-      <eLiterals name="ALPHABETIC" value="1">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="Index Headers count will be : A-B-C-...Y-Z-AA-AB-..."/>

-        </eAnnotations>

-      </eLiterals>

-      <eLiterals name="NUMERIC">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="Index Headers count will be : 1-2-3-..."/>

-        </eAnnotations>

-      </eLiterals>

-    </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="http://www.eclipse.org/emf/2002/Ecore#//EModelElement">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Abstract class for the tester."/>

-      </eAnnotations>

-      <eOperations name="getTester" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="Returns an object representing the tester"/>

-        </eAnnotations>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="JavaTableTester" eSuperTypes="#//nattabletester/AbstractTableTester">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="This class allows to references a JavaTableTester. The Java class is declared with an id, using the extension point org.eclipse.papyrus.infra.nattable.tester.&#xD;&#xA;The field tester must be the id declared in this extension point."/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="tester" lowerBound="1"

-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The id of the java tester declared using the extension point org.eclispe.papyrus.infra.nattable.tester"/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </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">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Common interface for the axis of the table. (An axis is a specific row or a specific column)"/>

-      </eAnnotations>

-      <eOperations name="getElement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="Returns the elements represented by the IAxis"/>

-        </eAnnotations>

-      </eOperations>

-      <eOperations name="getLocalLabelConfiguration" eType="#//nattablelabelprovider/ILabelProviderConfiguration">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="Returns the local label configuration to use for this IAxis. This configuration&#xD;&#xA;will override the label configuration defined in the AxisManagerConfiguration."/>

-        </eAnnotations>

-      </eOperations>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="manager" lowerBound="1"

-          eType="#//nattableaxisconfiguration/AxisManagerRepresentation">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This field can't be null. Reference the axis manager providing this IAxis."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="An element can be displayed using an alias instead of its real name."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </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">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This obejct allows to reference an element using a string instead of referencing it directly."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="EObjectAxis" eSuperTypes="#//nattableaxis/ObjectAxis">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"

-          eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="This IAxis allows to reference an EObject."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="FeatureAxis" abstract="true" eSuperTypes="#//nattableaxis/IAxis">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Abstract class used to reference features."/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="localLabelConfiguration"

-          eType="#//nattablelabelprovider/FeatureLabelProviderConfiguration" containment="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="Returns the local label configuration to use for this IAxis. This configuration&#xD;&#xA;will override the label configuration defined in the AxisManagerConfiguration."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ObjectAxis" abstract="true" eSuperTypes="#//nattableaxis/IAxis">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="Abstract class used to reference object"/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="localLabelConfiguration"

-          eType="#//nattablelabelprovider/ObjectLabelProviderConfiguration" containment="true">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="Returns the local label configuration to use for this IAxis. This configuration&#xD;&#xA;will override the label configuration defined in the AxisManagerConfiguration."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="FeatureIdAxis" eSuperTypes="#//nattableaxis/IdAxis #//nattableaxis/FeatureAxis">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="IAxis used to represent feature using a string."/>

-      </eAnnotations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="EStructuralFeatureAxis" eSuperTypes="#//nattableaxis/FeatureAxis">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="IAxis used to reference EMF EStructuralFeature."/>

-      </eAnnotations>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"

-          eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature">

-        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-          <details key="documentation" value="The represented EStructuralFeature."/>

-        </eAnnotations>

-      </eStructuralFeatures>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ObjectIdAxis" eSuperTypes="#//nattableaxis/IdAxis #//nattableaxis/ObjectAxis">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="IAxis used to represent object using a string."/>

-      </eAnnotations>

-    </eClassifiers>

-  </eSubpackages>

-</ecore:EPackage>

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
deleted file mode 100644
index 3342f7c106f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecorediag
+++ /dev/null
@@ -1,1001 +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="_EhRWeKHtEeKNUa7kbzEWsw" type="3003" source="_EffN3aHtEeKNUa7kbzEWsw" target="_EfVc_aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhRWeaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhRWeqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhRWe6HtEeKNUa7kbzEWsw" points="[0, 0, -120, 102]$[0, -30, -120, 72]$[120, -30, 0, 72]$[120, -102, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGE6HtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGFKHtEeKNUa7kbzEWsw" id="(0.2072072072072072,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhbHdKHtEeKNUa7kbzEWsw" type="3003" source="_EffOAaHtEeKNUa7kbzEWsw" target="_EfVdLaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhbHdaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhbHdqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhbHd6HtEeKNUa7kbzEWsw" points="[-3, 0, 19, 114]$[-3, -114, 19, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGB6HtEeKNUa7kbzEWsw" id="(0.2931726907630522,0.014705882352941176)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGCKHtEeKNUa7kbzEWsw" id="(0.25,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhkRUKHtEeKNUa7kbzEWsw" type="3003" source="_EffNxaHtEeKNUa7kbzEWsw" target="_EffN9aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRUaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRUqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRU6HtEeKNUa7kbzEWsw" points="[0, 0, -111, 94]$[0, -30, -111, 64]$[111, -30, 0, 64]$[111, -94, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DKHtEeKNUa7kbzEWsw" id="(0.7477477477477478,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DaHtEeKNUa7kbzEWsw" id="(0.24806201550387597,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhkRVKHtEeKNUa7kbzEWsw" type="3003" source="_EffNxaHtEeKNUa7kbzEWsw" target="_EffN6aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRVaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRVqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRV6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 102]$[0, -102, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8DqHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8D6HtEeKNUa7kbzEWsw" id="(0.5765765765765766,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhkRWKHtEeKNUa7kbzEWsw" type="3003" source="_EffN3aHtEeKNUa7kbzEWsw" target="_EffN9aHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhkRWaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhkRWqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhkRW6HtEeKNUa7kbzEWsw" points="[0, 0, 0, 94]$[0, -94, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEaHtEeKNUa7kbzEWsw" id="(0.4954954954954955,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGEqHtEeKNUa7kbzEWsw" id="(0.49612403100775193,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhuCUKHtEeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EffODaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_EhuCVKHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhuCVaHtEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_EhuCVqHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_EhuCV6HtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhuCUaHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhuCUqHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/creationTester"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhuCU6HtEeKNUa7kbzEWsw" points="[0, 0, 89, 284]$[-89, -284, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8IqHtEeKNUa7kbzEWsw" id="(0.05964912280701754,0.0427807486631016)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ejp8I6HtEeKNUa7kbzEWsw" id="(0.8920454545454546,0.9705882352941176)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_EhuCWKHtEeKNUa7kbzEWsw" type="3003" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_EhuCWaHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_EhuCWqHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EhuCW6HtEeKNUa7kbzEWsw" points="[-169, 0, 1, 431]$[-169, -427, 1, 4]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGIaHtEeKNUa7kbzEWsw" id="(0.9403508771929825,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EjzGIqHtEeKNUa7kbzEWsw" id="(0.8012048192771084,0.9529411764705882)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Ek_YzqHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EffOPaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y0qHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y06HtEeKNUa7kbzEWsw" x="-10" y="-10"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y1KHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y1aHtEeKNUa7kbzEWsw" x="10" y="10"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Yz6HtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y0KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/tableConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y0aHtEeKNUa7kbzEWsw" points="[9, -10, 0, 336]$[9, -340, 0, 6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ir5h8KHtEeKNUa7kbzEWsw" id="(0.8552631578947368,0.07534246575342465)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kbepMKHtEeKNUa7kbzEWsw" id="(0.3087719298245614,0.9411764705882353)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Ek_Y1qHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y2qHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y26HtEeKNUa7kbzEWsw" x="-335" y="102"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y3KHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y3aHtEeKNUa7kbzEWsw" x="-325" y="20"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Y16HtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y2KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/columnAxisProvidersHistory"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y2aHtEeKNUa7kbzEWsw" points="[-146, 0, 271, 460]$[-411, 0, 6, 460]$[-411, -453, 6, 7]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7tvZUKHuEeKNUa7kbzEWsw" id="(0.9736842105263158,0.726027397260274)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6fePYKHuEeKNUa7kbzEWsw" id="(0.6073825503355704,0.8970588235294118)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_Ek_Y3qHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y4qHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y46HtEeKNUa7kbzEWsw" x="-356" y="129"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_Ek_Y5KHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ek_Y5aHtEeKNUa7kbzEWsw" x="-356" y="37"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ek_Y36HtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_Ek_Y4KHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/rowAxisProvidersHistory"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ek_Y4aHtEeKNUa7kbzEWsw" points="[-145, 0, 308, 485]$[-445, 0, 8, 485]$[-445, -480, 8, 5]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8EDnkKHuEeKNUa7kbzEWsw" id="(0.9671052631578947,0.910958904109589)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__1i8MKHuEeKNUa7kbzEWsw" id="(0.4798657718120805,0.9264705882352942)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ElJJ0KHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_ElJJ1KHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ1aHtEeKNUa7kbzEWsw" x="-309" y="104"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ElJJ1qHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ16HtEeKNUa7kbzEWsw" x="-308" y="19"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ0aHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ0qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentRowAxisProvider"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ06HtEeKNUa7kbzEWsw" points="[-137, 0, 235, 423]$[-372, 0, 0, 423]$[-372, -420, 0, 3]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ETwEKHuEeKNUa7kbzEWsw" id="(0.9144736842105263,0.4931506849315068)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AyW7AKH1EeKNUa7kbzEWsw" id="(0.7281879194630873,0.9558823529411765)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ElJJ2KHtEeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfMS6aHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_ElJJ3KHtEeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ3aHtEeKNUa7kbzEWsw" x="-235" y="120"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_ElJJ3qHtEeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ElJJ36HtEeKNUa7kbzEWsw" x="-230" y="31"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ2aHtEeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ2qHtEeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/currentColumnAxisProvider"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ26HtEeKNUa7kbzEWsw" points="[-90, 0, 197, 386]$[-287, 0, 0, 386]$[-287, -384, 0, 2]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0FtQ8KHuEeKNUa7kbzEWsw" id="(0.6052631578947368,0.2465753424657534)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vXzXYKHuEeKNUa7kbzEWsw" id="(0.8557046979865772,0.9705882352941176)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_ElJJ4KHtEeKNUa7kbzEWsw" type="3003" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EffOJaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_ElJJ4aHtEeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_ElJJ4qHtEeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ElJJ46HtEeKNUa7kbzEWsw" points="[5, 40, -4, 1013]$[315, 40, 306, 1013]$[315, -931, 306, 42]$[34, -931, 25, 42]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zdYFoKHuEeKNUa7kbzEWsw" id="(0.9671052631578947,0.2328767123287671)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a_dasKHtEeKNUa7kbzEWsw" id="(0.8493975903614458,0.011764705882352941)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_FIJaHKH2EeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMTDaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_FIJaIKH2EeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaIaH2EeKNUa7kbzEWsw" x="-118" y="-19"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_FIJaIqH2EeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaI6H2EeKNUa7kbzEWsw" x="-3" y="-24"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FIJaHaH2EeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_FIJaHqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/rowHeaderAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FIJaH6H2EeKNUa7kbzEWsw" points="[0, -7, 691, 404]$[0, -493, 691, -82]$[-682, -493, 9, -82]$[-682, -412, 9, -1]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JJrV0KH2EeKNUa7kbzEWsw" id="(0.5578947368421052,0.0427807486631016)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_a5to8KH2EeKNUa7kbzEWsw" id="(0.8190954773869347,0.03333333333333333)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_FIJaJKH2EeKNUa7kbzEWsw" type="3002" source="_EffOPaHtEeKNUa7kbzEWsw" target="_EfMTDaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_FIJaKKH2EeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FIJaKaH2EeKNUa7kbzEWsw" x="-31" y="28"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_FITLEKH2EeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FITLEaH2EeKNUa7kbzEWsw" x="79" y="13"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_FIJaJaH2EeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_FIJaJqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//nattableconfiguration/TableConfiguration/columnHeaderAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FIJaJ6H2EeKNUa7kbzEWsw" points="[-7, -8, 798, 384]$[-7, -518, 798, -126]$[-805, -518, 0, -126]$[-805, -413, 0, -21]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PMCg4KH2EeKNUa7kbzEWsw" id="(0.9438596491228071,0.0481283422459893)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OSd0kKH2EeKNUa7kbzEWsw" id="(0.7989949748743719,0.36666666666666664)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_hoQknKH2EeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfVczaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_hoQkoKH2EeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkoaH2EeKNUa7kbzEWsw" x="-955" y="189"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hoQkoqH2EeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQko6H2EeKNUa7kbzEWsw" x="-949" y="65"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hoQknaH2EeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hoQknqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localRowHeaderAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hoQkn6H2EeKNUa7kbzEWsw" points="[7, 5, 915, 798]$[7, 211, 915, 1004]$[-598, 211, 310, 1004]$[-608, -793, 300, 0]$[-906, -793, 2, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NyG_cKJ4EeKNUa7kbzEWsw" id="(0.7894736842105263,0.9657534246575342)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uz2j4KJ4EeKNUa7kbzEWsw" id="(0.9912663755458515,0.45)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_hoQkpKH2EeKNUa7kbzEWsw" type="3002" source="_Ek_YwKHtEeKNUa7kbzEWsw" target="_EfVczaHtEeKNUa7kbzEWsw">

-    <children xmi:type="notation:Node" xmi:id="_hoQkqKH2EeKNUa7kbzEWsw" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkqaH2EeKNUa7kbzEWsw" x="-394" y="-888"/>

-    </children>

-    <children xmi:type="notation:Node" xmi:id="_hoQkqqH2EeKNUa7kbzEWsw" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hoQkq6H2EeKNUa7kbzEWsw" x="-246" y="-893"/>

-    </children>

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_hoQkpaH2EeKNUa7kbzEWsw" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_hoQkpqH2EeKNUa7kbzEWsw" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

-    <element xmi:type="ecore:EReference" href="nattable.ecore#//Table/localColumnHeaderAxisConfiguration"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hoQkp6H2EeKNUa7kbzEWsw" points="[1, 6, 843, 815]$[1, 131, 843, 940]$[-480, 131, 362, 940]$[-480, -803, 362, 6]$[-838, -803, 4, 6]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NTAooKJ4EeKNUa7kbzEWsw" id="(0.3355263157894737,0.958904109589041)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m2_6UKH2EeKNUa7kbzEWsw" id="(0.982532751091703,0.16666666666666666)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_xj1bAqH3EeKNUa7kbzEWsw" type="3003" source="_xjigEKH3EeKNUa7kbzEWsw" target="_xjrqDKH3EeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj1bA6H3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xj1bBKH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj1bBaH3EeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4KH3EeKNUa7kbzEWsw" id="(0.5,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4aH3EeKNUa7kbzEWsw" id="(0.4968944099378882,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_xj_MAKH3EeKNUa7kbzEWsw" type="3003" source="_xjigHKH3EeKNUa7kbzEWsw" target="_xjrqJKH3EeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MAaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MAqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MA6H3EeKNUa7kbzEWsw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ4qH3EeKNUa7kbzEWsw" id="(0.4968944099378882,0.0)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xkbQ46H3EeKNUa7kbzEWsw" id="(0.4968944099378882,1.0)"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_xj_MGKH3EeKNUa7kbzEWsw" type="3003" source="_xjrqDKH3EeKNUa7kbzEWsw" target="_EffOMaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xj_MGaH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xj_MGqH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xj_MG6H3EeKNUa7kbzEWsw" points="[1, 0, -1734, -700]$[1663, 671, -72, -29]"/>

-  </edges>

-  <edges xmi:type="notation:Edge" xmi:id="_xkIV-KH3EeKNUa7kbzEWsw" type="3003" source="_xjrqJKH3EeKNUa7kbzEWsw" target="_EffOMaHtEeKNUa7kbzEWsw">

-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_xkIV-aH3EeKNUa7kbzEWsw" routing="Rectilinear" lineColor="4210752"/>

-    <styles xmi:type="notation:FontStyle" xmi:id="_xkIV-qH3EeKNUa7kbzEWsw" fontName="Segoe UI"/>

-    <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xkIV-6H3EeKNUa7kbzEWsw" points="[1, 0, -1734, -700]$[1663, 671, -72, -29]"/>

-  </edges>

-</notation:Diagram>

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattable.genmodel b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattable.genmodel
deleted file mode 100644
index 8e695a71812..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxis.ecorediag
deleted file mode 100644
index db85685b5a0..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattableaxisprovider.ecorediag
deleted file mode 100644
index 0608de992ed..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/model/nattableonfiguration.ecorediag
deleted file mode 100644
index 44fd09ed8ac..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/plugin.pdoc b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/plugin.pdoc
deleted file mode 100644
index 3efa63544f3..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/plugin.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
deleted file mode 100644
index 5d5f67f2361..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/plugin.xml b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/plugin.xml
deleted file mode 100644
index 4b776100e16..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/Activator.java b/sandbox/pasteInNewTable/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/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/EObjectCell.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/EObjectCell.java
deleted file mode 100644
index 8ca1cd5186b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/EObjectCell.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;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EObject Cell</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell#getRowElement <em>Row Element</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell#getColumnElement <em>Column Element</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getEObjectCell()

- * @model

- * @generated

- */

-public interface EObjectCell extends ICell {

-	/**

-	 * Returns the value of the '<em><b>Row Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Row 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>Row Element</em>' reference.

-	 * @see #setRowElement(EObject)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getEObjectCell_RowElement()

-	 * @model required="true"

-	 * @generated

-	 */

-	EObject getRowElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell#getRowElement <em>Row Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Row Element</em>' reference.

-	 * @see #getRowElement()

-	 * @generated

-	 */

-	void setRowElement(EObject value);

-

-	/**

-	 * Returns the value of the '<em><b>Column Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Column 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>Column Element</em>' reference.

-	 * @see #setColumnElement(EObject)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getEObjectCell_ColumnElement()

-	 * @model required="true"

-	 * @generated

-	 */

-	EObject getColumnElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell#getColumnElement <em>Column Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Column Element</em>' reference.

-	 * @see #getColumnElement()

-	 * @generated

-	 */

-	void setColumnElement(EObject value);

-

-} // EObjectCell

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/ICell.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/ICell.java
deleted file mode 100644
index ccab5205ff3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/ICell.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.model.nattable;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ICell</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.ICell#getProblems <em>Problems</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getICell()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface ICell extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Problems</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.Problem}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Problems</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>Problems</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getICell_Problems()

-	 * @model

-	 * @generated

-	 */

-	EList<Problem> getProblems();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Row Element</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @model kind="operation" required="true"

-	 * @generated

-	 */

-	Object getRowElement();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Column Element</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @model kind="operation" required="true"

-	 * @generated

-	 */

-	Object getColumnElement();

-

-} // ICell

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.java
deleted file mode 100644
index 2e40082f604..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattableFactory.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.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 a new object of class '<em>Paste Problem</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Paste Problem</em>'.

-	 * @generated

-	 */

-	PasteProblem createPasteProblem();

-

-	/**

-	 * Returns a new object of class '<em>EObject Cell</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>EObject Cell</em>'.

-	 * @generated

-	 */

-	EObjectCell createEObjectCell();

-

-	/**

-	 * 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
deleted file mode 100644
index 11c1592d0d4..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/NattablePackage.java
+++ /dev/null
@@ -1,950 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each operation of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory

- * @model kind="package"

- *        annotation="http://www.eclipse.org/OCL/Import ecore='http://www.eclipse.org/emf/2002/Ecore#/'"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"

- * @generated

- */

-public interface NattablePackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattable"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattable"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattablePackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl <em>Table</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getTable()

-	 * @generated

-	 */

-	int TABLE = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>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 feature id for the '<em><b>Cells</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE__CELLS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 9;

-

-	/**

-	 * 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 + 10;

-

-	/**

-	 * 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;

-

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.ICell <em>ICell</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.ICell

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getICell()

-	 * @generated

-	 */

-	int ICELL = 1;

-

-	/**

-	 * The feature id for the '<em><b>Problems</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL__PROBLEMS = 0;

-

-	/**

-	 * The number of structural features of the '<em>ICell</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL_FEATURE_COUNT = 1;

-

-	/**

-	 * The operation id for the '<em>Get Row Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL___GET_ROW_ELEMENT = 0;

-

-	/**

-	 * The operation id for the '<em>Get Column Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL___GET_COLUMN_ELEMENT = 1;

-

-	/**

-	 * The number of operations of the '<em>ICell</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ICELL_OPERATION_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Problem <em>Problem</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Problem

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getProblem()

-	 * @generated

-	 */

-	int PROBLEM = 2;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM__EANNOTATIONS = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM__DESCRIPTION = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM__NAME = NattableconfigurationPackage.TABLE_NAMED_ELEMENT__NAME;

-

-	/**

-	 * The number of structural features of the '<em>Problem</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM_FEATURE_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_FEATURE_COUNT + 0;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM___GET_EANNOTATION__STRING = NattableconfigurationPackage.TABLE_NAMED_ELEMENT___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Problem</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PROBLEM_OPERATION_COUNT = NattableconfigurationPackage.TABLE_NAMED_ELEMENT_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.PasteProblemImpl <em>Paste Problem</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.PasteProblemImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getPasteProblem()

-	 * @generated

-	 */

-	int PASTE_PROBLEM = 3;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PASTE_PROBLEM__EANNOTATIONS = PROBLEM__EANNOTATIONS;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PASTE_PROBLEM__DESCRIPTION = PROBLEM__DESCRIPTION;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PASTE_PROBLEM__NAME = PROBLEM__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Pasted Text</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PASTE_PROBLEM__PASTED_TEXT = PROBLEM_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Unresolved Text</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PASTE_PROBLEM__UNRESOLVED_TEXT = PROBLEM_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Paste Problem</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PASTE_PROBLEM_FEATURE_COUNT = PROBLEM_FEATURE_COUNT + 2;

-

-	/**

-	 * The operation id for the '<em>Get EAnnotation</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PASTE_PROBLEM___GET_EANNOTATION__STRING = PROBLEM___GET_EANNOTATION__STRING;

-

-	/**

-	 * The number of operations of the '<em>Paste Problem</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int PASTE_PROBLEM_OPERATION_COUNT = PROBLEM_OPERATION_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.EObjectCellImpl <em>EObject Cell</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.EObjectCellImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getEObjectCell()

-	 * @generated

-	 */

-	int EOBJECT_CELL = 4;

-

-	/**

-	 * The feature id for the '<em><b>Problems</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_CELL__PROBLEMS = ICELL__PROBLEMS;

-

-	/**

-	 * The feature id for the '<em><b>Row Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_CELL__ROW_ELEMENT = ICELL_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Column Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_CELL__COLUMN_ELEMENT = ICELL_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>EObject Cell</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_CELL_FEATURE_COUNT = ICELL_FEATURE_COUNT + 2;

-

-	/**

-	 * The operation id for the '<em>Get Row Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_CELL___GET_ROW_ELEMENT = ICELL___GET_ROW_ELEMENT;

-

-	/**

-	 * The operation id for the '<em>Get Column Element</em>' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_CELL___GET_COLUMN_ELEMENT = ICELL___GET_COLUMN_ELEMENT;

-

-	/**

-	 * The number of operations of the '<em>EObject Cell</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_CELL_OPERATION_COUNT = ICELL_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 meta object for the containment reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells <em>Cells</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Cells</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells()

-	 * @see #getTable()

-	 * @generated

-	 */

-	EReference getTable_Cells();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.ICell <em>ICell</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>ICell</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.ICell

-	 * @generated

-	 */

-	EClass getICell();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.ICell#getProblems <em>Problems</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference list '<em>Problems</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.ICell#getProblems()

-	 * @see #getICell()

-	 * @generated

-	 */

-	EReference getICell_Problems();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.ICell#getRowElement() <em>Get Row Element</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the '<em>Get Row Element</em>' operation.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.ICell#getRowElement()

-	 * @generated

-	 */

-	EOperation getICell__GetRowElement();

-

-	/**

-	 * Returns the meta object for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.ICell#getColumnElement() <em>Get Column Element</em>}' operation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the '<em>Get Column Element</em>' operation.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.ICell#getColumnElement()

-	 * @generated

-	 */

-	EOperation getICell__GetColumnElement();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Problem <em>Problem</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Problem</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Problem

-	 * @generated

-	 */

-	EClass getProblem();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem <em>Paste Problem</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Paste Problem</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem

-	 * @generated

-	 */

-	EClass getPasteProblem();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem#getPastedText <em>Pasted Text</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Pasted Text</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem#getPastedText()

-	 * @see #getPasteProblem()

-	 * @generated

-	 */

-	EAttribute getPasteProblem_PastedText();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem#getUnresolvedText <em>Unresolved Text</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute list '<em>Unresolved Text</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem#getUnresolvedText()

-	 * @see #getPasteProblem()

-	 * @generated

-	 */

-	EAttribute getPasteProblem_UnresolvedText();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell <em>EObject Cell</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>EObject Cell</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell

-	 * @generated

-	 */

-	EClass getEObjectCell();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell#getRowElement <em>Row Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Row Element</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell#getRowElement()

-	 * @see #getEObjectCell()

-	 * @generated

-	 */

-	EReference getEObjectCell_RowElement();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell#getColumnElement <em>Column Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Column Element</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell#getColumnElement()

-	 * @see #getEObjectCell()

-	 * @generated

-	 */

-	EReference getEObjectCell_ColumnElement();

-

-	/**

-	 * 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();

-

-		/**

-		 * The meta object literal for the '<em><b>Cells</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference TABLE__CELLS = eINSTANCE.getTable_Cells();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.ICell <em>ICell</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.ICell

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getICell()

-		 * @generated

-		 */

-		EClass ICELL = eINSTANCE.getICell();

-

-		/**

-		 * The meta object literal for the '<em><b>Problems</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference ICELL__PROBLEMS = eINSTANCE.getICell_Problems();

-

-		/**

-		 * The meta object literal for the '<em><b>Get Row Element</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EOperation ICELL___GET_ROW_ELEMENT = eINSTANCE.getICell__GetRowElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Get Column Element</b></em>' operation.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EOperation ICELL___GET_COLUMN_ELEMENT = eINSTANCE.getICell__GetColumnElement();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Problem <em>Problem</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Problem

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getProblem()

-		 * @generated

-		 */

-		EClass PROBLEM = eINSTANCE.getProblem();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.PasteProblemImpl <em>Paste Problem</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.PasteProblemImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getPasteProblem()

-		 * @generated

-		 */

-		EClass PASTE_PROBLEM = eINSTANCE.getPasteProblem();

-

-		/**

-		 * The meta object literal for the '<em><b>Pasted Text</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute PASTE_PROBLEM__PASTED_TEXT = eINSTANCE.getPasteProblem_PastedText();

-

-		/**

-		 * The meta object literal for the '<em><b>Unresolved Text</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute PASTE_PROBLEM__UNRESOLVED_TEXT = eINSTANCE.getPasteProblem_UnresolvedText();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.EObjectCellImpl <em>EObject Cell</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.EObjectCellImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.impl.NattablePackageImpl#getEObjectCell()

-		 * @generated

-		 */

-		EClass EOBJECT_CELL = eINSTANCE.getEObjectCell();

-

-		/**

-		 * The meta object literal for the '<em><b>Row Element</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference EOBJECT_CELL__ROW_ELEMENT = eINSTANCE.getEObjectCell_RowElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Column Element</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference EOBJECT_CELL__COLUMN_ELEMENT = eINSTANCE.getEObjectCell_ColumnElement();

-

-	}

-

-} //NattablePackage

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/PasteProblem.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/PasteProblem.java
deleted file mode 100644
index de32cc53987..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/PasteProblem.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.model.nattable;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Paste Problem</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem#getPastedText <em>Pasted Text</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem#getUnresolvedText <em>Unresolved Text</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getPasteProblem()

- * @model

- * @generated

- */

-public interface PasteProblem extends Problem {

-	/**

-	 * Returns the value of the '<em><b>Pasted Text</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Pasted Text</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 Text</em>' attribute.

-	 * @see #setPastedText(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getPasteProblem_PastedText()

-	 * @model

-	 * @generated

-	 */

-	String getPastedText();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem#getPastedText <em>Pasted Text</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Pasted Text</em>' attribute.

-	 * @see #getPastedText()

-	 * @generated

-	 */

-	void setPastedText(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Unresolved Text</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Unresolved Text</em>' attribute list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Unresolved Text</em>' attribute list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getPasteProblem_UnresolvedText()

-	 * @model

-	 * @generated

-	 */

-	EList<String> getUnresolvedText();

-

-} // PasteProblem

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Problem.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Problem.java
deleted file mode 100644
index e56d20c8011..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Problem.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;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Problem</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getProblem()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface Problem extends TableNamedElement {

-} // Problem

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Status.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Status.java
deleted file mode 100644
index 9be68a33b52..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Status.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;

-

-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>Status</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getStatus()

- * @model

- * @generated

- */

-public enum Status implements Enumerator {

-	/**

-	 * The '<em><b>Normal</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #NORMAL_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	NORMAL(0, "Normal", "NORMAL"), //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>Error</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #ERROR_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	ERROR(1, "Error", "ERROR"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>Normal</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Normal</b></em>' literal object isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #NORMAL

-	 * @model name="Normal" literal="NORMAL"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int NORMAL_VALUE = 0;

-

-	/**

-	 * The '<em><b>Error</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>Error</b></em>' literal object isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #ERROR

-	 * @model name="Error" literal="ERROR"

-	 * @generated

-	 * @ordered

-	 */

-	public static final int ERROR_VALUE = 1;

-

-	/**

-	 * An array of all the '<em><b>Status</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final Status[] VALUES_ARRAY =

-		new Status[] {

-			NORMAL,

-			ERROR,

-		};

-

-	/**

-	 * A public read-only list of all the '<em><b>Status</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<Status> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Status</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static Status get(String literal) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			Status result = VALUES_ARRAY[i];

-			if (result.toString().equals(literal)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Status</b></em>' literal with the specified name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static Status getByName(String name) {

-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-			Status result = VALUES_ARRAY[i];

-			if (result.getName().equals(name)) {

-				return result;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the '<em><b>Status</b></em>' literal with the specified integer value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static Status get(int value) {

-		switch (value) {

-			case NORMAL_VALUE: return NORMAL;

-			case ERROR_VALUE: return ERROR;

-		}

-		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 Status(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;

-	}

-	

-} //Status

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/StringCell.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/StringCell.java
deleted file mode 100644
index 5045d341a46..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/StringCell.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;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>String Cell</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.StringCell#getValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getStringCell()

- * @model

- * @generated

- */

-public interface StringCell extends ICell {

-	/**

-	 * Returns the value of the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Value</em>' attribute.

-	 * @see #setValue(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getStringCell_Value()

-	 * @model

-	 * @generated

-	 */

-	String getValue();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.StringCell#getValue <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Value</em>' attribute.

-	 * @see #getValue()

-	 * @generated

-	 */

-	void setValue(String value);

-

-} // StringCell

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
deleted file mode 100644
index f37dd91ccaf..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/Table.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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 -->

- *

- * <!-- begin-model-doc -->

- * This object represents the table. It is used to save the interesting informations of the graphical table.

- * 

- * The currentAxisProviders can be : Master/Master, Master/Slave, Slave/Master and never Slave/Slave.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCells <em>Cells</em>}</li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable()

- * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='currentRowAxisInHistory currentColumnAxisInHistory'"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot currentRowAxisInHistory='rowAxisProvidersHistory->includes(currentRowAxisProvider)' currentColumnAxisInHistory='columnAxisProvidersHistory->includes(currentColumnAxisProvider)'"

- * @generated

- */

-public interface Table extends TableNamedElement {

-

-	/**

-	 * Returns the value of the '<em><b>Context</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The context is used for two things : 

-	 * <ul> <li>"virtual" parent to display the table in the Papyrus Model Explorer </li>

-	 * <li>container of the objects created in the table</li>

-	 * </ul> 

-	 * The context can't be null;

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Context</em>' reference.

-	 * @see #setContext(EObject)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Context()

-	 * @model required="true"

-	 * @generated

-	 */

-	EObject getContext();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getContext <em>Context</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Context</em>' reference.

-	 * @see #getContext()

-	 * @generated

-	 */

-	void setContext(EObject value);

-

-	/**

-	 * Returns the value of the '<em><b>Table Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Reference the configuration used by the table. This field can't be null.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Table Configuration</em>' reference.

-	 * @see #setTableConfiguration(TableConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_TableConfiguration()

-	 * @model required="true"

-	 * @generated

-	 */

-	TableConfiguration getTableConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getTableConfiguration <em>Table Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Table Configuration</em>' reference.

-	 * @see #getTableConfiguration()

-	 * @generated

-	 */

-	void setTableConfiguration(TableConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Invert Axis</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, the axis will be inverted on the screen. When the user inverts the axis, 

-	 * only this boolean is changed. We must not invert the currentRowAxis and the currentColumnAxis neither the histories or the AxisConfiguration

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Invert Axis</em>' attribute.

-	 * @see #setInvertAxis(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_InvertAxis()

-	 * @model default="false" required="true"

-	 * @generated

-	 */

-	boolean isInvertAxis();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#isInvertAxis <em>Invert Axis</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Invert Axis</em>' attribute.

-	 * @see #isInvertAxis()

-	 * @generated

-	 */

-	void setInvertAxis(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Column Axis Providers History</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This list contains all the columns configurations already used by the user and saved in this list by him.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Column Axis Providers History</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_ColumnAxisProvidersHistory()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<AbstractAxisProvider> getColumnAxisProvidersHistory();

-

-	/**

-	 * Returns the value of the '<em><b>Row Axis Providers History</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This list contains all the rowsconfigurations already used by the user and saved in this list by him.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Row Axis Providers History</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_RowAxisProvidersHistory()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<AbstractAxisProvider> getRowAxisProvidersHistory();

-

-	/**

-	 * Returns the value of the '<em><b>Local Row Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field contains the row headerAxisConfiguration. It could be null. 

-	 * In this case we use the row TableHeaderAxisConfiguration stored in the TableConfiguration of this table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Local Row Header Axis Configuration</em>' containment reference.

-	 * @see #setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_LocalRowHeaderAxisConfiguration()

-	 * @model containment="true"

-	 * @generated

-	 */

-	LocalTableHeaderAxisConfiguration getLocalRowHeaderAxisConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalRowHeaderAxisConfiguration <em>Local Row Header Axis Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Row Header Axis Configuration</em>' containment reference.

-	 * @see #getLocalRowHeaderAxisConfiguration()

-	 * @generated

-	 */

-	void setLocalRowHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Local Column Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field contains the columnheaderAxisConfiguration. It could be null. 

-	 * In this case we use the column TableHeaderAxisConfiguration stored in the TableConfiguration of this table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Local Column Header Axis Configuration</em>' containment reference.

-	 * @see #setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_LocalColumnHeaderAxisConfiguration()

-	 * @model containment="true"

-	 * @generated

-	 */

-	LocalTableHeaderAxisConfiguration getLocalColumnHeaderAxisConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getLocalColumnHeaderAxisConfiguration <em>Local Column Header Axis Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Column Header Axis Configuration</em>' containment reference.

-	 * @see #getLocalColumnHeaderAxisConfiguration()

-	 * @generated

-	 */

-	void setLocalColumnHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Current Row Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * References the current row AxisProvider used in the table.

-	 * The value must be owned by rowAxisProviderHistory

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Current Row Axis Provider</em>' reference.

-	 * @see #setCurrentRowAxisProvider(AbstractAxisProvider)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_CurrentRowAxisProvider()

-	 * @model required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getCurrentRowAxisProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentRowAxisProvider <em>Current Row Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Current Row Axis Provider</em>' reference.

-	 * @see #getCurrentRowAxisProvider()

-	 * @generated

-	 */

-	void setCurrentRowAxisProvider(AbstractAxisProvider value);

-

-	/**

-	 * Returns the value of the '<em><b>Current Column Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * References the current column AxisProvider used in the table.

-	 * The value must be owned by column AxisProviderHistory

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Current Column Axis Provider</em>' reference.

-	 * @see #setCurrentColumnAxisProvider(AbstractAxisProvider)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_CurrentColumnAxisProvider()

-	 * @model required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getCurrentColumnAxisProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Table#getCurrentColumnAxisProvider <em>Current Column Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Current Column Axis Provider</em>' reference.

-	 * @see #getCurrentColumnAxisProvider()

-	 * @generated

-	 */

-	void setCurrentColumnAxisProvider(AbstractAxisProvider value);

-

-	/**

-	 * Returns the value of the '<em><b>Cells</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.ICell}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Cells</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>Cells</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage#getTable_Cells()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<ICell> getCells();

-

-} // Table

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/EObjectCellImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/EObjectCellImpl.java
deleted file mode 100644
index 7af64194055..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/EObjectCellImpl.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.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.impl.MinimalEObjectImpl;

-

-import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Problem;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>EObject Cell</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.EObjectCellImpl#getProblems <em>Problems</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.EObjectCellImpl#getRowElement <em>Row Element</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.EObjectCellImpl#getColumnElement <em>Column Element</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class EObjectCellImpl extends MinimalEObjectImpl.Container implements EObjectCell {

-	/**

-	 * The cached value of the '{@link #getProblems() <em>Problems</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getProblems()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<Problem> problems;

-

-	/**

-	 * The cached value of the '{@link #getRowElement() <em>Row Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getRowElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject rowElement;

-

-	/**

-	 * The cached value of the '{@link #getColumnElement() <em>Column Element</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getColumnElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected EObject columnElement;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObjectCellImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablePackage.Literals.EOBJECT_CELL;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EList<Problem> getProblems() {

-		if (problems == null) {

-			problems = new EObjectResolvingEList<Problem>(Problem.class, this, NattablePackage.EOBJECT_CELL__PROBLEMS);

-		}

-		return problems;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject getRowElement() {

-		if (rowElement != null && rowElement.eIsProxy()) {

-			InternalEObject oldRowElement = (InternalEObject)rowElement;

-			rowElement = eResolveProxy(oldRowElement);

-			if (rowElement != oldRowElement) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.EOBJECT_CELL__ROW_ELEMENT, oldRowElement, rowElement));

-			}

-		}

-		return rowElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject basicGetRowElement() {

-		return rowElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setRowElement(EObject newRowElement) {

-		EObject oldRowElement = rowElement;

-		rowElement = newRowElement;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.EOBJECT_CELL__ROW_ELEMENT, oldRowElement, rowElement));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject getColumnElement() {

-		if (columnElement != null && columnElement.eIsProxy()) {

-			InternalEObject oldColumnElement = (InternalEObject)columnElement;

-			columnElement = eResolveProxy(oldColumnElement);

-			if (columnElement != oldColumnElement) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, NattablePackage.EOBJECT_CELL__COLUMN_ELEMENT, oldColumnElement, columnElement));

-			}

-		}

-		return columnElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObject basicGetColumnElement() {

-		return columnElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setColumnElement(EObject newColumnElement) {

-		EObject oldColumnElement = columnElement;

-		columnElement = newColumnElement;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.EOBJECT_CELL__COLUMN_ELEMENT, oldColumnElement, columnElement));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablePackage.EOBJECT_CELL__PROBLEMS:

-				return getProblems();

-			case NattablePackage.EOBJECT_CELL__ROW_ELEMENT:

-				if (resolve) return getRowElement();

-				return basicGetRowElement();

-			case NattablePackage.EOBJECT_CELL__COLUMN_ELEMENT:

-				if (resolve) return getColumnElement();

-				return basicGetColumnElement();

-		}

-		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.EOBJECT_CELL__PROBLEMS:

-				getProblems().clear();

-				getProblems().addAll((Collection<? extends Problem>)newValue);

-				return;

-			case NattablePackage.EOBJECT_CELL__ROW_ELEMENT:

-				setRowElement((EObject)newValue);

-				return;

-			case NattablePackage.EOBJECT_CELL__COLUMN_ELEMENT:

-				setColumnElement((EObject)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablePackage.EOBJECT_CELL__PROBLEMS:

-				getProblems().clear();

-				return;

-			case NattablePackage.EOBJECT_CELL__ROW_ELEMENT:

-				setRowElement((EObject)null);

-				return;

-			case NattablePackage.EOBJECT_CELL__COLUMN_ELEMENT:

-				setColumnElement((EObject)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablePackage.EOBJECT_CELL__PROBLEMS:

-				return problems != null && !problems.isEmpty();

-			case NattablePackage.EOBJECT_CELL__ROW_ELEMENT:

-				return rowElement != null;

-			case NattablePackage.EOBJECT_CELL__COLUMN_ELEMENT:

-				return columnElement != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} //EObjectCellImpl

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.java
deleted file mode 100644
index c10d520b170..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattableFactoryImpl.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.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();

-			case NattablePackage.PASTE_PROBLEM: return createPasteProblem();

-			case NattablePackage.EOBJECT_CELL: return createEObjectCell();

-			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 PasteProblem createPasteProblem() {

-		PasteProblemImpl pasteProblem = new PasteProblemImpl();

-		return pasteProblem;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EObjectCell createEObjectCell() {

-		EObjectCellImpl eObjectCell = new EObjectCellImpl();

-		return eObjectCell;

-	}

-

-	/**

-	 * <!-- 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
deleted file mode 100644
index 824afb9afb0..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/NattablePackageImpl.java
+++ /dev/null
@@ -1,579 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.EOperation;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EValidator;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.ICell;

-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.PasteProblem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Problem;

-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;

-import org.eclipse.papyrus.infra.nattable.model.nattable.util.NattableValidator;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class NattablePackageImpl extends EPackageImpl implements NattablePackage {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass tableEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass iCellEClass = null;

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass problemEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass pasteProblemEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass eObjectCellEClass = 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();

-

-		// Register package validator

-		EValidator.Registry.INSTANCE.put

-			(theNattablePackage, 

-			 new EValidator.Descriptor() {

-				 public EValidator getEValidator() {

-					 return NattableValidator.INSTANCE;

-				 }

-			 });

-

-		// Mark meta-data to indicate it can't be changed

-		theNattablePackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattablePackage.eNS_URI, theNattablePackage);

-		return theNattablePackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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 EReference getTable_Cells() {

-		return (EReference)tableEClass.getEStructuralFeatures().get(9);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getICell() {

-		return iCellEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getICell_Problems() {

-		return (EReference)iCellEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperation getICell__GetRowElement() {

-		return iCellEClass.getEOperations().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EOperation getICell__GetColumnElement() {

-		return iCellEClass.getEOperations().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getProblem() {

-		return problemEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getPasteProblem() {

-		return pasteProblemEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getPasteProblem_PastedText() {

-		return (EAttribute)pasteProblemEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getPasteProblem_UnresolvedText() {

-		return (EAttribute)pasteProblemEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getEObjectCell() {

-		return eObjectCellEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getEObjectCell_RowElement() {

-		return (EReference)eObjectCellEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getEObjectCell_ColumnElement() {

-		return (EReference)eObjectCellEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- 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);

-		createEReference(tableEClass, TABLE__CELLS);

-

-		iCellEClass = createEClass(ICELL);

-		createEReference(iCellEClass, ICELL__PROBLEMS);

-		createEOperation(iCellEClass, ICELL___GET_ROW_ELEMENT);

-		createEOperation(iCellEClass, ICELL___GET_COLUMN_ELEMENT);

-

-		problemEClass = createEClass(PROBLEM);

-

-		pasteProblemEClass = createEClass(PASTE_PROBLEM);

-		createEAttribute(pasteProblemEClass, PASTE_PROBLEM__PASTED_TEXT);

-		createEAttribute(pasteProblemEClass, PASTE_PROBLEM__UNRESOLVED_TEXT);

-

-		eObjectCellEClass = createEClass(EOBJECT_CELL);

-		createEReference(eObjectCellEClass, EOBJECT_CELL__ROW_ELEMENT);

-		createEReference(eObjectCellEClass, EOBJECT_CELL__COLUMN_ELEMENT);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		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);

-

-		// 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());

-		problemEClass.getESuperTypes().add(theNattableconfigurationPackage.getTableNamedElement());

-		pasteProblemEClass.getESuperTypes().add(this.getProblem());

-		eObjectCellEClass.getESuperTypes().add(this.getICell());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getTable_Context(), ecorePackage.getEObject(), null, "context", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_TableConfiguration(), theNattableconfigurationPackage.getTableConfiguration(), null, "tableConfiguration", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getTable_InvertAxis(), ecorePackage.getEBoolean(), "invertAxis", "false", 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEReference(getTable_ColumnAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "columnAxisProvidersHistory", null, 1, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_RowAxisProvidersHistory(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "rowAxisProvidersHistory", null, 1, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_LocalRowHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null, "localRowHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_LocalColumnHeaderAxisConfiguration(), theNattableaxisconfigurationPackage.getLocalTableHeaderAxisConfiguration(), null, "localColumnHeaderAxisConfiguration", null, 0, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_CurrentRowAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "currentRowAxisProvider", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_CurrentColumnAxisProvider(), theNattableaxisproviderPackage.getAbstractAxisProvider(), null, "currentColumnAxisProvider", null, 1, 1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getTable_Cells(), this.getICell(), null, "cells", null, 0, -1, Table.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(iCellEClass, ICell.class, "ICell", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getICell_Problems(), this.getProblem(), null, "problems", null, 0, -1, ICell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEOperation(getICell__GetRowElement(), ecorePackage.getEJavaObject(), "getRowElement", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		initEOperation(getICell__GetColumnElement(), ecorePackage.getEJavaObject(), "getColumnElement", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(problemEClass, Problem.class, "Problem", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(pasteProblemEClass, PasteProblem.class, "PasteProblem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getPasteProblem_PastedText(), ecorePackage.getEString(), "pastedText", null, 0, 1, PasteProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getPasteProblem_UnresolvedText(), ecorePackage.getEString(), "unresolvedText", null, 0, -1, PasteProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(eObjectCellEClass, EObjectCell.class, "EObjectCell", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getEObjectCell_RowElement(), ecorePackage.getEObject(), null, "rowElement", null, 1, 1, EObjectCell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getEObjectCell_ColumnElement(), ecorePackage.getEObject(), null, "columnElement", null, 1, 1, EObjectCell.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		// Create resource

-		createResource(eNS_URI);

-

-		// Create annotations

-		// http://www.eclipse.org/OCL/Import

-		createImportAnnotations();

-		// http://www.eclipse.org/emf/2002/Ecore

-		createEcoreAnnotations();

-		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot

-		createPivotAnnotations();

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/OCL/Import</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createImportAnnotations() {

-		String source = "http://www.eclipse.org/OCL/Import"; //$NON-NLS-1$		

-		addAnnotation

-		  (this, 

-		   source, 

-		   new String[] {

-			 "ecore", "http://www.eclipse.org/emf/2002/Ecore#/" //$NON-NLS-1$ //$NON-NLS-2$

-		   });													

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createEcoreAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$			

-		addAnnotation

-		  (this, 

-		   source, 

-		   new String[] {

-			 "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-			 "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$

-		   });		

-		addAnnotation

-		  (tableEClass, 

-		   source, 

-		   new String[] {

-			 "constraints", "currentRowAxisInHistory currentColumnAxisInHistory" //$NON-NLS-1$ //$NON-NLS-2$

-		   });											

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createPivotAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$					

-		addAnnotation

-		  (tableEClass, 

-		   source, 

-		   new String[] {

-			 "currentRowAxisInHistory", "rowAxisProvidersHistory->includes(currentRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

-			 "currentColumnAxisInHistory", "columnAxisProvidersHistory->includes(currentColumnAxisProvider)" //$NON-NLS-1$ //$NON-NLS-2$

-		   });										

-	}

-

-} //NattablePackageImpl

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/PasteProblemImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/PasteProblemImpl.java
deleted file mode 100644
index 84cc6f9ad34..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/PasteProblemImpl.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Paste Problem</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.PasteProblemImpl#getPastedText <em>Pasted Text</em>}</li>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.PasteProblemImpl#getUnresolvedText <em>Unresolved Text</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class PasteProblemImpl extends TableNamedElementImpl implements PasteProblem {

-	/**

-	 * The default value of the '{@link #getPastedText() <em>Pasted Text</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getPastedText()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String PASTED_TEXT_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getPastedText() <em>Pasted Text</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getPastedText()

-	 * @generated

-	 * @ordered

-	 */

-	protected String pastedText = PASTED_TEXT_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getUnresolvedText() <em>Unresolved Text</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getUnresolvedText()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> unresolvedText;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected PasteProblemImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattablePackage.Literals.PASTE_PROBLEM;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getPastedText() {

-		return pastedText;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setPastedText(String newPastedText) {

-		String oldPastedText = pastedText;

-		pastedText = newPastedText;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattablePackage.PASTE_PROBLEM__PASTED_TEXT, oldPastedText, pastedText));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EList<String> getUnresolvedText() {

-		if (unresolvedText == null) {

-			unresolvedText = new EDataTypeUniqueEList<String>(String.class, this, NattablePackage.PASTE_PROBLEM__UNRESOLVED_TEXT);

-		}

-		return unresolvedText;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattablePackage.PASTE_PROBLEM__PASTED_TEXT:

-				return getPastedText();

-			case NattablePackage.PASTE_PROBLEM__UNRESOLVED_TEXT:

-				return getUnresolvedText();

-		}

-		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.PASTE_PROBLEM__PASTED_TEXT:

-				setPastedText((String)newValue);

-				return;

-			case NattablePackage.PASTE_PROBLEM__UNRESOLVED_TEXT:

-				getUnresolvedText().clear();

-				getUnresolvedText().addAll((Collection<? extends String>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattablePackage.PASTE_PROBLEM__PASTED_TEXT:

-				setPastedText(PASTED_TEXT_EDEFAULT);

-				return;

-			case NattablePackage.PASTE_PROBLEM__UNRESOLVED_TEXT:

-				getUnresolvedText().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattablePackage.PASTE_PROBLEM__PASTED_TEXT:

-				return PASTED_TEXT_EDEFAULT == null ? pastedText != null : !PASTED_TEXT_EDEFAULT.equals(pastedText);

-			case NattablePackage.PASTE_PROBLEM__UNRESOLVED_TEXT:

-				return unresolvedText != null && !unresolvedText.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(" (pastedText: "); //$NON-NLS-1$

-		result.append(pastedText);

-		result.append(", unresolvedText: "); //$NON-NLS-1$

-		result.append(unresolvedText);

-		result.append(')');

-		return result.toString();

-	}

-

-} //PasteProblemImpl

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
deleted file mode 100644
index 81160fae586..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/impl/TableImpl.java
+++ /dev/null
@@ -1,685 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.ICell;

-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>

- *   <li>{@link org.eclipse.papyrus.infra.nattable.model.nattable.impl.TableImpl#getCells <em>Cells</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;

-

-	/**

-	 * The cached value of the '{@link #getCells() <em>Cells</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getCells()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<ICell> cells;

-

-	/**

-	 * <!-- 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

-	 */

-	public EList<ICell> getCells() {

-		if (cells == null) {

-			cells = new EObjectContainmentEList<ICell>(ICell.class, this, NattablePackage.TABLE__CELLS);

-		}

-		return cells;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattablePackage.TABLE__COLUMN_AXIS_PROVIDERS_HISTORY:

-				return ((InternalEList<?>)getColumnAxisProvidersHistory()).basicRemove(otherEnd, msgs);

-			case NattablePackage.TABLE__ROW_AXIS_PROVIDERS_HISTORY:

-				return ((InternalEList<?>)getRowAxisProvidersHistory()).basicRemove(otherEnd, msgs);

-			case NattablePackage.TABLE__LOCAL_ROW_HEADER_AXIS_CONFIGURATION:

-				return basicSetLocalRowHeaderAxisConfiguration(null, msgs);

-			case NattablePackage.TABLE__LOCAL_COLUMN_HEADER_AXIS_CONFIGURATION:

-				return basicSetLocalColumnHeaderAxisConfiguration(null, msgs);

-			case NattablePackage.TABLE__CELLS:

-				return ((InternalEList<?>)getCells()).basicRemove(otherEnd, msgs);

-		}

-		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();

-			case NattablePackage.TABLE__CELLS:

-				return getCells();

-		}

-		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;

-			case NattablePackage.TABLE__CELLS:

-				getCells().clear();

-				getCells().addAll((Collection<? extends ICell>)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;

-			case NattablePackage.TABLE__CELLS:

-				getCells().clear();

-				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;

-			case NattablePackage.TABLE__CELLS:

-				return cells != null && !cells.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(" (invertAxis: "); //$NON-NLS-1$

-		result.append(invertAxis);

-		result.append(')');

-		return result.toString();

-	}

-

-} //TableImpl

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EObjectAxis.java
deleted file mode 100644
index 8bfae62d641..00000000000
--- a/sandbox/pasteInNewTable/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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This IAxis allows to reference an EObject.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Element</em>' reference.

-	 * @see #setElement(EObject)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEObjectAxis_Element()

-	 * @model required="true"

-	 * @generated

-	 */

-	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.java
deleted file mode 100644
index 8110e31b3b5..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/EStructuralFeatureAxis.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.model.nattable.nattableaxis;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EStructural Feature Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * IAxis used to reference EMF EStructuralFeature.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The represented EStructuralFeature.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Element</em>' reference.

-	 * @see #setElement(EStructuralFeature)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getEStructuralFeatureAxis_Element()

-	 * @model required="true"

-	 * @generated

-	 */

-	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.java
deleted file mode 100644
index 19e5e37ca45..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureAxis.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:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract class used to reference features.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Returns the local label configuration to use for this IAxis. This configuration

-	 * will override the label configuration defined in the AxisManagerConfiguration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Local Label Configuration</em>' containment reference.

-	 * @see #setLocalLabelConfiguration(FeatureLabelProviderConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureAxis_LocalLabelConfiguration()

-	 * @model containment="true"

-	 * @generated

-	 */

-	FeatureLabelProviderConfiguration getLocalLabelConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Label Configuration</em>' containment reference.

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 */

-	void setLocalLabelConfiguration(FeatureLabelProviderConfiguration value);

-

-} // FeatureAxis

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java
deleted file mode 100644
index 4fa2f3879b4..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureIdAxis.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Id Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * IAxis used to represent feature using a string.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureIdAxis()

- * @model

- * @generated

- */

-public interface FeatureIdAxis extends IdAxis, FeatureAxis {

-} // FeatureIdAxis

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.java
deleted file mode 100644
index abcc64e2cca..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IAxis.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:

- * 	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 -->

- *

- * <!-- begin-model-doc -->

- * Common interface for the axis of the table. (An axis is a specific row or a specific column)

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field can't be null. Reference the axis manager providing this IAxis.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Manager</em>' reference.

-	 * @see #setManager(AxisManagerRepresentation)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis_Manager()

-	 * @model 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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * An element can be displayed using an alias instead of its real name.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Alias</em>' attribute.

-	 * @see #setAlias(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIAxis_Alias()

-	 * @model

-	 * @generated

-	 */

-	String getAlias();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis#getAlias <em>Alias</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Alias</em>' attribute.

-	 * @see #getAlias()

-	 * @generated

-	 */

-	void setAlias(String value);

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Returns the elements represented by the IAxis

-	 * <!-- end-model-doc -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	Object getElement();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Returns the local label configuration to use for this IAxis. This configuration

-	 * will override the label configuration defined in the AxisManagerConfiguration.

-	 * <!-- end-model-doc -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	ILabelProviderConfiguration getLocalLabelConfiguration();

-

-} // IAxis

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/IdAxis.java
deleted file mode 100644
index ff6cdeaac10..00000000000
--- a/sandbox/pasteInNewTable/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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This obejct allows to reference an element using a string instead of referencing it directly.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Element</em>' attribute.

-	 * @see #setElement(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getIdAxis_Element()

-	 * @model required="true"

-	 * @generated

-	 */

-	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
deleted file mode 100644
index a4823869f6f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java
deleted file mode 100644
index e2988087310..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisPackage.java
+++ /dev/null
@@ -1,1038 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = IAXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Object Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get 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>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS__ELEMENT = OBJECT_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EObject Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int EOBJECT_AXIS_FEATURE_COUNT = OBJECT_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get 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>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = IAXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Feature Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_AXIS_FEATURE_COUNT = IAXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get 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>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION = ID_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Feature Id Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int FEATURE_ID_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get 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>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;

-

-	/**

-	 * The feature id for the '<em><b>Element</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS__ELEMENT = FEATURE_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>EStructural Feature Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ESTRUCTURAL_FEATURE_AXIS_FEATURE_COUNT = FEATURE_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get 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>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION = ID_AXIS_FEATURE_COUNT + 0;

-

-	/**

-	 * The number of structural features of the '<em>Object Id Axis</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int OBJECT_ID_AXIS_FEATURE_COUNT = ID_AXIS_FEATURE_COUNT + 1;

-

-	/**

-	 * The operation id for the '<em>Get 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 containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Local Label Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis#getLocalLabelConfiguration()

-	 * @see #getFeatureAxis()

-	 * @generated

-	 */

-	EReference getFeatureAxis_LocalLabelConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis <em>Object Axis</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Object Axis</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis

-	 * @generated

-	 */

-	EClass getObjectAxis();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Local Label Configuration</em>'.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration()

-	 * @see #getObjectAxis()

-	 * @generated

-	 */

-	EReference getObjectAxis_LocalLabelConfiguration();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.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>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION = eINSTANCE.getFeatureAxis_LocalLabelConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl <em>Object Axis</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.ObjectAxisImpl

-		 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.NattableaxisPackageImpl#getObjectAxis()

-		 * @generated

-		 */

-		EClass OBJECT_AXIS = eINSTANCE.getObjectAxis();

-

-		/**

-		 * The meta object literal for the '<em><b>Local Label Configuration</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION = eINSTANCE.getObjectAxis_LocalLabelConfiguration();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.java
deleted file mode 100644
index cd485b0b63d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectAxis.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:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Object Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract class used to reference object

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Returns the local label configuration to use for this IAxis. This configuration

-	 * will override the label configuration defined in the AxisManagerConfiguration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Local Label Configuration</em>' containment reference.

-	 * @see #setLocalLabelConfiguration(ObjectLabelProviderConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectAxis_LocalLabelConfiguration()

-	 * @model containment="true"

-	 * @generated

-	 */

-	ObjectLabelProviderConfiguration getLocalLabelConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis#getLocalLabelConfiguration <em>Local Label Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Label Configuration</em>' containment reference.

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 */

-	void setLocalLabelConfiguration(ObjectLabelProviderConfiguration value);

-

-} // ObjectAxis

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java
deleted file mode 100644
index 6c7b0b76f00..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectIdAxis.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Object Id Axis</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * IAxis used to represent object using a string.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectIdAxis()

- * @model

- * @generated

- */

-public interface ObjectIdAxis extends IdAxis, ObjectAxis {

-} // ObjectIdAxis

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.java
deleted file mode 100644
index 3ed23ed598c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EObjectAxisImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.java
deleted file mode 100644
index aa25641df3e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/EStructuralFeatureAxisImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java
deleted file mode 100644
index f1a0d85788e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureAxisImpl.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.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>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected FeatureLabelProviderConfiguration localLabelConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.FEATURE_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

-		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {

-		if (newLocalLabelConfiguration != localLabelConfiguration) {

-			NotificationChain msgs = null;

-			if (localLabelConfiguration != null)

-				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			if (newLocalLabelConfiguration != null)

-				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Object getElement() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return basicSetLocalLabelConfiguration(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_AXIS__MANAGER:

-				if (resolve) return getManager();

-				return basicGetManager();

-			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-				return getAlias();

-			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return getLocalLabelConfiguration();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_AXIS__MANAGER:

-				setManager((AxisManagerRepresentation)newValue);

-				return;

-			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-				setAlias((String)newValue);

-				return;

-			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_AXIS__MANAGER:

-				setManager((AxisManagerRepresentation)null);

-				return;

-			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-				setAlias(ALIAS_EDEFAULT);

-				return;

-			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_AXIS__MANAGER:

-				return manager != null;

-			case NattableaxisPackage.FEATURE_AXIS__ALIAS:

-				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

-			case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return localLabelConfiguration != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-			case NattableaxisPackage.FEATURE_AXIS___GET_ELEMENT:

-				return getElement();

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (alias: "); //$NON-NLS-1$

-		result.append(alias);

-		result.append(')');

-		return result.toString();

-	}

-

-} //FeatureAxisImpl

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java
deleted file mode 100644
index b575bc38ff1..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureIdAxisImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Feature Id Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <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>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected FeatureLabelProviderConfiguration localLabelConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected FeatureIdAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.FEATURE_ID_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public FeatureLabelProviderConfiguration getLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

-		FeatureLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setLocalLabelConfiguration(FeatureLabelProviderConfiguration newLocalLabelConfiguration) {

-		if (newLocalLabelConfiguration != localLabelConfiguration) {

-			NotificationChain msgs = null;

-			if (localLabelConfiguration != null)

-				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			if (newLocalLabelConfiguration != null)

-				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return basicSetLocalLabelConfiguration(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return getLocalLabelConfiguration();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((FeatureLabelProviderConfiguration)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return localLabelConfiguration != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == FeatureAxis.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION;

-				default: return -1;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if (baseClass == FeatureAxis.class) {

-			switch (baseFeatureID) {

-				case NattableaxisPackage.FEATURE_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.FEATURE_ID_AXIS__LOCAL_LABEL_CONFIGURATION;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-

-} //FeatureIdAxisImpl

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java
deleted file mode 100644
index 80c4ef5d195..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/IdAxisImpl.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
deleted file mode 100644
index 9c75138179c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
deleted file mode 100644
index 3113299c155..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
+++ /dev/null
@@ -1,483 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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);

-		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(), ecorePackage.getEString(), "alias", null, 0, 1, IAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEOperation(getIAxis__GetElement(), ecorePackage.getEJavaObject(), "getElement", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		initEOperation(getIAxis__GetLocalLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), "getLocalLabelConfiguration", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(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(), ecorePackage.getEObject(), null, "element", null, 1, 1, EObjectAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(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(), ecorePackage.getEStructuralFeature(), null, "element", null, 1, 1, EStructuralFeatureAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(objectIdAxisEClass, ObjectIdAxis.class, "ObjectIdAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-	}

-

-} //NattableaxisPackageImpl

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java
deleted file mode 100644
index 4ed31303ddb..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectAxisImpl.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.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>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected ObjectLabelProviderConfiguration localLabelConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ObjectAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.OBJECT_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

-		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {

-		if (newLocalLabelConfiguration != localLabelConfiguration) {

-			NotificationChain msgs = null;

-			if (localLabelConfiguration != null)

-				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			if (newLocalLabelConfiguration != null)

-				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Object getElement() {

-		// TODO: implement this method

-		// Ensure that you remove @generated or mark it @generated NOT

-		throw new UnsupportedOperationException();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return basicSetLocalLabelConfiguration(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_AXIS__MANAGER:

-				if (resolve) return getManager();

-				return basicGetManager();

-			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-				return getAlias();

-			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return getLocalLabelConfiguration();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_AXIS__MANAGER:

-				setManager((AxisManagerRepresentation)newValue);

-				return;

-			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-				setAlias((String)newValue);

-				return;

-			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_AXIS__MANAGER:

-				setManager((AxisManagerRepresentation)null);

-				return;

-			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-				setAlias(ALIAS_EDEFAULT);

-				return;

-			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_AXIS__MANAGER:

-				return manager != null;

-			case NattableaxisPackage.OBJECT_AXIS__ALIAS:

-				return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);

-			case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return localLabelConfiguration != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {

-		switch (operationID) {

-			case NattableaxisPackage.OBJECT_AXIS___GET_ELEMENT:

-				return getElement();

-		}

-		return super.eInvoke(operationID, arguments);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (alias: "); //$NON-NLS-1$

-		result.append(alias);

-		result.append(')');

-		return result.toString();

-	}

-

-} //ObjectAxisImpl

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java
deleted file mode 100644
index 61365f5642e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectIdAxisImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Object Id Axis</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <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>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getLocalLabelConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected ObjectLabelProviderConfiguration localLabelConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ObjectIdAxisImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return NattableaxisPackage.Literals.OBJECT_ID_AXIS;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ObjectLabelProviderConfiguration getLocalLabelConfiguration() {

-		return localLabelConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration, NotificationChain msgs) {

-		ObjectLabelProviderConfiguration oldLocalLabelConfiguration = localLabelConfiguration;

-		localLabelConfiguration = newLocalLabelConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, oldLocalLabelConfiguration, newLocalLabelConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setLocalLabelConfiguration(ObjectLabelProviderConfiguration newLocalLabelConfiguration) {

-		if (newLocalLabelConfiguration != localLabelConfiguration) {

-			NotificationChain msgs = null;

-			if (localLabelConfiguration != null)

-				msgs = ((InternalEObject)localLabelConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			if (newLocalLabelConfiguration != null)

-				msgs = ((InternalEObject)newLocalLabelConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, null, msgs);

-			msgs = basicSetLocalLabelConfiguration(newLocalLabelConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION, newLocalLabelConfiguration, newLocalLabelConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return basicSetLocalLabelConfiguration(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return getLocalLabelConfiguration();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				setLocalLabelConfiguration((ObjectLabelProviderConfiguration)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION:

-				return localLabelConfiguration != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if (baseClass == ObjectAxis.class) {

-			switch (derivedFeatureID) {

-				case NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION;

-				default: return -1;

-			}

-		}

-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if (baseClass == ObjectAxis.class) {

-			switch (baseFeatureID) {

-				case NattableaxisPackage.OBJECT_AXIS__LOCAL_LABEL_CONFIGURATION: return NattableaxisPackage.OBJECT_ID_AXIS__LOCAL_LABEL_CONFIGURATION;

-				default: return -1;

-			}

-		}

-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-	}

-

-} //ObjectIdAxisImpl

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisAdapterFactory.java
deleted file mode 100644
index 871c9096687..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/util/NattableaxisSwitch.java
deleted file mode 100644
index 59f6d827ac9..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java
deleted file mode 100644
index bdc76b5eb96..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AbstractHeaderAxisConfiguration.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.emf.ecore.EObject;

-

-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 -->

- *

- * <!-- begin-model-doc -->

- * Abstract Class for the HeaderAxisConfiguration. This class provides : 

- * <ul><li>informations on the appearance of the header</li>

- * <li> a list of label configuration which can be used by the header</li>

- * <li> a list of axisConfiguration. These axis configuration are used to provide the contents of the axis</li>

- * </ul>

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore constraints='oneObjectLabelConfigurationTypes oneFeatureLabelConfigurationTypes'"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot oneObjectLabelConfigurationTypes='ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::ObjectLabelProviderConfiguration))->size() <= 1' oneFeatureLabelConfigurationTypes='ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::FeatureLabelProviderConfiguration))->size() <= 1'"

- * @generated

- */

-public interface AbstractHeaderAxisConfiguration extends EObject, 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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. Indicates how to display the index of the Axis : using letter or using number.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Index Style</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

-	 * @see #setIndexStyle(AxisIndexStyle)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_IndexStyle()

-	 * @model required="true"

-	 * @generated

-	 */

-	AxisIndexStyle getIndexStyle();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#getIndexStyle <em>Index Style</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Index Style</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisIndexStyle

-	 * @see #getIndexStyle()

-	 * @generated

-	 */

-	void setIndexStyle(AxisIndexStyle value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Label</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, the label header will be displayed.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Label</em>' attribute.

-	 * @see #setDisplayLabel(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_DisplayLabel()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayLabel();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Label</em>' attribute.

-	 * @see #isDisplayLabel()

-	 * @generated

-	 */

-	void setDisplayLabel(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Filter</b></em>' attribute.

-	 * The default value is <code>"false"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true AND if the axisConfiguration is used as column, the row filter will be displayed.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Filter</em>' attribute.

-	 * @see #setDisplayFilter(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_DisplayFilter()

-	 * @model default="false" required="true"

-	 * @generated

-	 */

-	boolean isDisplayFilter();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayFilter <em>Display Filter</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Filter</em>' attribute.

-	 * @see #isDisplayFilter()

-	 * @generated

-	 */

-	void setDisplayFilter(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Index</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, the index header will be displayed.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Index</em>' attribute.

-	 * @see #setDisplayIndex(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_DisplayIndex()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayIndex();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration#isDisplayIndex <em>Display Index</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Index</em>' attribute.

-	 * @see #isDisplayIndex()

-	 * @generated

-	 */

-	void setDisplayIndex(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Owned Label Configurations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The list of the possible label configuration, referenced by the axis configuration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Owned Label Configurations</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<ILabelProviderConfiguration> getOwnedLabelConfigurations();

-

-	/**

-	 * Returns the value of the '<em><b>Owned Axis Configurations</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The list of the owned axis configuration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Owned Axis Configurations</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<IAxisConfiguration> getOwnedAxisConfigurations();

-

-} // AbstractHeaderAxisConfiguration

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisIndexStyle.java
deleted file mode 100644
index ffe685a762d..00000000000
--- a/sandbox/pasteInNewTable/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 -->

- * <!-- begin-model-doc -->

- * Enumeration used to describe the possible style of the index of the headers.

- * <!-- end-model-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisIndexStyle()

- * @model

- * @generated

- */

-public enum AxisIndexStyle implements Enumerator {

-	/**

-	 * The '<em><b>ALPHABETIC</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #ALPHABETIC_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	ALPHABETIC(1, "ALPHABETIC", "ALPHABETIC"), //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>NUMERIC</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #NUMERIC_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	NUMERIC(0, "NUMERIC", "NUMERIC"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>ALPHABETIC</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Index Headers count will be : A-B-C-...Y-Z-AA-AB-...

-	 * <!-- end-model-doc -->

-	 * @see #ALPHABETIC

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int ALPHABETIC_VALUE = 1;

-

-	/**

-	 * The '<em><b>NUMERIC</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Index Headers count will be : 1-2-3-...

-	 * <!-- end-model-doc -->

-	 * @see #NUMERIC

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int NUMERIC_VALUE = 0;

-

-	/**

-	 * An array of all the '<em><b>Axis Index Style</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final AxisIndexStyle[] VALUES_ARRAY = new AxisIndexStyle[] {

-			ALPHABETIC,

-			NUMERIC,

-		};

-

-	/**

-	 * A public read-only list of all the '<em><b>Axis Index Style</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<AxisIndexStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Axis Index Style</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.java
deleted file mode 100644
index 3ae9d68efa5..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerConfiguration.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.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 -->

- *

- * <!-- begin-model-doc -->

- * This object allows to define and configure a Java AxisManager

- * <!-- end-model-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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Reference the local header label configuration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Local Header Label Configuration</em>' reference.

-	 * @see #setLocalHeaderLabelConfiguration(ILabelProviderConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration_LocalHeaderLabelConfiguration()

-	 * @model

-	 * @generated

-	 */

-	ILabelProviderConfiguration getLocalHeaderLabelConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getLocalHeaderLabelConfiguration <em>Local Header Label Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Local Header Label Configuration</em>' reference.

-	 * @see #getLocalHeaderLabelConfiguration()

-	 * @generated

-	 */

-	void setLocalHeaderLabelConfiguration(ILabelProviderConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Axis Manager</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. the axis manager representation

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Axis Manager</em>' reference.

-	 * @see #setAxisManager(AxisManagerRepresentation)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration_AxisManager()

-	 * @model required="true"

-	 * @generated

-	 */

-	AxisManagerRepresentation getAxisManager();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration#getAxisManager <em>Axis Manager</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Axis Manager</em>' reference.

-	 * @see #getAxisManager()

-	 * @generated

-	 */

-	void setAxisManager(AxisManagerRepresentation value);

-

-	/**

-	 * Returns the value of the '<em><b>Local Specific Configurations</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * specific configurations for the axis manager.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Local Specific Configurations</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerConfiguration_LocalSpecificConfigurations()

-	 * @model

-	 * @generated

-	 */

-	EList<IAxisConfiguration> getLocalSpecificConfigurations();

-

-} // AxisManagerConfiguration

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.java
deleted file mode 100644
index 087a7476324..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/AxisManagerRepresentation.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.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 -->

- *

- * <!-- begin-model-doc -->

- * This class is used to represents in the model the java Axis Manager.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This id allows to find the Java Axis Manager represented by this element.

-	 * To find it you must use AxisManagerFactory.INSTANCE.getAxisManager(AxisManagerRepresentation)

-	 * To register a Java Axis Manager,you must use the extension point  : org.eclipse.papyrus.infra.nattable.axismanager

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Axis Manager Id</em>' attribute.

-	 * @see #setAxisManagerId(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_AxisManagerId()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getAxisManagerId();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getAxisManagerId <em>Axis Manager Id</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Axis Manager Id</em>' attribute.

-	 * @see #getAxisManagerId()

-	 * @generated

-	 */

-	void setAxisManagerId(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Label Provider Context</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The context on which the label provider to use for this AxisManagerRepresentation are declared.

-	 * (see the Papyrus Label Provider Service for further informations)

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Label Provider Context</em>' attribute.

-	 * @see #setLabelProviderContext(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_LabelProviderContext()

-	 * @model

-	 * @generated

-	 */

-	String getLabelProviderContext();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getLabelProviderContext <em>Label Provider Context</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Label Provider Context</em>' attribute.

-	 * @see #getLabelProviderContext()

-	 * @generated

-	 */

-	void setLabelProviderContext(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Header Label Configuration</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The label provider configuration to use for the header of the axis provided by the represented AxisManager

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Header Label Configuration</em>' reference.

-	 * @see #setHeaderLabelConfiguration(ILabelProviderConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_HeaderLabelConfiguration()

-	 * @model required="true"

-	 * @generated

-	 */

-	ILabelProviderConfiguration getHeaderLabelConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation#getHeaderLabelConfiguration <em>Header Label Configuration</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Header Label Configuration</em>' reference.

-	 * @see #getHeaderLabelConfiguration()

-	 * @generated

-	 */

-	void setHeaderLabelConfiguration(ILabelProviderConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Specific Axis Configurations</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IAxisConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * A list of specific configurations to use for this axis.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Specific Axis Configurations</em>' reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getAxisManagerRepresentation_SpecificAxisConfigurations()

-	 * @model

-	 * @generated

-	 */

-	EList<IAxisConfiguration> getSpecificAxisConfigurations();

-

-} // AxisManagerRepresentation

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.java
deleted file mode 100644
index 4bf9f2066fe..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/EStructuralFeatureValueFillingConfiguration.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:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>EStructural Feature Value Filling Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Configuration used to fill the table listening a feature of the context of the table

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field can't be null. References the feature of the context of the table to listen.

-	 * It is possible that the context doesn't have this feature.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Listen Feature</em>' reference.

-	 * @see #setListenFeature(EStructuralFeature)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getEStructuralFeatureValueFillingConfiguration_ListenFeature()

-	 * @model required="true"

-	 * @generated

-	 */

-	EStructuralFeature getListenFeature();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.EStructuralFeatureValueFillingConfiguration#getListenFeature <em>Listen Feature</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Listen Feature</em>' reference.

-	 * @see #getListenFeature()

-	 * @generated

-	 */

-	void setListenFeature(EStructuralFeature value);

-

-} // EStructuralFeatureValueFillingConfiguration

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.java
deleted file mode 100644
index 40f85835be3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/FeatureAxisConfiguration.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.model.nattable.nattableaxisconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Configuration to use for Axis representing features

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, only the common features will be displayed on the axis.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Show Only Common Feature</em>' attribute.

-	 * @see #setShowOnlyCommonFeature(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getFeatureAxisConfiguration_ShowOnlyCommonFeature()

-	 * @model

-	 * @generated

-	 */

-	boolean isShowOnlyCommonFeature();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.FeatureAxisConfiguration#isShowOnlyCommonFeature <em>Show Only Common Feature</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Show Only Common Feature</em>' attribute.

-	 * @see #isShowOnlyCommonFeature()

-	 * @generated

-	 */

-	void setShowOnlyCommonFeature(boolean value);

-

-} // FeatureAxisConfiguration

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.java
deleted file mode 100644
index 2933451b725..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IAxisConfiguration.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:

- * 	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 -->

- *

- * <!-- begin-model-doc -->

- * Comon Interface for axis configuration.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIAxisConfiguration()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface IAxisConfiguration extends EObject {

-} // IAxisConfiguration

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java
deleted file mode 100644
index 297342e04bf..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IFillingConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IFilling Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Comon Interface for filling configurations.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIFillingConfiguration()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface IFillingConfiguration extends IAxisConfiguration {

-} // IFillingConfiguration

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java
deleted file mode 100644
index 164b3271971..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/IPasteConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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 -->

- *

- * <!-- begin-model-doc -->

- * Common Interface for the paste configuration.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getIPasteConfiguration()

- * @model

- * @generated

- */

-public interface IPasteConfiguration extends IAxisConfiguration {

-} // IPasteConfiguration

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.java
deleted file mode 100644
index 86b062f1015..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/LocalTableHeaderAxisConfiguration.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.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Local Table Header Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Define the configuration of the axis (rows or columns) in the table.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This list contains the configuration of the axis managers used in the table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Axis Manager Configurations</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<AxisManagerConfiguration> getAxisManagerConfigurations();

-

-} // LocalTableHeaderAxisConfiguration

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.java
deleted file mode 100644
index e12caa031c7..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationFactory.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
deleted file mode 100644
index c006824c221..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/NattableaxisconfigurationPackage.java
+++ /dev/null
@@ -1,1352 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"

- * @generated

- */

-public interface NattableaxisconfigurationPackage extends EPackage {

-

-	/**

-	 * 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.java
deleted file mode 100644
index dba06e8f611..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/PasteEObjectConfiguration.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.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 -->

- *

- * <!-- begin-model-doc -->

- * Configuration to use to paste EObject in the table.

- * <!-- end-model-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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The String representing the EClass of the elements to create (see papyrus services types for further information)

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Pasted Element Id</em>' attribute.

-	 * @see #setPastedElementId(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getPasteEObjectConfiguration_PastedElementId()

-	 * @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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This field references the feature of the context of the table in which the created element will be added.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Paste Element Containement Feature</em>' reference.

-	 * @see #setPasteElementContainementFeature(EStructuralFeature)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getPasteEObjectConfiguration_PasteElementContainementFeature()

-	 * @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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.java
deleted file mode 100644
index df6ce88c086..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/TableHeaderAxisConfiguration.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.model.nattable.nattableaxisconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table Header Axis Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Defines the configuration of the axis in the TableConfiguration

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 annotation="http://www.eclipse.org/emf/2002/Ecore constraints='axisManagersIdUnique'"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot axisManagersIdUnique='axisManagers->forAll(am1 : AxisManagerRepresentation, am2 : AxisManagerRepresentation | am1.axisManagerId <> am2.axisManagerId)'"

- * @generated

- */

-public interface TableHeaderAxisConfiguration extends AbstractHeaderAxisConfiguration {

-

-	/**

-	 * Returns the value of the '<em><b>Axis Managers</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This list can't be empty. The list of the AxisManager used to fill the axis.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Axis Managers</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage#getTableHeaderAxisConfiguration_AxisManagers()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<AxisManagerRepresentation> getAxisManagers();

-

-} // TableHeaderAxisConfiguration

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java
deleted file mode 100644
index 8ec09ae0e88..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AbstractHeaderAxisConfigurationImpl.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
deleted file mode 100644
index dc9fb62cbb0..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerConfigurationImpl.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
deleted file mode 100644
index c9df4a5553b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/AxisManagerRepresentationImpl.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.java
deleted file mode 100644
index 00047ae8372..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/EStructuralFeatureValueFillingConfigurationImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java
deleted file mode 100644
index d42debf90fb..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/FeatureAxisConfigurationImpl.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.java
deleted file mode 100644
index f6704e27bf1..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/IPasteConfigurationImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.java
deleted file mode 100644
index f943bab3f08..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/LocalTableHeaderAxisConfigurationImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.java
deleted file mode 100644
index 04cadac8b7e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationFactoryImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
deleted file mode 100644
index f98234a1423..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/NattableaxisconfigurationPackageImpl.java
+++ /dev/null
@@ -1,748 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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.EValidator;

-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.nattableaxisconfiguration.util.NattableaxisconfigurationValidator;

-

-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();

-

-		// Register package validator

-		EValidator.Registry.INSTANCE.put

-			(theNattableaxisconfigurationPackage, 

-			 new EValidator.Descriptor() {

-				 public EValidator getEValidator() {

-					 return NattableaxisconfigurationValidator.INSTANCE;

-				 }

-			 });

-

-		// Mark meta-data to indicate it can't be changed

-		theNattableaxisconfigurationPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattableaxisconfigurationPackage.eNS_URI, theNattableaxisconfigurationPackage);

-		return theNattableaxisconfigurationPackage;

-	}

-

-	/**

-	 * <!-- 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

-		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(ecorePackage.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(), ecorePackage.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(), ecorePackage.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(), ecorePackage.getEBoolean(), "displayIndex", "true", 1, 1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEReference(getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "ownedLabelConfigurations", null, 0, -1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getAbstractHeaderAxisConfiguration_OwnedAxisConfigurations(), this.getIAxisConfiguration(), null, "ownedAxisConfigurations", null, 0, -1, AbstractHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(axisManagerRepresentationEClass, AxisManagerRepresentation.class, "AxisManagerRepresentation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getAxisManagerRepresentation_AxisManagerId(), ecorePackage.getEString(), "axisManagerId", null, 1, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getAxisManagerRepresentation_LabelProviderContext(), ecorePackage.getEString(), "labelProviderContext", null, 0, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getAxisManagerRepresentation_HeaderLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "headerLabelConfiguration", null, 1, 1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getAxisManagerRepresentation_SpecificAxisConfigurations(), this.getIAxisConfiguration(), null, "specificAxisConfigurations", null, 0, -1, AxisManagerRepresentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(axisManagerConfigurationEClass, AxisManagerConfiguration.class, "AxisManagerConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getAxisManagerConfiguration_LocalHeaderLabelConfiguration(), theNattablelabelproviderPackage.getILabelProviderConfiguration(), null, "localHeaderLabelConfiguration", null, 0, 1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getAxisManagerConfiguration_AxisManager(), this.getAxisManagerRepresentation(), null, "axisManager", null, 1, 1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getAxisManagerConfiguration_LocalSpecificConfigurations(), this.getIAxisConfiguration(), null, "localSpecificConfigurations", null, 0, -1, AxisManagerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(tableHeaderAxisConfigurationEClass, TableHeaderAxisConfiguration.class, "TableHeaderAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getTableHeaderAxisConfiguration_AxisManagers(), this.getAxisManagerRepresentation(), null, "axisManagers", null, 1, -1, TableHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(localTableHeaderAxisConfigurationEClass, LocalTableHeaderAxisConfiguration.class, "LocalTableHeaderAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations(), this.getAxisManagerConfiguration(), null, "axisManagerConfigurations", null, 0, -1, LocalTableHeaderAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(iAxisConfigurationEClass, IAxisConfiguration.class, "IAxisConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(featureAxisConfigurationEClass, FeatureAxisConfiguration.class, "FeatureAxisConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getFeatureAxisConfiguration_ShowOnlyCommonFeature(), ecorePackage.getEBoolean(), "showOnlyCommonFeature", null, 0, 1, FeatureAxisConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(iFillingConfigurationEClass, IFillingConfiguration.class, "IFillingConfiguration", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(eStructuralFeatureValueFillingConfigurationEClass, EStructuralFeatureValueFillingConfiguration.class, "EStructuralFeatureValueFillingConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getEStructuralFeatureValueFillingConfiguration_ListenFeature(), ecorePackage.getEStructuralFeature(), null, "listenFeature", null, 1, 1, EStructuralFeatureValueFillingConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(iPasteConfigurationEClass, IPasteConfiguration.class, "IPasteConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(pasteEObjectConfigurationEClass, PasteEObjectConfiguration.class, "PasteEObjectConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getPasteEObjectConfiguration_PastedElementId(), ecorePackage.getEString(), "pastedElementId", null, 0, 1, PasteEObjectConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getPasteEObjectConfiguration_PasteElementContainementFeature(), ecorePackage.getEStructuralFeature(), null, "pasteElementContainementFeature", null, 0, 1, PasteEObjectConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		// Initialize enums and add enum literals

-		initEEnum(axisIndexStyleEEnum, AxisIndexStyle.class, "AxisIndexStyle"); //$NON-NLS-1$

-		addEEnumLiteral(axisIndexStyleEEnum, AxisIndexStyle.ALPHABETIC);

-		addEEnumLiteral(axisIndexStyleEEnum, AxisIndexStyle.NUMERIC);

-

-		// Create annotations

-		// http://www.eclipse.org/emf/2002/Ecore

-		createEcoreAnnotations();

-		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot

-		createPivotAnnotations();

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createEcoreAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$		

-		addAnnotation

-		  (this, 

-		   source, 

-		   new String[] {

-			 "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-			 "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$

-		   });		

-		addAnnotation

-		  (abstractHeaderAxisConfigurationEClass, 

-		   source, 

-		   new String[] {

-			 "constraints", "oneObjectLabelConfigurationTypes oneFeatureLabelConfigurationTypes" //$NON-NLS-1$ //$NON-NLS-2$

-		   });																			

-		addAnnotation

-		  (tableHeaderAxisConfigurationEClass, 

-		   source, 

-		   new String[] {

-			 "constraints", "axisManagersIdUnique" //$NON-NLS-1$ //$NON-NLS-2$

-		   });																		

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createPivotAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$				

-		addAnnotation

-		  (abstractHeaderAxisConfigurationEClass, 

-		   source, 

-		   new String[] {

-			 "oneObjectLabelConfigurationTypes", "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::ObjectLabelProviderConfiguration))->size() <= 1", //$NON-NLS-1$ //$NON-NLS-2$

-			 "oneFeatureLabelConfigurationTypes", "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::FeatureLabelProviderConfiguration))->size() <= 1" //$NON-NLS-1$ //$NON-NLS-2$

-		   });																			

-		addAnnotation

-		  (tableHeaderAxisConfigurationEClass, 

-		   source, 

-		   new String[] {

-			 "axisManagersIdUnique", "axisManagers->forAll(am1 : AxisManagerRepresentation, am2 : AxisManagerRepresentation | am1.axisManagerId <> am2.axisManagerId)" //$NON-NLS-1$ //$NON-NLS-2$

-		   });																	

-	}

-

-} //NattableaxisconfigurationPackageImpl

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java
deleted file mode 100644
index 5f269f57490..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/PasteEObjectConfigurationImpl.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.java
deleted file mode 100644
index 9afbe049dda..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/impl/TableHeaderAxisConfigurationImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationAdapterFactory.java
deleted file mode 100644
index 6f767a7027d..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationSwitch.java
deleted file mode 100644
index 3502d97454c..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java
deleted file mode 100644
index 7fa0683d37c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisconfiguration/util/NattableaxisconfigurationValidator.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.ResourceLocator;

-

-import org.eclipse.emf.ecore.EPackage;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.*;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Validator</b> for the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage

- * @generated

- */

-public class NattableaxisconfigurationValidator extends EObjectValidator {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final NattableaxisconfigurationValidator INSTANCE = new NattableaxisconfigurationValidator();

-

-	/**

-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

-	 * @generated

-	 */

-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableaxisconfigurationValidator() {

-		super();

-	}

-

-	/**

-	 * Returns the package of this validator switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EPackage getEPackage() {

-	  return NattableaxisconfigurationPackage.eINSTANCE;

-	}

-

-	/**

-	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		switch (classifierID) {

-			case NattableaxisconfigurationPackage.ABSTRACT_HEADER_AXIS_CONFIGURATION:

-				return validateAbstractHeaderAxisConfiguration((AbstractHeaderAxisConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_REPRESENTATION:

-				return validateAxisManagerRepresentation((AxisManagerRepresentation)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.AXIS_MANAGER_CONFIGURATION:

-				return validateAxisManagerConfiguration((AxisManagerConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.TABLE_HEADER_AXIS_CONFIGURATION:

-				return validateTableHeaderAxisConfiguration((TableHeaderAxisConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.LOCAL_TABLE_HEADER_AXIS_CONFIGURATION:

-				return validateLocalTableHeaderAxisConfiguration((LocalTableHeaderAxisConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.IAXIS_CONFIGURATION:

-				return validateIAxisConfiguration((IAxisConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.FEATURE_AXIS_CONFIGURATION:

-				return validateFeatureAxisConfiguration((FeatureAxisConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.IFILLING_CONFIGURATION:

-				return validateIFillingConfiguration((IFillingConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.ESTRUCTURAL_FEATURE_VALUE_FILLING_CONFIGURATION:

-				return validateEStructuralFeatureValueFillingConfiguration((EStructuralFeatureValueFillingConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.IPASTE_CONFIGURATION:

-				return validateIPasteConfiguration((IPasteConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.PASTE_EOBJECT_CONFIGURATION:

-				return validatePasteEObjectConfiguration((PasteEObjectConfiguration)value, diagnostics, context);

-			case NattableaxisconfigurationPackage.AXIS_INDEX_STYLE:

-				return validateAxisIndexStyle((AxisIndexStyle)value, diagnostics, context);

-			default:

-				return true;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAbstractHeaderAxisConfiguration(AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(abstractHeaderAxisConfiguration, diagnostics, context)) return false;

-		boolean result = validate_EveryMultiplicityConforms(abstractHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(abstractHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(abstractHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(abstractHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(abstractHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_UniqueID(abstractHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(abstractHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(abstractHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(abstractHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(abstractHeaderAxisConfiguration, diagnostics, context);

-		return result;

-	}

-

-	/**

-	 * The cached validation expression for the oneObjectLabelConfigurationTypes constraint of '<em>Abstract Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_OBJECT_LABEL_CONFIGURATION_TYPES__EEXPRESSION = "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::ObjectLabelProviderConfiguration))->size() <= 1"; //$NON-NLS-1$

-

-	/**

-	 * Validates the oneObjectLabelConfigurationTypes constraint of '<em>Abstract Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION,

-				 abstractHeaderAxisConfiguration,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "oneObjectLabelConfigurationTypes", //$NON-NLS-1$

-				 ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_OBJECT_LABEL_CONFIGURATION_TYPES__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * The cached validation expression for the oneFeatureLabelConfigurationTypes constraint of '<em>Abstract Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_FEATURE_LABEL_CONFIGURATION_TYPES__EEXPRESSION = "ownedLabelConfigurations->collect(ilc : nattable::nattablelabelprovider::ILabelProviderConfiguration | ilc.oclAsType(nattable::nattablelabelprovider::FeatureLabelProviderConfiguration))->size() <= 1"; //$NON-NLS-1$

-

-	/**

-	 * Validates the oneFeatureLabelConfigurationTypes constraint of '<em>Abstract Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(AbstractHeaderAxisConfiguration abstractHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattableaxisconfigurationPackage.Literals.ABSTRACT_HEADER_AXIS_CONFIGURATION,

-				 abstractHeaderAxisConfiguration,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "oneFeatureLabelConfigurationTypes", //$NON-NLS-1$

-				 ABSTRACT_HEADER_AXIS_CONFIGURATION__ONE_FEATURE_LABEL_CONFIGURATION_TYPES__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAxisManagerRepresentation(AxisManagerRepresentation axisManagerRepresentation, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(axisManagerRepresentation, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAxisManagerConfiguration(AxisManagerConfiguration axisManagerConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(axisManagerConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableHeaderAxisConfiguration(TableHeaderAxisConfiguration tableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(tableHeaderAxisConfiguration, diagnostics, context)) return false;

-		boolean result = validate_EveryMultiplicityConforms(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_UniqueID(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(tableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTableHeaderAxisConfiguration_axisManagersIdUnique(tableHeaderAxisConfiguration, diagnostics, context);

-		return result;

-	}

-

-	/**

-	 * The cached validation expression for the axisManagersIdUnique constraint of '<em>Table Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS_ID_UNIQUE__EEXPRESSION = "axisManagers->forAll(am1 : AxisManagerRepresentation, am2 : AxisManagerRepresentation | am1.axisManagerId <> am2.axisManagerId)"; //$NON-NLS-1$

-

-	/**

-	 * Validates the axisManagersIdUnique constraint of '<em>Table Header Axis Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableHeaderAxisConfiguration_axisManagersIdUnique(TableHeaderAxisConfiguration tableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattableaxisconfigurationPackage.Literals.TABLE_HEADER_AXIS_CONFIGURATION,

-				 tableHeaderAxisConfiguration,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "axisManagersIdUnique", //$NON-NLS-1$

-				 TABLE_HEADER_AXIS_CONFIGURATION__AXIS_MANAGERS_ID_UNIQUE__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateLocalTableHeaderAxisConfiguration(LocalTableHeaderAxisConfiguration localTableHeaderAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(localTableHeaderAxisConfiguration, diagnostics, context)) return false;

-		boolean result = validate_EveryMultiplicityConforms(localTableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(localTableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(localTableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(localTableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(localTableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_UniqueID(localTableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(localTableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(localTableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateAbstractHeaderAxisConfiguration_oneObjectLabelConfigurationTypes(localTableHeaderAxisConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateAbstractHeaderAxisConfiguration_oneFeatureLabelConfigurationTypes(localTableHeaderAxisConfiguration, diagnostics, context);

-		return result;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateIAxisConfiguration(IAxisConfiguration iAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(iAxisConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateFeatureAxisConfiguration(FeatureAxisConfiguration featureAxisConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(featureAxisConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateIFillingConfiguration(IFillingConfiguration iFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(iFillingConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateEStructuralFeatureValueFillingConfiguration(EStructuralFeatureValueFillingConfiguration eStructuralFeatureValueFillingConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(eStructuralFeatureValueFillingConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateIPasteConfiguration(IPasteConfiguration iPasteConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(iPasteConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validatePasteEObjectConfiguration(PasteEObjectConfiguration pasteEObjectConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(pasteEObjectConfiguration, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateAxisIndexStyle(AxisIndexStyle axisIndexStyle, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return true;

-	}

-

-	/**

-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		// TODO

-		// Specialize this to return a resource locator for messages specific to this validator.

-		// Ensure that you remove @generated or mark it @generated NOT

-		return super.getResourceLocator();

-	}

-

-} //NattableaxisconfigurationValidator

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.java
deleted file mode 100644
index 2ca25c8581a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AbstractAxisProvider.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.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 -->

- *

- * <!-- begin-model-doc -->

- * Abstract Element for the AxisProvider. This one only provides a method getAxis().

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAbstractAxisProvider()

- * @model abstract="true"

- * @generated

- */

-public interface AbstractAxisProvider extends EModelElement, TableNamedElement {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This method must returns the IAxis owned by the AxisProvider.

-	 * Warning, in case of syncrhonized table, the list often will be empty. This method

-	 * only returns the IAxis serialized in the model. Displayed elements are not necessary serialized.

-	 * 

-	 * <!-- end-model-doc -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	EList<IAxis> getAxis();

-

-} // AbstractAxisProvider

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.java
deleted file mode 100644
index e4c41924026..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/AxisProvider.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.infra.nattable.model.nattable.nattableaxisprovider;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * AbstractAxisProvider. This one owns IAxis

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * IAxis owned by the AxisProvider. The list can be empty in case of synchronized table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Axis</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getAxisProvider_Axis()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<IAxis> getAxis();

-

-} // AxisProvider

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.java
deleted file mode 100644
index f82c0b869a6..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/IMasterAxisProvider.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.model.nattable.nattableaxisprovider;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>IMaster Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Interface used to distinghuish master axis provider from slave axis provider. 

- * The master are able to disconnect the slave.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * if true, the slave won't be updated when the elements owned by the master will be changed.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Disconnect Slave</em>' attribute.

-	 * @see #setDisconnectSlave(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getIMasterAxisProvider_DisconnectSlave()

-	 * @model

-	 * @generated

-	 */

-	boolean isDisconnectSlave();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.IMasterAxisProvider#isDisconnectSlave <em>Disconnect Slave</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Disconnect Slave</em>' attribute.

-	 * @see #isDisconnectSlave()

-	 * @generated

-	 */

-	void setDisconnectSlave(boolean value);

-

-} // IMasterAxisProvider

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java
deleted file mode 100644
index 7327a33bf3c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/ISlaveAxisProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ISlave Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Interface used to distinghuish the master from the slave axis provider.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getISlaveAxisProvider()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface ISlaveAxisProvider extends AxisProvider {

-} // ISlaveAxisProvider

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java
deleted file mode 100644
index 50c3888cd80..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/MasterObjectAxisProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Master Object Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Concret implementation of IMasterAxisProvider

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getMasterObjectAxisProvider()

- * @model

- * @generated

- */

-public interface MasterObjectAxisProvider extends IMasterAxisProvider {

-} // MasterObjectAxisProvider

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.java
deleted file mode 100644
index 41141440f10..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderFactory.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
deleted file mode 100644
index bd4f6b0a132..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/NattableaxisproviderPackage.java
+++ /dev/null
@@ -1,776 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java
deleted file mode 100644
index 937de781361..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/SlaveObjectAxisProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Slave Object Axis Provider</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Concret implementation of ISlaveAxisProvider

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage#getSlaveObjectAxisProvider()

- * @model

- * @generated

- */

-public interface SlaveObjectAxisProvider extends ISlaveAxisProvider {

-} // SlaveObjectAxisProvider

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
deleted file mode 100644
index 6f32ec79102..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AbstractAxisProviderImpl.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java
deleted file mode 100644
index 9032f66a566..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/AxisProviderImpl.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.java
deleted file mode 100644
index 2ba3993b69e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/MasterObjectAxisProviderImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.java
deleted file mode 100644
index 14b7a007979..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderFactoryImpl.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:

- * 	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
deleted file mode 100644
index f793175cdae..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/NattableaxisproviderPackageImpl.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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

-		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(ecorePackage.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(), ecorePackage.getEBoolean(), "disconnectSlave", null, 0, 1, IMasterAxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(iSlaveAxisProviderEClass, ISlaveAxisProvider.class, "ISlaveAxisProvider", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(axisProviderEClass, AxisProvider.class, "AxisProvider", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getAxisProvider_Axis(), theNattableaxisPackage.getIAxis(), null, "axis", null, 0, -1, AxisProvider.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(slaveObjectAxisProviderEClass, SlaveObjectAxisProvider.class, "SlaveObjectAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(masterObjectAxisProviderEClass, MasterObjectAxisProvider.class, "MasterObjectAxisProvider", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-	}

-

-} //NattableaxisproviderPackageImpl

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.java
deleted file mode 100644
index fb5afcd530e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/impl/SlaveObjectAxisProviderImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderAdapterFactory.java
deleted file mode 100644
index c369b397864..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxisprovider/util/NattableaxisproviderSwitch.java
deleted file mode 100644
index 901edd993ad..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
deleted file mode 100644
index bde04cd575c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/CellEditorDeclaration.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration;

-

-import java.util.Arrays;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the literals of the enumeration '<em><b>Cell Editor Declaration</b></em>',

- * and utility methods for working with them.

- * <!-- end-user-doc -->

- * <!-- begin-model-doc -->

- * Indicates how the CellEditor must be declared. 

- * In the common table, we display features as columns and objects as line. 

- * In this case the cell editors are specific to features, so the cell editor must be declared on the columns.

- * <!-- end-model-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getCellEditorDeclaration()

- * @model

- * @generated

- */

-public enum CellEditorDeclaration implements Enumerator {

-	/**

-	 * The '<em><b>COLUMN</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #COLUMN_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	COLUMN(0, "COLUMN", "COLUMN"), //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>ROW</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #ROW_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	ROW(1, "ROW", "ROW"), //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>CELL</b></em>' literal object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #CELL_VALUE

-	 * @generated

-	 * @ordered

-	 */

-	CELL(2, "CELL", "CELL"); //$NON-NLS-1$ //$NON-NLS-2$

-

-	/**

-	 * The '<em><b>COLUMN</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>COLUMN</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #COLUMN

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int COLUMN_VALUE = 0;

-

-	/**

-	 * The '<em><b>ROW</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>ROW</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #ROW

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int ROW_VALUE = 1;

-

-	/**

-	 * The '<em><b>CELL</b></em>' literal value.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of '<em><b>CELL</b></em>' literal object isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @see #CELL

-	 * @model

-	 * @generated

-	 * @ordered

-	 */

-	public static final int CELL_VALUE = 2;

-

-	/**

-	 * An array of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final CellEditorDeclaration[] VALUES_ARRAY = new CellEditorDeclaration[] {

-			COLUMN,

-			ROW,

-			CELL,

-		};

-

-	/**

-	 * A public read-only list of all the '<em><b>Cell Editor Declaration</b></em>' enumerators.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<CellEditorDeclaration> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-	/**

-	 * Returns the '<em><b>Cell Editor Declaration</b></em>' literal with the specified literal value.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.java
deleted file mode 100644
index e0a3a89792c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationFactory.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
deleted file mode 100644
index 4b7624efdb3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/NattableconfigurationPackage.java
+++ /dev/null
@@ -1,616 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"

- * @generated

- */

-public interface NattableconfigurationPackage extends EPackage {

-

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "nattableconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "nattableconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	NattableconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl <em>Table Named Element</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.TableNamedElementImpl

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl.NattableconfigurationPackageImpl#getTableNamedElement()

-	 * @generated

-	 */

-	int TABLE_NAMED_ELEMENT = 0;

-

-	/**

-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int TABLE_NAMED_ELEMENT__EANNOTATIONS = 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
deleted file mode 100644
index e8947efa3cc..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableConfiguration.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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 -->

- *

- * <!-- begin-model-doc -->

- * This object is used to configure a table. To create a new type of table, you must create 

- * a new file *.nattableConfiguration and register it using the extension point org.eclipse.papyrus.infra.nattable.configuration

- * 

- * the defaultAxisProviders can be : Master/Master, Master/Slave, Slave/Master and never Slave/Slave.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 annotation="http://www.eclipse.org/emf/2002/Ecore constraints='defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection'"

- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot defaultRowAxisProviderExistsInCollection='rowAxisProviders->includes(defaultRowAxisProvider)' defaultColumnAxisProviderExistsInCollection='columnAxisProviders->includes(defaultColumnAxisProvider)'"

- * @generated

- */

-public interface TableConfiguration extends TableNamedElement {

-

-	/**

-	 * Returns the value of the '<em><b>Type</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The type of the table. This value is used to be able to open/close easily the table editor in Papyrus. 

-	 * Moreover it allows to distinghuish easily the table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Type</em>' attribute.

-	 * @see #setType(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_Type()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getType();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getType <em>Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Type</em>' attribute.

-	 * @see #getType()

-	 * @generated

-	 */

-	void setType(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Icon Path</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The path of the icon to use for the table which references this TableConfiguration.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Icon Path</em>' attribute.

-	 * @see #setIconPath(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_IconPath()

-	 * @model

-	 * @generated

-	 */

-	String getIconPath();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getIconPath <em>Icon Path</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Icon Path</em>' attribute.

-	 * @see #getIconPath()

-	 * @generated

-	 */

-	void setIconPath(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Creation Tester</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value could be null. The tester is used to know if this tableConfiguration can be used

-	 * to create a new table using as context the selected element.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Creation Tester</em>' containment reference.

-	 * @see #setCreationTester(AbstractTableTester)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_CreationTester()

-	 * @model containment="true"

-	 * @generated

-	 */

-	AbstractTableTester getCreationTester();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCreationTester <em>Creation Tester</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Creation Tester</em>' containment reference.

-	 * @see #getCreationTester()

-	 * @generated

-	 */

-	void setCreationTester(AbstractTableTester value);

-

-	/**

-	 * Returns the value of the '<em><b>Cell Editor Declaration</b></em>' attribute.

-	 * The default value is <code>"COLUMN"</code>.

-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. Indicates how the CellEditor must be declared. 

-	 * In the common table, we display features as columns and objects as line. 

-	 * In this case the cell editors are specific to features, so the cell editor must be declared on the columns.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Cell Editor Declaration</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

-	 * @see #setCellEditorDeclaration(CellEditorDeclaration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_CellEditorDeclaration()

-	 * @model default="COLUMN" required="true"

-	 * @generated

-	 */

-	CellEditorDeclaration getCellEditorDeclaration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getCellEditorDeclaration <em>Cell Editor Declaration</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Cell Editor Declaration</em>' attribute.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.CellEditorDeclaration

-	 * @see #getCellEditorDeclaration()

-	 * @generated

-	 */

-	void setCellEditorDeclaration(CellEditorDeclaration value);

-

-	/**

-	 * Returns the value of the '<em><b>Row Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. Gives the initial row configuration of the table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Row Header Axis Configuration</em>' containment reference.

-	 * @see #setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_RowHeaderAxisConfiguration()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	TableHeaderAxisConfiguration getRowHeaderAxisConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getRowHeaderAxisConfiguration <em>Row Header Axis Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Row Header Axis Configuration</em>' containment reference.

-	 * @see #getRowHeaderAxisConfiguration()

-	 * @generated

-	 */

-	void setRowHeaderAxisConfiguration(TableHeaderAxisConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Column Header Axis Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. Gives the initial column configuration of the table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Column Header Axis Configuration</em>' containment reference.

-	 * @see #setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_ColumnHeaderAxisConfiguration()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	TableHeaderAxisConfiguration getColumnHeaderAxisConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getColumnHeaderAxisConfiguration <em>Column Header Axis Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Column Header Axis Configuration</em>' containment reference.

-	 * @see #getColumnHeaderAxisConfiguration()

-	 * @generated

-	 */

-	void setColumnHeaderAxisConfiguration(TableHeaderAxisConfiguration value);

-

-	/**

-	 * Returns the value of the '<em><b>Column Axis Providers</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This list can't be empty. Contains list of possible column AxisProvider for the table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Column Axis Providers</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_ColumnAxisProviders()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<AbstractAxisProvider> getColumnAxisProviders();

-

-	/**

-	 * Returns the value of the '<em><b>Row Axis Providers</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This list can't be empty. Contains a list of possible row AxisProvider for the table.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Row Axis Providers</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_RowAxisProviders()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	EList<AbstractAxisProvider> getRowAxisProviders();

-

-	/**

-	 * Returns the value of the '<em><b>Default Row Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. References the Axis Provider to use by default for rows.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Default Row Axis Provider</em>' reference.

-	 * @see #setDefaultRowAxisProvider(AbstractAxisProvider)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_DefaultRowAxisProvider()

-	 * @model required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getDefaultRowAxisProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultRowAxisProvider <em>Default Row Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Default Row Axis Provider</em>' reference.

-	 * @see #getDefaultRowAxisProvider()

-	 * @generated

-	 */

-	void setDefaultRowAxisProvider(AbstractAxisProvider value);

-

-	/**

-	 * Returns the value of the '<em><b>Default Column Axis Provider</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * This value can't be null. References the Axis Provider to use by default for columns.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Default Column Axis Provider</em>' reference.

-	 * @see #setDefaultColumnAxisProvider(AbstractAxisProvider)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableConfiguration_DefaultColumnAxisProvider()

-	 * @model required="true"

-	 * @generated

-	 */

-	AbstractAxisProvider getDefaultColumnAxisProvider();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableConfiguration#getDefaultColumnAxisProvider <em>Default Column Axis Provider</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Default Column Axis Provider</em>' reference.

-	 * @see #getDefaultColumnAxisProvider()

-	 * @generated

-	 */

-	void setDefaultColumnAxisProvider(AbstractAxisProvider value);

-

-} // TableConfiguration

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java
deleted file mode 100644
index 9bd982e4ed5..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/TableNamedElement.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Table Named Element</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract Element used in this metamodel for named element which have a description.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 EObject, EModelElement {

-

-	/**

-	 * Returns the value of the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The description of the named element.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Description</em>' attribute.

-	 * @see #setDescription(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement_Description()

-	 * @model

-	 * @generated

-	 */

-	String getDescription();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getDescription <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Description</em>' attribute.

-	 * @see #getDescription()

-	 * @generated

-	 */

-	void setDescription(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The name of the named element.

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage#getTableNamedElement_Name()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.TableNamedElement#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-} // TableNamedElement

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.java
deleted file mode 100644
index 337c15f2aa3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationFactoryImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
deleted file mode 100644
index da71e5a3cd0..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/NattableconfigurationPackageImpl.java
+++ /dev/null
@@ -1,467 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.impl;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EValidator;

-import org.eclipse.emf.ecore.EcorePackage;

-

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-

-import org.eclipse.papyrus.infra.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.nattableconfiguration.util.NattableconfigurationValidator;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.impl.NattablelabelproviderPackageImpl;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.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();

-

-		// Register package validator

-		EValidator.Registry.INSTANCE.put

-			(theNattableconfigurationPackage, 

-			 new EValidator.Descriptor() {

-				 public EValidator getEValidator() {

-					 return NattableconfigurationValidator.INSTANCE;

-				 }

-			 });

-

-		// Mark meta-data to indicate it can't be changed

-		theNattableconfigurationPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(NattableconfigurationPackage.eNS_URI, theNattableconfigurationPackage);

-		return theNattableconfigurationPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	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

-		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(ecorePackage.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, 1, 1, TableNamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(tableConfigurationEClass, TableConfiguration.class, "TableConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getTableConfiguration_Type(), ecorePackage.getEString(), "type", null, 1, 1, TableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(getTableConfiguration_IconPath(), ecorePackage.getEString(), "iconPath", null, 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);

-

-		// Create annotations

-		// http://www.eclipse.org/emf/2002/Ecore

-		createEcoreAnnotations();

-		// http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot

-		createPivotAnnotations();

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createEcoreAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$		

-		addAnnotation

-		  (this, 

-		   source, 

-		   new String[] {

-			 "invocationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-			 "settingDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$ //$NON-NLS-2$

-			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot" //$NON-NLS-1$ //$NON-NLS-2$

-		   });					

-		addAnnotation

-		  (tableConfigurationEClass, 

-		   source, 

-		   new String[] {

-			 "constraints", "defaultRowAxisProviderExistsInCollection defaultColumnAxisProviderExistsInCollection" //$NON-NLS-1$ //$NON-NLS-2$

-		   });													

-	}

-

-	/**

-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void createPivotAnnotations() {

-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"; //$NON-NLS-1$							

-		addAnnotation

-		  (tableConfigurationEClass, 

-		   source, 

-		   new String[] {

-			 "defaultRowAxisProviderExistsInCollection", "rowAxisProviders->includes(defaultRowAxisProvider)", //$NON-NLS-1$ //$NON-NLS-2$

-			 "defaultColumnAxisProviderExistsInCollection", "columnAxisProviders->includes(defaultColumnAxisProvider)" //$NON-NLS-1$ //$NON-NLS-2$

-		   });												

-	}

-

-} //NattableconfigurationPackageImpl

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
deleted file mode 100644
index cb2eca5fea1..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableConfigurationImpl.java
+++ /dev/null
@@ -1,700 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.java
deleted file mode 100644
index ea5f047820b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/impl/TableNamedElementImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationAdapterFactory.java
deleted file mode 100644
index 9e01d1e0c2b..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationSwitch.java
deleted file mode 100644
index e0a548af385..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java
deleted file mode 100644
index 10c97cfb4d5..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableconfiguration/util/NattableconfigurationValidator.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.ResourceLocator;

-

-import org.eclipse.emf.ecore.EPackage;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.*;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Validator</b> for the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration.NattableconfigurationPackage

- * @generated

- */

-public class NattableconfigurationValidator extends EObjectValidator {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final NattableconfigurationValidator INSTANCE = new NattableconfigurationValidator();

-

-	/**

-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

-	 * @generated

-	 */

-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable.nattableconfiguration"; //$NON-NLS-1$

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableconfigurationValidator() {

-		super();

-	}

-

-	/**

-	 * Returns the package of this validator switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EPackage getEPackage() {

-	  return NattableconfigurationPackage.eINSTANCE;

-	}

-

-	/**

-	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		switch (classifierID) {

-			case NattableconfigurationPackage.TABLE_NAMED_ELEMENT:

-				return validateTableNamedElement((TableNamedElement)value, diagnostics, context);

-			case NattableconfigurationPackage.TABLE_CONFIGURATION:

-				return validateTableConfiguration((TableConfiguration)value, diagnostics, context);

-			case NattableconfigurationPackage.CELL_EDITOR_DECLARATION:

-				return validateCellEditorDeclaration((CellEditorDeclaration)value, diagnostics, context);

-			default:

-				return true;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableNamedElement(TableNamedElement tableNamedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(tableNamedElement, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableConfiguration(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(tableConfiguration, diagnostics, context)) return false;

-		boolean result = validate_EveryMultiplicityConforms(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_UniqueID(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTableConfiguration_defaultRowAxisProviderExistsInCollection(tableConfiguration, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTableConfiguration_defaultColumnAxisProviderExistsInCollection(tableConfiguration, diagnostics, context);

-		return result;

-	}

-

-	/**

-	 * The cached validation expression for the defaultRowAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION = "rowAxisProviders->includes(defaultRowAxisProvider)"; //$NON-NLS-1$

-

-	/**

-	 * Validates the defaultRowAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableConfiguration_defaultRowAxisProviderExistsInCollection(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,

-				 tableConfiguration,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "defaultRowAxisProviderExistsInCollection", //$NON-NLS-1$

-				 TABLE_CONFIGURATION__DEFAULT_ROW_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * The cached validation expression for the defaultColumnAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION = "columnAxisProviders->includes(defaultColumnAxisProvider)"; //$NON-NLS-1$

-

-	/**

-	 * Validates the defaultColumnAxisProviderExistsInCollection constraint of '<em>Table Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTableConfiguration_defaultColumnAxisProviderExistsInCollection(TableConfiguration tableConfiguration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattableconfigurationPackage.Literals.TABLE_CONFIGURATION,

-				 tableConfiguration,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "defaultColumnAxisProviderExistsInCollection", //$NON-NLS-1$

-				 TABLE_CONFIGURATION__DEFAULT_COLUMN_AXIS_PROVIDER_EXISTS_IN_COLLECTION__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateCellEditorDeclaration(CellEditorDeclaration cellEditorDeclaration, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return true;

-	}

-

-	/**

-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		// TODO

-		// Specialize this to return a resource locator for messages specific to this validator.

-		// Ensure that you remove @generated or mark it @generated NOT

-		return super.getResourceLocator();

-	}

-

-} //NattableconfigurationValidator

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
deleted file mode 100644
index 6214ce900af..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/FeatureLabelProviderConfiguration.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Feature Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * LabelProviderConfiguration for Feature. In case of Feature. we have two display options : 

- * <ul><li>display the icon of the feature </li> 

- * <li>display the label of the feature </li>

- * <li>display the multiplicity of the feature </li>

- * <li>display the type of the feature </li>

- * <li>display the '/' for isDerived of the feature </li>

- * <li>display the name of the feature </li>

- *  </ul>

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, we will display the '/' for isDerived

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Is Derived</em>' attribute.

-	 * @see #setDisplayIsDerived(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayIsDerived()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayIsDerived();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayIsDerived <em>Display Is Derived</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Is Derived</em>' attribute.

-	 * @see #isDisplayIsDerived()

-	 * @generated

-	 */

-	void setDisplayIsDerived(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Type</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, we will display the typeof the feature

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Type</em>' attribute.

-	 * @see #setDisplayType(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayType()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayType();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayType <em>Display Type</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Type</em>' attribute.

-	 * @see #isDisplayType()

-	 * @generated

-	 */

-	void setDisplayType(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Multiplicity</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, we will display the multiplicity of the feature

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Multiplicity</em>' attribute.

-	 * @see #setDisplayMultiplicity(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayMultiplicity()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayMultiplicity();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayMultiplicity <em>Display Multiplicity</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Multiplicity</em>' attribute.

-	 * @see #isDisplayMultiplicity()

-	 * @generated

-	 */

-	void setDisplayMultiplicity(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, we will display the name of the feature

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Name</em>' attribute.

-	 * @see #setDisplayName(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getFeatureLabelProviderConfiguration_DisplayName()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration#isDisplayName <em>Display Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Name</em>' attribute.

-	 * @see #isDisplayName()

-	 * @generated

-	 */

-	void setDisplayName(boolean value);

-

-} // FeatureLabelProviderConfiguration

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java
deleted file mode 100644
index 8e93f38ed59..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ILabelProviderConfiguration.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>ILabel Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Common Interface for LabelProviderConfiguration

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getILabelProviderConfiguration()

- * @model interface="true" abstract="true"

- * @generated

- */

-public interface ILabelProviderConfiguration extends EObject, EModelElement {

-} // ILabelProviderConfiguration

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.java
deleted file mode 100644
index 346d1516e19..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderFactory.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
deleted file mode 100644
index 5e5a9f10cd4..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/NattablelabelproviderPackage.java
+++ /dev/null
@@ -1,481 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
deleted file mode 100644
index 5136ede9ea3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/ObjectLabelProviderConfiguration.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Object Label Provider Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * LabelProviderConfiguration for Object. In case of Object we have two display options : 

- * <ul><li>display the icon of the object</li> 

- * <li>display the label of the object</li> </ul>

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, we will display the icon of the object

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Icon</em>' attribute.

-	 * @see #setDisplayIcon(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration_DisplayIcon()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayIcon();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayIcon <em>Display Icon</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Icon</em>' attribute.

-	 * @see #isDisplayIcon()

-	 * @generated

-	 */

-	void setDisplayIcon(boolean value);

-

-	/**

-	 * Returns the value of the '<em><b>Display Label</b></em>' attribute.

-	 * The default value is <code>"true"</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * If true, we will display the label of the object

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Display Label</em>' attribute.

-	 * @see #setDisplayLabel(boolean)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.NattablelabelproviderPackage#getObjectLabelProviderConfiguration_DisplayLabel()

-	 * @model default="true" required="true"

-	 * @generated

-	 */

-	boolean isDisplayLabel();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration#isDisplayLabel <em>Display Label</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Display Label</em>' attribute.

-	 * @see #isDisplayLabel()

-	 * @generated

-	 */

-	void setDisplayLabel(boolean value);

-

-} // ObjectLabelProviderConfiguration

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.java
deleted file mode 100644
index 4b81d446e6f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/FeatureLabelProviderConfigurationImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.java
deleted file mode 100644
index e92bf20e2e5..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderFactoryImpl.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:

- * 	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
deleted file mode 100644
index 494c32d15b7..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/NattablelabelproviderPackageImpl.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		iLabelProviderConfigurationEClass.getESuperTypes().add(ecorePackage.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(), ecorePackage.getEBoolean(), "displayIsDerived", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getFeatureLabelProviderConfiguration_DisplayType(), ecorePackage.getEBoolean(), "displayType", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getFeatureLabelProviderConfiguration_DisplayMultiplicity(), ecorePackage.getEBoolean(), "displayMultiplicity", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getFeatureLabelProviderConfiguration_DisplayName(), ecorePackage.getEBoolean(), "displayName", "true", 1, 1, FeatureLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-

-		initEClass(objectLabelProviderConfigurationEClass, ObjectLabelProviderConfiguration.class, "ObjectLabelProviderConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(getObjectLabelProviderConfiguration_DisplayIcon(), ecorePackage.getEBoolean(), "displayIcon", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-		initEAttribute(getObjectLabelProviderConfiguration_DisplayLabel(), ecorePackage.getEBoolean(), "displayLabel", "true", 1, 1, ObjectLabelProviderConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-} //NattablelabelproviderPackageImpl

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/impl/ObjectLabelProviderConfigurationImpl.java
deleted file mode 100644
index 48243cb7054..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderAdapterFactory.java
deleted file mode 100644
index 35ff63081ce..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattablelabelprovider/util/NattablelabelproviderSwitch.java
deleted file mode 100644
index 7723ad7e33a..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.java
deleted file mode 100644
index 62853d53724..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/AbstractTableTester.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.model.nattable.nattabletester;

-

-import org.eclipse.emf.ecore.EModelElement;

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Abstract Table Tester</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * Abstract class for the tester.

- * <!-- end-model-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getAbstractTableTester()

- * @model abstract="true"

- * @generated

- */

-public interface AbstractTableTester extends EObject, EModelElement {

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * Returns an object representing the tester

-	 * <!-- end-model-doc -->

-	 * @model kind="operation"

-	 * @generated

-	 */

-	Object getTester();

-

-} // AbstractTableTester

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.java
deleted file mode 100644
index c58295e7424..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/JavaTableTester.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.model.nattable.nattabletester;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Java Table Tester</b></em>'.

- * <!-- end-user-doc -->

- *

- * <!-- begin-model-doc -->

- * This class allows to references a JavaTableTester. The Java class is declared with an id, using the extension point org.eclipse.papyrus.infra.nattable.tester.

- * The field tester must be the id declared in this extension point.

- * <!-- end-model-doc -->

- *

- * <p>

- * The following features are supported:

- * <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 -->

-	 * <!-- end-user-doc -->

-	 * <!-- begin-model-doc -->

-	 * The id of the java tester declared using the extension point org.eclispe.papyrus.infra.nattable.tester

-	 * <!-- end-model-doc -->

-	 * @return the value of the '<em>Tester</em>' attribute.

-	 * @see #setTester(String)

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattabletester.NattabletesterPackage#getJavaTableTester_Tester()

-	 * @model required="true"

-	 * @generated

-	 */

-	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.java
deleted file mode 100644
index dedb3c52985..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterFactory.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
deleted file mode 100644
index 0af039a1ffd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/NattabletesterPackage.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
deleted file mode 100644
index 98bf50f7ada..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/AbstractTableTesterImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.java
deleted file mode 100644
index 6c0fd8ffccf..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/JavaTableTesterImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.java
deleted file mode 100644
index 14055173d75..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterFactoryImpl.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
deleted file mode 100644
index a4758446360..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/impl/NattabletesterPackageImpl.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		abstractTableTesterEClass.getESuperTypes().add(ecorePackage.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterAdapterFactory.java
deleted file mode 100644
index d7d9709102a..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattabletester/util/NattabletesterSwitch.java
deleted file mode 100644
index 0a1f0eb6089..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
deleted file mode 100644
index 6a05fd798c7..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableAdapterFactory.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/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 caseICell(ICell object) {

-				return createICellAdapter();

-			}

-			@Override

-			public Adapter caseProblem(Problem object) {

-				return createProblemAdapter();

-			}

-			@Override

-			public Adapter casePasteProblem(PasteProblem object) {

-				return createPasteProblemAdapter();

-			}

-			@Override

-			public Adapter caseEObjectCell(EObjectCell object) {

-				return createEObjectCellAdapter();

-			}

-			@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.papyrus.infra.nattable.model.nattable.ICell <em>ICell</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.ICell

-	 * @generated

-	 */

-	public Adapter createICellAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.Problem <em>Problem</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.Problem

-	 * @generated

-	 */

-	public Adapter createProblemAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem <em>Paste Problem</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.PasteProblem

-	 * @generated

-	 */

-	public Adapter createPasteProblemAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell <em>EObject Cell</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell

-	 * @generated

-	 */

-	public Adapter createEObjectCellAdapter() {

-		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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.java
deleted file mode 100644
index 2dd8413525f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableSwitch.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.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;

-			}

-			case NattablePackage.ICELL: {

-				ICell iCell = (ICell)theEObject;

-				T result = caseICell(iCell);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablePackage.PROBLEM: {

-				Problem problem = (Problem)theEObject;

-				T result = caseProblem(problem);

-				if (result == null) result = caseTableNamedElement(problem);

-				if (result == null) result = caseEModelElement(problem);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablePackage.PASTE_PROBLEM: {

-				PasteProblem pasteProblem = (PasteProblem)theEObject;

-				T result = casePasteProblem(pasteProblem);

-				if (result == null) result = caseProblem(pasteProblem);

-				if (result == null) result = caseTableNamedElement(pasteProblem);

-				if (result == null) result = caseEModelElement(pasteProblem);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case NattablePackage.EOBJECT_CELL: {

-				EObjectCell eObjectCell = (EObjectCell)theEObject;

-				T result = caseEObjectCell(eObjectCell);

-				if (result == null) result = caseICell(eObjectCell);

-				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>ICell</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>ICell</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseICell(ICell object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Problem</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Problem</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseProblem(Problem object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Paste Problem</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Paste Problem</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T casePasteProblem(PasteProblem object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject Cell</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject Cell</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseEObjectCell(EObjectCell 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java
deleted file mode 100644
index b823a91fecd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/util/NattableValidator.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/**

- * Copyright (c) 2013 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.nattable.model.nattable.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.DiagnosticChain;

-import org.eclipse.emf.common.util.ResourceLocator;

-

-import org.eclipse.emf.ecore.EPackage;

-

-import org.eclipse.emf.ecore.util.EObjectValidator;

-

-import org.eclipse.papyrus.infra.nattable.model.nattable.*;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Validator</b> for the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage

- * @generated

- */

-public class NattableValidator extends EObjectValidator {

-

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final NattableValidator INSTANCE = new NattableValidator();

-

-	/**

-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()

-	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()

-	 * @generated

-	 */

-	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.nattable.model.nattable"; //$NON-NLS-1$

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;

-

-	/**

-	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NattableValidator() {

-		super();

-	}

-

-	/**

-	 * Returns the package of this validator switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EPackage getEPackage() {

-	  return NattablePackage.eINSTANCE;

-	}

-

-	/**

-	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		switch (classifierID) {

-			case NattablePackage.TABLE:

-				return validateTable((Table)value, diagnostics, context);

-			case NattablePackage.ICELL:

-				return validateICell((ICell)value, diagnostics, context);

-			case NattablePackage.PROBLEM:

-				return validateProblem((Problem)value, diagnostics, context);

-			case NattablePackage.PASTE_PROBLEM:

-				return validatePasteProblem((PasteProblem)value, diagnostics, context);

-			case NattablePackage.EOBJECT_CELL:

-				return validateEObjectCell((EObjectCell)value, diagnostics, context);

-			default:

-				return true;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTable(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		if (!validate_NoCircularContainment(table, diagnostics, context)) return false;

-		boolean result = validate_EveryMultiplicityConforms(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_UniqueID(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTable_currentRowAxisInHistory(table, diagnostics, context);

-		if (result || diagnostics != null) result &= validateTable_currentColumnAxisInHistory(table, diagnostics, context);

-		return result;

-	}

-

-	/**

-	 * The cached validation expression for the currentRowAxisInHistory constraint of '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE__CURRENT_ROW_AXIS_IN_HISTORY__EEXPRESSION = "rowAxisProvidersHistory->includes(currentRowAxisProvider)"; //$NON-NLS-1$

-

-	/**

-	 * Validates the currentRowAxisInHistory constraint of '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTable_currentRowAxisInHistory(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattablePackage.Literals.TABLE,

-				 table,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "currentRowAxisInHistory", //$NON-NLS-1$

-				 TABLE__CURRENT_ROW_AXIS_IN_HISTORY__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * The cached validation expression for the currentColumnAxisInHistory constraint of '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static final String TABLE__CURRENT_COLUMN_AXIS_IN_HISTORY__EEXPRESSION = "columnAxisProvidersHistory->includes(currentColumnAxisProvider)"; //$NON-NLS-1$

-

-	/**

-	 * Validates the currentColumnAxisInHistory constraint of '<em>Table</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateTable_currentColumnAxisInHistory(Table table, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return

-			validate

-				(NattablePackage.Literals.TABLE,

-				 table,

-				 diagnostics,

-				 context,

-				 "http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot", //$NON-NLS-1$

-				 "currentColumnAxisInHistory", //$NON-NLS-1$

-				 TABLE__CURRENT_COLUMN_AXIS_IN_HISTORY__EEXPRESSION,

-				 Diagnostic.ERROR,

-				 DIAGNOSTIC_SOURCE,

-				 0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateICell(ICell iCell, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(iCell, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateProblem(Problem problem, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(problem, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validatePasteProblem(PasteProblem pasteProblem, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(pasteProblem, diagnostics, context);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public boolean validateEObjectCell(EObjectCell eObjectCell, DiagnosticChain diagnostics, Map<Object, Object> context) {

-		return validate_EveryDefaultConstraint(eObjectCell, diagnostics, context);

-	}

-

-	/**

-	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		// TODO

-		// Specialize this to return a resource locator for messages specific to this validator.

-		// Ensure that you remove @generated or mark it @generated NOT

-		return super.getResourceLocator();

-	}

-

-} //NattableValidator

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/tablemetamodeldocumentation.mediawiki b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.model/tablemetamodeldocumentation.mediawiki
deleted file mode 100644
index 1564bbf26e5..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/.classpath b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/.classpath
deleted file mode 100644
index 8a8f1668cdc..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/.project b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/.project
deleted file mode 100644
index aa7f080ea05..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
deleted file mode 100644
index f714168827e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,37 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.sasheditor.di;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.core;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.emf;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.1",

- org.eclipse.nebula.widgets.nattable.core,

- org.eclipse.papyrus.infra.emf.nattable;bundle-version="0.10.1",

- org.eclipse.emf.edit,

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.1",

- org.eclipse.emf.transaction,

- org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.1",

- org.eclipse.papyrus.uml.tools;bundle-version="0.10.1"

-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

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.10.1.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.views.config.Acti

- vator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.views.config;s

- ingleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/OSGI-INF/l10n/bundle.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 928ca7a4737..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/about.html b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/build.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/build.properties
deleted file mode 100644
index 5d4530103a8..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png
deleted file mode 100644
index 601595c950c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/icons/old/nattablepageeditor.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/icons/old/nattablepageeditor.gif
deleted file mode 100644
index 20416f02be0..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/icons/old/nattablepageeditor.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/icons/old/nattablepageeditor.png b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/icons/old/nattablepageeditor.png
deleted file mode 100644
index 3eb64f31e36..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/icons/old/nattablepageeditor.png
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/plugin.xml b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/plugin.xml
deleted file mode 100644
index e6fc4ce7a79..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration
deleted file mode 100644
index 32d6a1b8580..00000000000
--- a/sandbox/pasteInNewTable/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="PapyrusViewsTable" iconPath="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">

-  <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.infra.nattable.views.config.creation.tester"/>

-  <rowHeaderAxisConfiguration 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.java
deleted file mode 100644
index 33349755bb6..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/Activator.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.infra.nattable.views.config;

-

-import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.nattable.views.config"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		log = new LogHelper(this);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 * 

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.java
deleted file mode 100644
index 67744c03730..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/celleditor/ModelViewsCellEditorConfiguration.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.views.config.celleditor;

-

-import org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;

-

-

-/**

- * The cell editor configuration for the table model views

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class ModelViewsCellEditorConfiguration extends EStructuralFeatureEditorConfig {

-

-	public static final String CONFIG_EDITOR_ID = "MODEL_VIEW_CELL_EDITOR_ID";

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#getFeatureIdentifier(org.eclipse.papyrus.infra.nattable.model.nattable.Table,

-	 *      java.lang.Object)

-	 * 

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	@Override

-	protected int getFeatureIdentifier(Table table, Object axisElement) {

-		axisElement = AxisUtils.getRepresentedElement(axisElement);

-		if(((String)axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_CONTEXT)) {

-			return SINGLE_EMF_REFERENCE;

-		} else if(((String)axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_IS_OPEN)) {

-			return SINGLE_BOOLEAN;

-		} else if(((String)axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_NAME)) {

-			return SINGLE_STRING;

-		} else if(((String)axisElement).equals(Utils.NATTABLE_EDITOR_PAGE_ID + Utils.VIEW_EDITOR_TYPE)) {

-			return SINGLE_STRING;

-		}

-		return UNKNOWN_TYPE;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.celleditor.config.EStructuralFeatureEditorConfig#handles(org.eclipse.papyrus.infra.nattable.model.nattable.Table,

-	 *      java.lang.Object)

-	 * 

-	 * @param table

-	 * @param axisElement

-	 * @return

-	 */

-	@Override

-	public boolean handles(Table table, Object axisElement) {

-		axisElement = AxisUtils.getRepresentedElement(axisElement);

-		if(table.getTableConfiguration().getType().equals(Utils.TABLE_VIEW_TYPE_VALUE)) {

-			return axisElement instanceof String && ((String)axisElement).startsWith(Utils.NATTABLE_EDITOR_PAGE_ID);

-		}

-		return false;

-	}

-

-	@Override

-	public String getEditorId() {

-		return CONFIG_EDITOR_ID;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java
deleted file mode 100644
index 924cce101a9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorContextSynchronizerAxisManager.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.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#verifyValues()

-	 * 

-	 */

-	@Override

-	protected void verifyValues() {

-		//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;

-	}

-

-	/**

-	 * 

-	 * @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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/axis/EditorFeatureAxisManager.java b/sandbox/pasteInNewTable/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/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/cell/ModelViewsCellManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/cell/ModelViewsCellManager.java
deleted file mode 100644
index 4a213a2de66..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/manager/cell/ModelViewsCellManager.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.views.config.manager.cell;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

-

-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.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.utils.AxisUtils;

-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(Object obj1, Object obj2) {

-		final List<Object> objects = new ArrayList<Object>();

-		obj1 = AxisUtils.getRepresentedElement(obj1);

-		obj2 = AxisUtils.getRepresentedElement(obj2);

-		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)) || mngr==null) {

-					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;

-	}

-

-	@Override

-	public ICommand getSetStringValueCommand(EditingDomain domain, EObject tableContext, Object obj1, Object obj2, String newValue, Map<?, ?> stringResolvers) {

-		return null;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/Messages.java b/sandbox/pasteInNewTable/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/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/messages/messages.properties b/sandbox/pasteInNewTable/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/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java
deleted file mode 100644
index 7f6e2fdf9fd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.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.views.config.provider;

-

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider;

-import org.eclipse.papyrus.infra.emf.nattable.registry.EStructuralFeatureImageRegistry;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.views.config.utils.Utils;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * The label provider used for ModelView header

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class ModelViewsHeaderLabelProvider extends EMFFeatureHeaderLabelProvider {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#accept(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean accept(final Object element) {

-		if(element instanceof ILabelProviderContextElementWrapper) {

-			final Object object = ((ILabelProviderContextElementWrapper)element).getObject();

-			final String id = AxisUtils.getPropertyId(object);

-			if(id != null) {

-				return id.startsWith(Utils.NATTABLE_EDITOR_PAGE_ID);

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getText(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(final Object element) {

-		final ILabelProviderContextElementWrapper contextElement = (ILabelProviderContextElementWrapper)element;

-		final Object object = contextElement.getObject();

-		final IConfigRegistry configRegistry = contextElement.getConfigRegistry();

-		final String id = AxisUtils.getPropertyId(object);

-		String name = id.replaceFirst(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$

-		Object type = null;

-		boolean isDerived = false;

-		int lowerBounds = 1;

-		int upperBounds = 1;

-		if(Utils.VIEW_NAME.equals(name)) {

-			lowerBounds = 0;

-			type = EcorePackage.eINSTANCE.getEString();

-		} else if(Utils.VIEW_IS_OPEN.equals(name)) {

-			isDerived = true;

-			type = EcorePackage.eINSTANCE.getEBoolean();

-		} else if(Utils.VIEW_CONTEXT.equals(name)) {

-			isDerived = true;

-			type = EcorePackage.eINSTANCE.getEObject();

-		} else if(Utils.VIEW_EDITOR_TYPE.equals(name)) {

-			type = EcorePackage.eINSTANCE.getEString();

-		}

-		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElementWrapper) {

-			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper)element);

-		}

-		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayLabel()) {

-			return ""; //$NON-NLS-1$

-		}

-		String alias = ""; //$NON-NLS-1$

-		if(object instanceof FeatureAxis) {

-			alias = ((FeatureAxis)object).getAlias();

-		}

-		if(alias != null && !alias.equals("")) { //$NON-NLS-1$

-			name = alias;

-		}

-		if(conf instanceof FeatureLabelProviderConfiguration) {

-			return getText((FeatureLabelProviderConfiguration)conf, configRegistry, name, type, isDerived, lowerBounds, upperBounds);

-		} else {

-			return super.getText(element);

-		}

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.provider.EMFFeatureHeaderLabelProvider#getImage(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public Image getImage(final Object element) {

-		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElementWrapper) {

-			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper)element);

-		}

-		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayIcon()) {

-			return null;

-		}

-		final Object object = ((ILabelProviderContextElementWrapper)element).getObject();

-		final String id = AxisUtils.getPropertyId(object);

-		final String columnName = id.replaceFirst(Utils.NATTABLE_EDITOR_PAGE_ID, ""); //$NON-NLS-1$

-		if(Utils.VIEW_NAME.equals(columnName) || Utils.VIEW_IS_OPEN.equals(columnName) || Utils.VIEW_EDITOR_TYPE.equals(columnName)) {

-			return EStructuralFeatureImageRegistry.getAttributeIcon();

-		} else if(Utils.VIEW_CONTEXT.equals(columnName)) {

-			return EStructuralFeatureImageRegistry.getLinkIcon();

-		}

-		return null;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/TableViewCreationTester.java b/sandbox/pasteInNewTable/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/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/utils/Utils.java
deleted file mode 100644
index 73e586dcf85..00000000000
--- a/sandbox/pasteInNewTable/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 = "PapyrusViewsTable";

-

-	/**

-	 * 

-	 * @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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/.classpath b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/.classpath
deleted file mode 100644
index f0c973db676..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/.project b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/.project
deleted file mode 100644
index 552b9235cf4..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f287d53cf45..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
deleted file mode 100644
index 4067a87ffb4..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,52 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.papyrus.infra.widgets;bundle-version="0.10.1",

- 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.1",

- org.eclipse.swt,

- org.eclipse.papyrus.infra.emf;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.core;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.1",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.1",

- org.eclipse.papyrus.infra.tools;bundle-version="0.10.1",

- org.eclipse.emf.edit.ui,

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.1",

- 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.1"

-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.command,

- org.eclipse.papyrus.infra.nattable.configuration,

- org.eclipse.papyrus.infra.nattable.dataprovider,

- org.eclipse.papyrus.infra.nattable.exception,

- 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.provider.tmp;x-friends:="org.eclipse.papyrus.uml.nattable",

- org.eclipse.papyrus.infra.nattable.reorder,

- org.eclipse.papyrus.infra.nattable.tester,

- org.eclipse.papyrus.infra.nattable.utils,

- org.eclipse.papyrus.infra.nattable.widget

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.10.1.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.nattable.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable;singleton:=tru

- e

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/OSGI-INF/l10n/bundle.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index b5afc41d77d..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/about.html b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/build.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/build.properties
deleted file mode 100644
index 0444389db8a..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/CreateDestroyColumn.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/CreateDestroyColumn.gif
deleted file mode 100644
index 923c3e23846..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/CreateDestroyColumn.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/CreateDestroyRow.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/CreateDestroyRow.gif
deleted file mode 100644
index 75d6a723d47..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/CreateDestroyRow.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/auto_resize_column.png b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/auto_resize_column.png
deleted file mode 100644
index 2b2dafef7aa..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/auto_resize_column.png
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/auto_resize_row.png b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/auto_resize_row.png
deleted file mode 100644
index 6966e72844b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/auto_resize_row.png
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/columnIndex.png b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/columnIndex.png
deleted file mode 100644
index 7e30e8bc981..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/columnIndex.png
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/delete_obj.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/delete_obj.gif
deleted file mode 100644
index b6922ac11cf..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/delete_obj.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/empty.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/empty.gif
deleted file mode 100644
index 30c569ad03e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/empty.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/empty.png b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/empty.png
deleted file mode 100644
index 91e5ec5fa2d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/empty.png
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/invertAxis.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/invertAxis.gif
deleted file mode 100644
index c4b9ea918a0..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/invertAxis.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/label.png b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/label.png
deleted file mode 100644
index 2d68e6cd17d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/label.png
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/not_NA.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/not_NA.gif
deleted file mode 100644
index 125919fbd84..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/not_NA.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/not_NA.png b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/not_NA.png
deleted file mode 100644
index 7e2aeeeb7ed..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/not_NA.png
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/remove_column.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/remove_column.gif
deleted file mode 100644
index f8afafa242c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/remove_column.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/remove_row.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/remove_row.gif
deleted file mode 100644
index 23a70e32522..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/remove_row.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/rename.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/rename.gif
deleted file mode 100644
index e6f786eca9a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/rename.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/rowIndex.png b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/rowIndex.png
deleted file mode 100644
index 33b0b8df394..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/rowIndex.png
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/select_columns_to_show.png b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/select_columns_to_show.png
deleted file mode 100644
index 5a2446c88ef..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/select_columns_to_show.png
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/sort_columns_by_name_A_to_Z.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/sort_columns_by_name_A_to_Z.gif
deleted file mode 100644
index a0a3beb2759..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/sort_columns_by_name_A_to_Z.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/sort_columns_by_name_Z_to_A.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/sort_columns_by_name_Z_to_A.gif
deleted file mode 100644
index ade5eee2ac9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/sort_columns_by_name_Z_to_A.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/sort_rows_by_name_A_to_Z.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/sort_rows_by_name_A_to_Z.gif
deleted file mode 100644
index eb7d66ba90c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/sort_rows_by_name_A_to_Z.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/sort_rows_by_name_Z_to_A.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/sort_rows_by_name_Z_to_A.gif
deleted file mode 100644
index 67867a4b5be..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/sort_rows_by_name_Z_to_A.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/table.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/table.gif
deleted file mode 100644
index 4c9048708b0..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/table.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/table.png b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/table.png
deleted file mode 100644
index 2a979527f4a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/table.png
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/tableColumnAction.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/tableColumnAction.gif
deleted file mode 100644
index 402a76128b8..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/tableColumnAction.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/tableRowAction.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/tableRowAction.gif
deleted file mode 100644
index c1dee5f677c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/icons/tableRowAction.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/plugin.pdoc b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/plugin.pdoc
deleted file mode 100644
index 95c3e133726..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/plugin.xml b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/plugin.xml
deleted file mode 100644
index 31cb9fe6ec1..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.axismanager.exsd b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.axismanager.exsd
deleted file mode 100644
index dd4392fd03c..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.celleditor.configuration.exsd b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.celleditor.configuration.exsd
deleted file mode 100644
index 0683d205574..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.cellmanager.exsd b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.cellmanager.exsd
deleted file mode 100644
index 79d6920ea7e..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.configuration.exsd b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.configuration.exsd
deleted file mode 100644
index 6aa249e6641..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.tester.exsd b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/schema/org.eclipse.papyrus.infra.nattable.tester.exsd
deleted file mode 100644
index 5dd209ae581..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
deleted file mode 100644
index db654b72350..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/accumulator/CustomRowOverrideLabelAccumulator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/accumulator/CustomRowOverrideLabelAccumulator.java
deleted file mode 100644
index d786f0e84fc..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/advice/DeleteNatTableContextAdvice.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/advice/DeleteNatTableContextAdvice.java
deleted file mode 100644
index 59afcd9e25f..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/AbstractComboAction.java
deleted file mode 100644
index 71fd8a77bb3..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ButtonConfiguration.java
deleted file mode 100644
index 13e2d823895..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/ComboBoxWithButtonCellEditor.java
deleted file mode 100644
index 616d5e8aec2..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfiguration.java
deleted file mode 100644
index 65fe8cd52e4..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfigurationFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/AbstractCellEditorConfigurationFactory.java
deleted file mode 100644
index 903ca5df9ea..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/CellEditorConfigurationFactory.java
deleted file mode 100644
index e08a2e9e555..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisCellEditorConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisCellEditorConfiguration.java
deleted file mode 100644
index fb36d642615..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/celleditor/config/IAxisEStructuralFeatureCellEditorConfiguration.java
deleted file mode 100644
index af85027c26a..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.java
deleted file mode 100644
index 6236f06c7ee..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/CommandIds.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.infra.nattable.command;

-

-/**

- * This class references the ids of the commands declared for tables

- * 

- * @author vl222926

- * 

- */

-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"; //$NON-NLS-1$

-

-	public static final String COMMAND_ROW_LABEL_DISPLAY_ICON = "org.eclipse.papyrus.infra.nattable.row.label.display.icon"; //$NON-NLS-1$

-

-	public static final String COMMAND_COLUMN_LABEL_DISPLAY_LABEL = "org.eclipse.papyrus.infra.nattable.column.label.display.label"; //$NON-NLS-1$

-

-	public static final String COMMAND_ROW_LABEL_DISPLAY_LABEL = "org.eclipse.papyrus.infra.nattable.row.label.display.label"; //$NON-NLS-1$

-

-	public static final String COMMAND_ROW_LABEL_FEATURE_DISPLAY_IS_DERIVED = "org.eclipse.papyrus.infra.nattable.row.label.feature.display.isderived"; //$NON-NLS-1$

-

-	public static final String COMMAND_ROW_LABEL_FEATURE_DISPLAY_MULTIPLICITY = "org.eclipse.papyrus.infra.nattable.row.label.feature.display.multiplicity"; //$NON-NLS-1$

-

-	public static final String COMMAND_ROW_LABEL_FEATURE_DISPLAY_TYPE = "org.eclipse.papyrus.infra.nattable.row.label.feature.display.type"; //$NON-NLS-1$

-

-	public static final String COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_IS_DERIVED = "org.eclipse.papyrus.infra.nattable.column.label.feature.display.isderived"; //$NON-NLS-1$

-

-	public static final String COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_MULTIPLICITY = "org.eclipse.papyrus.infra.nattable.column.label.feature.display.multiplicity"; //$NON-NLS-1$

-

-	public static final String COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_TYPE = "org.eclipse.papyrus.infra.nattable.column.label.feature.display.type"; //$NON-NLS-1$

-

-	public static final String COMMAND_ROW_LABEL_FEATURE_DISPLAY_NAME = "org.eclipse.papyrus.infra.nattable.row.label.feature.display.name"; //$NON-NLS-1$

-

-	public static final String COMMAND_COLUMN_LABEL_FEATURE_DISPLAY_NAME = "org.eclipse.papyrus.infra.nattable.column.label.feature.display.name"; //$NON-NLS-1$

-

-	public static final String COMMAND_ROW_DISCONNECT_SLAVE = "org.eclipse.papyrus.infra.nattable.row.disconnect.slave"; //$NON-NLS-1$

-

-	public static final String COMMAND_COLUMN_DISCONNECT_SLAVE = "org.eclipse.papyrus.infra.nattable.column.disconnect.slave"; //$NON-NLS-1$

-

-	public static final String COMMAND_INVERT_AXIS = "org.eclipse.papyrus.infra.nattable.invert.axis"; //$NON-NLS-1$

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.java
deleted file mode 100644
index 78ea5676701..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/command/TableCommands.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.command;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.LocalTableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TableHeaderAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainuUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-

-/**

- * This class provides some useful commands used to edit the table properties

- * 

- * @author vl222926

- * 

- */

-public class TableCommands {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 */

-	private TableCommands() {

-		//to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param table

-	 *        the table

-	 * @param feature

-	 *        the edited feature

-	 * @param newValue

-	 *        the new value for this feature

-	 * @return

-	 *         the command to change a value in the row configuration header of a table

-	 */

-	//FIXME : the handler must use me

-	public static ICommand getSetRowHeaderConfigurationValueCommand(final Table table, final EStructuralFeature feature, final Object newValue) {

-		final TransactionalEditingDomain domain = TableEditingDomainuUtils.getTableEditingDomain(table);

-		final CompositeCommand compositeCommand = new CompositeCommand("SetRowHeaderConfigurationCommand"); //$NON-NLS-1$

-		EObject elementToEdit = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(table);

-		if(elementToEdit instanceof TableHeaderAxisConfiguration) {

-			elementToEdit = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration)elementToEdit);

-			SetRequest request = null;

-			if(!table.isInvertAxis()) {

-				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration(), elementToEdit);

-			} else {

-				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration(), elementToEdit);

-			}

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			final ICommand cmd = provider.getEditCommand(request);

-			compositeCommand.add(cmd);

-		}

-		final SetRequest request = new SetRequest(domain, elementToEdit, feature, newValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToEdit);

-		final ICommand cmd = provider.getEditCommand(request);

-		compositeCommand.add(cmd);

-		return compositeCommand;

-	}

-

-	/**

-	 * 

-	 * @param table

-	 *        the table

-	 * @param feature

-	 *        the edited feature

-	 * @param newValue

-	 *        the new value for this feature

-	 * @return

-	 *         the command to change a value in the column configuration header of a table

-	 */

-	//FIXME : the handler must use me

-	public static ICommand getSetColumnHeaderConfigurationValueCommand(final Table table, final EStructuralFeature feature, final Object newValue) {

-		final TransactionalEditingDomain domain = TableEditingDomainuUtils.getTableEditingDomain(table);

-		final CompositeCommand compositeCommand = new CompositeCommand("SetColumnHeaderConfigurationCommand"); //$NON-NLS-1$

-		EObject elementToEdit = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisUsedInTable(table);

-		if(elementToEdit instanceof TableHeaderAxisConfiguration) {

-			elementToEdit = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration)elementToEdit);

-			SetRequest request = null;

-			if(table.isInvertAxis()) {

-				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration(), elementToEdit);

-			} else {

-				request = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration(), elementToEdit);

-			}

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			final ICommand cmd = provider.getEditCommand(request);

-			compositeCommand.add(cmd);

-		}

-		final SetRequest request = new SetRequest(domain, elementToEdit, feature, newValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(elementToEdit);

-		final ICommand cmd = provider.getEditCommand(request);

-		compositeCommand.add(cmd);

-		return compositeCommand;

-	}

-

-	/**

-	 * 

-	 * @param table

-	 *        the table

-	 * @param usedLabelConfiguration

-	 *        the used label configuration

-	 * @param editedFeature

-	 *        the edited feature

-	 * @param newValue

-	 *        the new value for this feature

-	 * @return

-	 *         the command to modify the feature value in the label configuration of the table. This command adds the localLabelConfiguration when it

-	 *         is required

-	 */

-	//FIXME the handler must use me

-	public static final ICommand getSetColumnLabelConfigurationValueCommand(final Table table, final ILabelProviderConfiguration usedLabelConfiguration, final EStructuralFeature editedFeature, final Object newValue) {

-		final CompositeCommand cmd = new CompositeCommand("ChangeColumnLabelConfigurationValueCommand"); //$NON-NLS-1$

-		TransactionalEditingDomain domain = TableEditingDomainuUtils.getTableEditingDomain(table);

-		ILabelProviderConfiguration editedLabelConf;

-		if(usedLabelConfiguration.eContainer() instanceof TableHeaderAxisConfiguration) {

-			editedLabelConf = EcoreUtil.copy(usedLabelConfiguration);

-			cmd.add(getRegisterLocalColumnLabelConfigurationCommand(table, usedLabelConfiguration, editedLabelConf));

-		} else {

-			editedLabelConf = usedLabelConfiguration;

-		}

-		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, editedFeature, newValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);

-		cmd.add(provider.getEditCommand(request));

-		return cmd;

-	}

-

-	/**

-	 * 

-	 * @param table

-	 *        the table

-	 * @param usedLabelConfiguration

-	 *        the used label configuration

-	 * @param editedFeature

-	 *        the edited feature

-	 * @param newValue

-	 *        the new value for this feature

-	 * @return

-	 *         the command to modify the feature value in the label configuration of the table. This command adds the localLabelConfiguration when it

-	 *         is required

-	 */

-	//FIXME the handler must use me

-	public static final ICommand getSetRowLabelConfigurationValueCommand(final Table table, final ILabelProviderConfiguration usedLabelConfiguration, final EStructuralFeature editedFeature, final Object newValue) {

-		final CompositeCommand cmd = new CompositeCommand("ChangeRowLabelConfigurationValueCommand"); //$NON-NLS-1$

-		TransactionalEditingDomain domain = TableEditingDomainuUtils.getTableEditingDomain(table);

-		ILabelProviderConfiguration editedLabelConf;

-		if(usedLabelConfiguration.eContainer() instanceof TableHeaderAxisConfiguration) {

-			editedLabelConf = EcoreUtil.copy(usedLabelConfiguration);

-			cmd.add(getRegisterLocalRowLabelConfigurationCommand(table, usedLabelConfiguration, editedLabelConf));

-		} else {

-			editedLabelConf = usedLabelConfiguration;

-		}

-		final IEditCommandRequest request = new SetRequest(domain, editedLabelConf, editedFeature, newValue);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedLabelConf);

-		cmd.add(provider.getEditCommand(request));

-		return cmd;

-	}

-

-

-	/**

-	 * 

-	 * @param table

-	 *        the table

-	 * @param tableLabelConfiguration

-	 *        the table LabelConfiguration

-	 * @param localTableLabelConfiguration

-	 *        the local table label configuration

-	 * @return

-	 *         the command to register the local column label configuration to the table

-	 */

-	private static final ICommand getRegisterLocalColumnLabelConfigurationCommand(final Table table, final ILabelProviderConfiguration tableLabelConfiguration, final ILabelProviderConfiguration localTableLabelConfiguration) {

-		final AbstractHeaderAxisConfiguration abstractHeaderAxisUsedInTable = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisUsedInTable(table);

-

-		EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		if(!table.isInvertAxis()) {

-			axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-		}

-

-		final TableHeaderAxisConfiguration headerAxisConfig = (TableHeaderAxisConfiguration)HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);

-		return getRegisterLocalLabelConfigurationCommand("ChangeColumnHeaderLabelConfigurationCommand", table, abstractHeaderAxisUsedInTable, headerAxisConfig, axisConfigurationFeature, localTableLabelConfiguration, tableLabelConfiguration); //$NON-NLS-1$

-	}

-

-

-	/**

-	 * 

-	 * @param table

-	 *        the table

-	 * @param tableLabelConfiguration

-	 *        the table LabelConfiguration

-	 * @param localTableLabelConfiguration

-	 *        the local table label configuration

-	 * @return

-	 *         the command to register the local row label configuration to the table

-	 */

-	private static final ICommand getRegisterLocalRowLabelConfigurationCommand(final Table table, final ILabelProviderConfiguration tableLabelConfiguration, final ILabelProviderConfiguration localTableLabelConfiguration) {

-		AbstractHeaderAxisConfiguration abstractHeaderAxisUsedInTable = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisUsedInTable(table);

-

-		EStructuralFeature axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalColumnHeaderAxisConfiguration();

-		if(table.isInvertAxis()) {

-			axisConfigurationFeature = NattablePackage.eINSTANCE.getTable_LocalRowHeaderAxisConfiguration();

-		}

-

-		final TableHeaderAxisConfiguration headerAxisConfig = (TableHeaderAxisConfiguration)HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);

-		return getRegisterLocalLabelConfigurationCommand("ChangeRowHeaderLabelConfigurationCommand", table, abstractHeaderAxisUsedInTable, headerAxisConfig, axisConfigurationFeature, localTableLabelConfiguration, tableLabelConfiguration); //$NON-NLS-1$

-	}

-

-	/**

-	 * 

-	 * @param commandName

-	 *        the name of the command

-	 * @param table

-	 *        the table to edit

-	 * @param headerAxisConfigurationUsedInTable

-	 *        the headerAxisConfiguration currently used in the table

-	 * @param tableHeaderAxisConfiguration

-	 *        the table header axis configuration defined in the table configuration

-	 * @param axisConfigurationFeature

-	 *        the feature to use to register a local HeaderAxisConfiguration if it is required

-	 * @param localTableLabelConfiguration

-	 *        the local table label configuration to register

-	 * @param tableLabelConfiguration

-	 *        the table label configuration

-	 * @return

-	 *         the command to register the local label configuration

-	 */

-	private static final ICommand getRegisterLocalLabelConfigurationCommand(final String commandName, final Table table, final AbstractHeaderAxisConfiguration headerAxisConfigurationUsedInTable, final TableHeaderAxisConfiguration tableHeaderAxisConfiguration, final EStructuralFeature axisConfigurationFeature, final ILabelProviderConfiguration localTableLabelConfiguration, final ILabelProviderConfiguration tableLabelConfiguration) {

-		final TransactionalEditingDomain domain = TableEditingDomainuUtils.getTableEditingDomain(table);

-		final CompositeCommand cmd = new CompositeCommand(commandName);

-

-		//1. we must get or create the required LocalTableHeaderAxisConfiguration

-		LocalTableHeaderAxisConfiguration localConfig = null;

-		if(headerAxisConfigurationUsedInTable instanceof LocalTableHeaderAxisConfiguration) {

-			localConfig = (LocalTableHeaderAxisConfiguration)headerAxisConfigurationUsedInTable;

-		} else if(headerAxisConfigurationUsedInTable instanceof TableHeaderAxisConfiguration) {

-			//we can't edit it, because it's comes from the initial configuration

-			localConfig = HeaderAxisConfigurationManagementUtils.transformToLocalHeaderConfiguration((TableHeaderAxisConfiguration)headerAxisConfigurationUsedInTable);

-			final IEditCommandRequest request = new SetRequest(domain, table, axisConfigurationFeature, headerAxisConfigurationUsedInTable);

-			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, headerAxisConfigurationUsedInTable, NattableaxisconfigurationPackage.eINSTANCE.getAbstractHeaderAxisConfiguration_OwnedLabelConfigurations(), localTableLabelConfiguration);

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(headerAxisConfigurationUsedInTable);

-		cmd.add(provider.getEditCommand(request));

-

-		//3. we must get or create the AxisManagerConfiguration(s)

-		final List<AxisManagerConfiguration> axisManagerConfiguration = new ArrayList<AxisManagerConfiguration>();

-		for(final AxisManagerRepresentation current : tableHeaderAxisConfiguration.getAxisManagers()) {

-			//we look for defined axis manager which uses the labelconfiguration defined in the table config

-			if(current.getHeaderLabelConfiguration() == tableLabelConfiguration) {

-				AxisManagerConfiguration currentConf = null;

-				//we look for an axis manager configuration mapped in this axis manager representation

-				for(final AxisManagerConfiguration axisConf : localConfig.getAxisManagerConfigurations()) {

-					if(axisConf.getAxisManager() == current) {

-						currentConf = axisConf;

-					}

-				}

-				if(currentConf == null) {

-					currentConf = NattableaxisconfigurationFactory.eINSTANCE.createAxisManagerConfiguration();

-					currentConf.setAxisManager(current);

-					final IEditCommandRequest request2 = new SetRequest(domain, localConfig, NattableaxisconfigurationPackage.eINSTANCE.getLocalTableHeaderAxisConfiguration_AxisManagerConfigurations(), currentConf);

-					final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(localConfig);

-					cmd.add(provider2.getEditCommand(request2));

-				}

-				axisManagerConfiguration.add(currentConf);

-			}

-		}

-

-		//4. these one must reference the LabelConfiguration

-		for(final AxisManagerConfiguration current : axisManagerConfiguration) {

-			final IEditCommandRequest request2 = new SetRequest(domain, current, NattableaxisconfigurationPackage.eINSTANCE.getAxisManagerConfiguration_LocalHeaderLabelConfiguration(), localTableLabelConfiguration);

-			final IElementEditService provider2 = ElementEditServiceUtils.getCommandProvider(current);

-			cmd.add(provider2.getEditCommand(request2));

-		}

-		return cmd;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CornerConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CornerConfiguration.java
deleted file mode 100644
index 29295119699..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CustomizedCellPainter.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CustomizedCellPainter.java
deleted file mode 100644
index 64ab0305f7c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CustomizedCellPainter.java
+++ /dev/null
@@ -1,163 +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.manager.table.NattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.ICell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Status;

-import org.eclipse.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.RGB;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * 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 ILabelProviderContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper(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;

-			}

-		}

-	}

-

-	//FIXME : essayer d'être plus subtile pour ce genre de chose!

-	@Override

-	protected Color getBackgroundColour(ILayerCell cell, IConfigRegistry configRegistry) {

-		if(cell.getConfigLabels().hasLabel("BODY")) {//FIXME : doesn't work for boolean checkbox!

-			int rowPosition = cell.getRowIndex();

-			int columnPostion = cell.getColumnIndex();

-			NattableModelManager manager = (NattableModelManager)configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-			Object rowElement = manager.getRowElement(rowPosition);

-			Object columnElement = manager.getColumnElement(columnPostion);

-			ICell tableCell = null;

-

-			for(final ICell current : manager.getTable().getCells()) {

-				if(manager.getTable().isInvertAxis()) {

-					if(current.getRowElement() == columnElement && current.getColumnElement() == rowElement) {

-						tableCell = current;

-					}

-				} else {

-					if(current.getRowElement() == rowElement && current.getColumnElement() == columnElement) {

-						tableCell = current;

-					}

-				}

-				if(tableCell == null) {

-					break;

-				}

-				if(tableCell.getProblems().size()!=0) {

-					return new Color(Display.getDefault(), new RGB(255, 0, 0));

-				}

-			}

-		}

-		return super.getBackgroundColour(cell, configRegistry);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/EditConfiguration.java
deleted file mode 100644
index 5e3c9aeb0e7..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnHeaderStyleConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnHeaderStyleConfiguration.java
deleted file mode 100644
index 93ed611bb84..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnResizeBindingsConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnResizeBindingsConfiguration.java
deleted file mode 100644
index 69369c3a28c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusColumnResizeBindingsConfiguration.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.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.resize.action.ColumnResizeCursorAction;

-import org.eclipse.nebula.widgets.nattable.resize.event.ColumnResizeEventMatcher;

-import org.eclipse.nebula.widgets.nattable.resize.mode.ColumnResizeDragMode;

-import org.eclipse.nebula.widgets.nattable.ui.action.ClearCursorAction;

-import org.eclipse.nebula.widgets.nattable.ui.action.NoOpMouseAction;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.swt.SWT;

-

-/**

- * Adapted code from DefaultRowResizeBindings. Allow to resize the columns on all regions of the table (corner, body, row header, column header)

- * 

- * @author vl222926

- * 

- */

-public class PapyrusColumnResizeBindingsConfiguration extends AbstractUiBindingConfiguration {

-

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		// Mouse move - Show resize cursor

-		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 0), new ColumnResizeCursorAction());

-		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 0), new ColumnResizeCursorAction());

-		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.CORNER, 0), new ColumnResizeCursorAction());

-		uiBindingRegistry.registerFirstMouseMoveBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.BODY, 0), new ColumnResizeCursorAction());

-

-		uiBindingRegistry.registerMouseMoveBinding(new MouseEventMatcher(), new ClearCursorAction());

-

-		// Column resize

-		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new ColumnResizeDragMode());

-		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 1), new ColumnResizeDragMode());

-		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.CORNER, 1), new ColumnResizeDragMode());

-		uiBindingRegistry.registerFirstMouseDragMode(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.BODY, 1), new ColumnResizeDragMode());

-

-		//			uiBindingRegistry.registerDoubleClickBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new AutoResizeColumnAction());

-		uiBindingRegistry.registerSingleClickBinding(new ColumnResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new NoOpMouseAction());

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusGridLayerConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusGridLayerConfiguration.java
deleted file mode 100644
index b1ca4412e61..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusHeaderMenuConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusHeaderMenuConfiguration.java
deleted file mode 100644
index ec447728d31..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusPopupMenuAction.java
deleted file mode 100644
index d377ea0c755..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowHeaderStyleConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowHeaderStyleConfiguration.java
deleted file mode 100644
index 14f1daa1b59..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowResizeBindingsConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowResizeBindingsConfiguration.java
deleted file mode 100644
index 68fd98da512..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusRowResizeBindingsConfiguration.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.infra.nattable.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;

-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

-import org.eclipse.nebula.widgets.nattable.resize.action.RowResizeCursorAction;

-import org.eclipse.nebula.widgets.nattable.resize.event.RowResizeEventMatcher;

-import org.eclipse.nebula.widgets.nattable.resize.mode.RowResizeDragMode;

-import org.eclipse.nebula.widgets.nattable.ui.action.ClearCursorAction;

-import org.eclipse.nebula.widgets.nattable.ui.action.NoOpMouseAction;

-import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

-import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

-import org.eclipse.swt.SWT;

-

-/**

- * Adapted code from DefaultRowResizeBindings. Allow to resize the rows on all regions of the table (corner, body, row header, column header)

- * 

- * @author vl222926

- * 

- */

-public class PapyrusRowResizeBindingsConfiguration extends AbstractUiBindingConfiguration {

-

-	@Override

-	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

-		// Mouse move - Show resize cursor

-		uiBindingRegistry.registerFirstMouseMoveBinding(new RowResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 0), new RowResizeCursorAction());

-		uiBindingRegistry.registerFirstMouseMoveBinding(new RowResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 0), new RowResizeCursorAction());

-		uiBindingRegistry.registerFirstMouseMoveBinding(new RowResizeEventMatcher(SWT.NONE, GridRegion.CORNER, 0), new RowResizeCursorAction());

-		uiBindingRegistry.registerFirstMouseMoveBinding(new RowResizeEventMatcher(SWT.NONE, GridRegion.BODY, 0), new RowResizeCursorAction());

-

-		uiBindingRegistry.registerMouseMoveBinding(new MouseEventMatcher(), new ClearCursorAction());

-

-		// Row resize

-		uiBindingRegistry.registerFirstMouseDragMode(new RowResizeEventMatcher(SWT.NONE, GridRegion.COLUMN_HEADER, 1), new RowResizeDragMode());

-		uiBindingRegistry.registerFirstMouseDragMode(new RowResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 1), new RowResizeDragMode());

-		uiBindingRegistry.registerFirstMouseDragMode(new RowResizeEventMatcher(SWT.NONE, GridRegion.CORNER, 1), new RowResizeDragMode());

-		uiBindingRegistry.registerFirstMouseDragMode(new RowResizeEventMatcher(SWT.NONE, GridRegion.BODY, 1), new RowResizeDragMode());

-

-		//			uiBindingRegistry.registerDoubleClickBinding(new RowResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 1), new AutoResizeRowAction());

-		uiBindingRegistry.registerSingleClickBinding(new RowResizeEventMatcher(SWT.NONE, GridRegion.ROW_HEADER, 1), new NoOpMouseAction());

-

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.java
deleted file mode 100644
index 347dc352c80..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/StyleConfiguration.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.infra.nattable.configuration;

-

-import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

-import org.eclipse.nebula.widgets.nattable.config.DefaultNatTableStyleConfiguration;

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.papyrus.infra.nattable.converter.GenericDisplayConverter;

-import org.eclipse.papyrus.infra.nattable.formatter.PapyrusExportFormatter;

-

-/**

- * 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());

-		configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new GenericDisplayConverter());

-		configRegistry.registerConfigAttribute(CellConfigAttributes.EXPORT_FORMATTER, new PapyrusExportFormatter());

-

-	}

-

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
deleted file mode 100644
index a0945f736fd..00000000000
--- a/sandbox/pasteInNewTable/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.ILabelProviderContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-

-/**

- * This converter uses the label provider service to display the correct text

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class GenericDisplayConverter implements IDisplayConverter {

-

-	/**

-	 * 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(final ILayerCell cell, final IConfigRegistry configRegistry, final Object canonicalValue) {

-		final LabelProviderService service = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		final ILabelProvider labelProvider = service.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT);

-		final ILabelProviderContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper(cell, canonicalValue, 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/copy/CopySelectionToClipboardAction.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/copy/CopySelectionToClipboardAction.java
deleted file mode 100644
index fa98199ba7b..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractDataProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractDataProvider.java
deleted file mode 100644
index 01396dcd661..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractHeaderDataProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/AbstractHeaderDataProvider.java
deleted file mode 100644
index 0ded58331ae..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/BodyDataProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/BodyDataProvider.java
deleted file mode 100644
index d3c87aec785..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnHeaderDataProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/ColumnHeaderDataProvider.java
deleted file mode 100644
index c7ace9a9810..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowHeaderDataProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dataprovider/RowHeaderDataProvider.java
deleted file mode 100644
index e1d733ba457..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/DisplayedAxisSelectorDialog.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/DisplayedAxisSelectorDialog.java
deleted file mode 100644
index 72391a24b7e..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/exception/ErrorInPastePreparationException.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/exception/ErrorInPastePreparationException.java
deleted file mode 100644
index 4d23eedff62..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/exception/ErrorInPastePreparationException.java
+++ /dev/null
@@ -1,34 +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.exception;

-

-

-public class ErrorInPastePreparationException extends Exception {

-

-

-	/**

-	 * the serial version UID

-	 */

-	private static final long serialVersionUID = -2707065012620342372L;

-

-

-	public ErrorInPastePreparationException(final String message) {

-		super(message);

-	}

-

-

-	public ErrorInPastePreparationException(final String message, final Throwable cause) {

-		super(message, cause);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/PapyrusExportFormatter.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/PapyrusExportFormatter.java
deleted file mode 100644
index b7a7f90a1cc..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/formatter/PapyrusExportFormatter.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 PapyrusExportFormatter extends DefaultExportFormatter {

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.export.IExportFormatter#formatForExport(org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell,

-	 *      org.eclipse.nebula.widgets.nattable.config.IConfigRegistry)

-	 * 

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeHeaderConfigurationHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeHeaderConfigurationHandler.java
deleted file mode 100644
index 92bc377a3c2..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeIndexStyleHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeIndexStyleHandler.java
deleted file mode 100644
index dde3cf17fa6..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeLabelConfigurationValueHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractChangeLabelConfigurationValueHandler.java
deleted file mode 100644
index f5488c9a93f..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeHeaderConfigurationHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeHeaderConfigurationHandler.java
deleted file mode 100644
index ae1a6ee03c7..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeLabelConfigurationValueHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractColumnChangeLabelConfigurationValueHandler.java
deleted file mode 100644
index 2abbce920f3..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractDisconnectSlaveHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractDisconnectSlaveHandler.java
deleted file mode 100644
index 215e1e52642..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeHeaderConfigurationHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeHeaderConfigurationHandler.java
deleted file mode 100644
index 069e61acd12..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeLabelConfigurationValueHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractRowChangeLabelConfigurationValueHandler.java
deleted file mode 100644
index a1917a8bc25..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTableHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTableHandler.java
deleted file mode 100644
index 1ab42467f20..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeIndexColumnStyleHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeIndexColumnStyleHandler.java
deleted file mode 100644
index b5c64308220..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeIndexRowStyleHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ChangeIndexRowStyleHandler.java
deleted file mode 100644
index 43bde668b45..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnAutoResizeHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnAutoResizeHandler.java
deleted file mode 100644
index bb76fed59e0..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisElementHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisElementHandler.java
deleted file mode 100644
index db2a5de40cf..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDestroyAxisHandler.java
deleted file mode 100644
index 039e0d90d62..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayIndexHeaderHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayIndexHeaderHandler.java
deleted file mode 100644
index 688687030ca..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureIsDerivedHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureIsDerivedHandler.java
deleted file mode 100644
index 7d3380de7bb..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureMultiplicityHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureMultiplicityHandler.java
deleted file mode 100644
index f7e5f767787..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureNameHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureNameHandler.java
deleted file mode 100644
index 64e4a5f51cf..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureTypeHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelFeatureTypeHandler.java
deleted file mode 100644
index 36c01f4cff4..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelHeaderHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelHeaderHandler.java
deleted file mode 100644
index 34f1869cdc5..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelImageHandler.java
deleted file mode 100644
index 9b7cc1b05dc..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnDisplayLabelTextHandler.java
deleted file mode 100644
index f8587b9fd40..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnEditAliasHeaderHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnEditAliasHeaderHandler.java
deleted file mode 100644
index ad5123cc8b5..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnMasterDisconnectRowSlaveHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ColumnMasterDisconnectRowSlaveHandler.java
deleted file mode 100644
index f6bb5abc124..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ExportToXLSHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ExportToXLSHandler.java
deleted file mode 100644
index 5fc206bf76a..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/InvertAxisHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/InvertAxisHandler.java
deleted file mode 100644
index 279ebbed901..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PrintTableHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PrintTableHandler.java
deleted file mode 100644
index 71a93b210b9..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowAutoResizeHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowAutoResizeHandler.java
deleted file mode 100644
index a8410990dbf..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisElementHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisElementHandler.java
deleted file mode 100644
index 412372eb5c6..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDestroyAxisHandler.java
deleted file mode 100644
index d8be0b721ef..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayIndexHeaderHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayIndexHeaderHandler.java
deleted file mode 100644
index 90d6ecfafa7..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabeTextHandler.java
deleted file mode 100644
index 651291bac86..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureIsDerivedHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureIsDerivedHandler.java
deleted file mode 100644
index 6932a7635bf..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureMultiplicityHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureMultiplicityHandler.java
deleted file mode 100644
index 040b102eee3..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureNameHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureNameHandler.java
deleted file mode 100644
index 484860e0cf7..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureTypeHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelFeatureTypeHandler.java
deleted file mode 100644
index d04c70da14d..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelHeaderHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelHeaderHandler.java
deleted file mode 100644
index 79c36a1a805..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowDisplayLabelImageHandler.java
deleted file mode 100644
index ee8a66d8c20..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowEditAliasHeaderHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowEditAliasHeaderHandler.java
deleted file mode 100644
index 0e91f69a74b..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowMasterDisconnectColumnSlaveHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/RowMasterDisconnectColumnSlaveHandler.java
deleted file mode 100644
index cdac44637b7..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectAllHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectAllHandler.java
deleted file mode 100644
index 8f91be66414..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectColumnsHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectColumnsHandler.java
deleted file mode 100644
index cc2b7fdd7d5..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectRowsHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SelectRowsHandler.java
deleted file mode 100644
index ff0afee70c9..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortColumnsHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortColumnsHandler.java
deleted file mode 100644
index 48d313cce0f..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortRowsHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/SortRowsHandler.java
deleted file mode 100644
index 0ff9f6b4c71..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/DestroyTableAdviceHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/DestroyTableAdviceHelper.java
deleted file mode 100644
index 2dab02f944a..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/TableContentsAdviceHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/helper/advice/TableContentsAdviceHelper.java
deleted file mode 100644
index 663b1e5c4ca..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/PapyrusGridLayer.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/PapyrusGridLayer.java
deleted file mode 100644
index f0dc17d9864..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/PapyrusSelectionLayer.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/PapyrusSelectionLayer.java
deleted file mode 100644
index b5e3e023c04..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layer/PapyrusSelectionLayer.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.layer;

-

-import org.eclipse.nebula.widgets.nattable.copy.command.CopyDataCommandHandler;

-import org.eclipse.nebula.widgets.nattable.copy.command.CopyDataToClipboardCommand;

-import org.eclipse.nebula.widgets.nattable.layer.IUniqueIndexLayer;

-import org.eclipse.nebula.widgets.nattable.selection.ISelectionModel;

-import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;

-

-/**

- * Papyrus selection layer

- * 

- * @author vl222926

- * 

- */

-public class PapyrusSelectionLayer extends SelectionLayer {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param underlyingLayer

-	 * @param useDefaultConfiguration

-	 */

-	public PapyrusSelectionLayer(IUniqueIndexLayer underlyingLayer, boolean useDefaultConfiguration) {

-		super(underlyingLayer, useDefaultConfiguration);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param underlyingLayer

-	 * @param selectionModel

-	 * @param useDefaultConfiguration

-	 * @param registerDefaultEventHandler

-	 */

-	public PapyrusSelectionLayer(IUniqueIndexLayer underlyingLayer, ISelectionModel selectionModel, boolean useDefaultConfiguration, boolean registerDefaultEventHandler) {

-		super(underlyingLayer, selectionModel, useDefaultConfiguration, registerDefaultEventHandler);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param underlyingLayer

-	 * @param selectionModel

-	 * @param useDefaultConfiguration

-	 */

-	public PapyrusSelectionLayer(IUniqueIndexLayer underlyingLayer, ISelectionModel selectionModel, boolean useDefaultConfiguration) {

-		super(underlyingLayer, selectionModel, useDefaultConfiguration);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param underlyingLayer

-	 */

-	public PapyrusSelectionLayer(IUniqueIndexLayer underlyingLayer) {

-		super(underlyingLayer);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.nebula.widgets.nattable.selection.SelectionLayer#registerCommandHandlers()

-	 * 

-	 */

-	protected void registerCommandHandlers() {

-		super.registerCommandHandlers();

-		unregisterCommandHandler(CopyDataToClipboardCommand.class);

-		final CopyDataCommandHandler handler = new CopyDataCommandHandler(this);

-		handler.setCopyFormattedText(true);

-		registerCommandHandler(handler);

-	}

-

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java
deleted file mode 100644
index 06848ae064b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/BodyLayerStack.java
+++ /dev/null
@@ -1,115 +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.layer.PapyrusSelectionLayer;

-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 PapyrusSelectionLayer(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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/ColumnHeaderLayerStack.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/ColumnHeaderLayerStack.java
deleted file mode 100644
index dbed1ca9539..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/ColumnHeaderLayerStack.java
+++ /dev/null
@@ -1,44 +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.data.IDataProvider;

-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.papyrus.infra.nattable.configuration.PapyrusColumnHeaderStyleConfiguration;

-import org.eclipse.papyrus.infra.nattable.configuration.PapyrusColumnResizeBindingsConfiguration;

-import org.eclipse.papyrus.infra.nattable.dataprovider.BodyDataProvider;

-

-

-public class ColumnHeaderLayerStack extends AbstractLayerTransform {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param dataProvider

-	 * @param bodyLayer

-	 * @param bodyDataProvider

-	 */

-	public ColumnHeaderLayerStack(final IDataProvider dataProvider, final BodyLayerStack bodyLayer, final BodyDataProvider bodyDataProvider) {

-		DataLayer dataLayer = new DataLayer(dataProvider);

-		ColumnHeaderLayer colHeaderLayer = new ColumnHeaderLayer(dataLayer, bodyLayer.getViewportLayer(), bodyLayer.getSelectionLayer(), false);

-		colHeaderLayer.addConfiguration(new PapyrusColumnResizeBindingsConfiguration());

-		colHeaderLayer.addConfiguration(new PapyrusColumnHeaderStyleConfiguration());

-		setUnderlyingLayer(colHeaderLayer);

-		setRegionName(GridRegion.COLUMN_HEADER);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java
deleted file mode 100644
index 70b262761a9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/layerstack/RowHeaderLayerStack.java
+++ /dev/null
@@ -1,80 +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.papyrus.infra.nattable.configuration.PapyrusRowResizeBindingsConfiguration;

-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), false);

-		rowHeaderLayer.addConfiguration(new PapyrusRowResizeBindingsConfiguration());

-		//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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java
deleted file mode 100644
index 0201d1ea8f1..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/listener/NatTableDropListener.java
+++ /dev/null
@@ -1,139 +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();

-			if(this.dropKindValue != null) {

-				switch(this.dropKindValue.getKind()) {

-				case AFTER_COLUMN_HEADER:

-					this.manager.addColumns(droppedElements);

-					break;

-				case AFTER_ROW_HEADER:

-					this.manager.addRows(droppedElements);

-					break;

-				case COLUMN_HEADER:

-					this.manager.insertColumns(droppedElements, this.dropKindValue.getColumnIndex());

-					break;

-				case ROW_HEADER:

-					this.manager.insertRows(droppedElements, this.dropKindValue.getRowIndex());

-					break;

-				case CELL:

-					//FIXME

-					break;

-				case UNKNOWN:

-					break;

-				default:

-					break;

-				}

-			}

-		}

-		this.dropKindValue = null;

-	}

-

-

-	public void dropAccept(final DropTargetEvent event) {

-

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java
deleted file mode 100644
index 225615cbed6..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractAxisManager.java
+++ /dev/null
@@ -1,567 +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.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.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.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.nattableaxisconfiguration.IPasteConfiguration;

-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 ElementTypeRegistry.getInstance().getType(elementId)!=null;

-	}

-

-	/**

-	 * 

-	 * @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

-	 */

-	/**

-	 * 

-	 * @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) {//FIXME must be done in the abstract class

-		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;

-

-	}

-

-

-	/**

-	 * 

-	 * @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();

-		final List<Object> toDestroy = new ArrayList<Object>();

-		for(final Integer position : axisPositions) {

-			final Object element = elements.get(position);

-			toDestroy.add(element);

-		}

-		return toDestroy;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#destroyAxisElement(java.util.List)

-	 * 

-	 * @param axisPosition

-	 */

-	@Override

-	public void destroyAxisElement(final List<Integer> axisPosition) {

-		final CompoundCommand cmd = new CompoundCommand("Destroy Axis Element Command");

-		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());

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#getPasteCommand(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration)

-	 * 

-	 * @param configuration

-	 * @return

-	 */

-	@Override

-	public ICommand getPasteCommand(IPasteConfiguration configuration) {

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager#canPaste(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration)

-	 * 

-	 * @param configuration

-	 * @return

-	 */

-	@Override

-	public boolean canPaste(IPasteConfiguration configuration) {

-		return false;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractSynchronizedOnFeatureAxisManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractSynchronizedOnFeatureAxisManager.java
deleted file mode 100644
index 436349a2bd6..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AbstractSynchronizedOnFeatureAxisManager.java
+++ /dev/null
@@ -1,306 +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.LinkedHashSet;

-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.EReference;

-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.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-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.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-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;

-

-/**

- * 

- * @author Vincent Lorenzo

- * 

- */

-//FIXME : this abstract class must inherits from the UML Element axis manager

-//FIXME : must be moved into infra.emf.nattable

-public abstract class AbstractSynchronizedOnFeatureAxisManager extends AbstractAxisManager {

-

-	/**

-	 * the feature listener

-	 */

-	protected Adapter featureListener;

-

-	/**

-	 * the features currently listen

-	 */

-	protected Collection<EStructuralFeature> listenFeatures;

-

-	/**

-	 * 

-	 * @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();

-

-		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(getListenFeatures().contains(msg.getFeature())) {//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.isTrue(!getListenFeatures().isEmpty());

-		verifyFeatureMultiplicity();

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the features to listen according to the current table configuration or <code>null</code> if it is not definedS

-	 */

-	protected Collection<EStructuralFeature> getListenFeatures() {

-		if(this.listenFeatures == null) {

-			this.listenFeatures = new ArrayList<EStructuralFeature>();

-			final Collection<EStructuralFeatureValueFillingConfiguration> configs = getFillingConfigurations();

-			final Collection<EStructuralFeature> avalaibleFeatures = getTableContext().eClass().getEAllStructuralFeatures();

-			for(EStructuralFeatureValueFillingConfiguration eStructuralFeatureValueFillingConfiguration : configs) {

-				final EStructuralFeature feature = eStructuralFeatureValueFillingConfiguration.getListenFeature();

-				if(feature != null && avalaibleFeatures.contains(feature) && !this.listenFeatures.contains(feature)) {

-					listenFeatures.add(feature);

-				}

-			}

-		}

-		return this.listenFeatures;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the filling configuration used by the table or <code>null</code> if any is defined

-	 */

-	protected Collection<EStructuralFeatureValueFillingConfiguration> getFillingConfigurations() {//FIXME : local configuration not yet managed

-		final Collection<EStructuralFeatureValueFillingConfiguration> configs = new ArrayList<EStructuralFeatureValueFillingConfiguration>();

-		for(final IAxisConfiguration current : this.representedAxisManager.getSpecificAxisConfigurations()) {

-			if(current instanceof EStructuralFeatureValueFillingConfiguration) {

-				configs.add((EStructuralFeatureValueFillingConfiguration)current);

-			}

-		}

-		return configs;

-	}

-

-	/**

-	 * 

-	 * @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 verifyFeatureMultiplicity() {

-		for(final EStructuralFeature feature : getListenFeatures()) {

-			Assert.isTrue(feature.isMany());

-		}

-	}

-

-	/**

-	 * 

-	 * @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();

-		final Collection<Object> valuesAsSet = new LinkedHashSet<Object>();

-		for(final EStructuralFeature current : getListenFeatures()) {

-			Object value = context.eGet(current);

-			Assert.isTrue(value instanceof Collection<?>);

-			valuesAsSet.addAll((Collection<? extends Object>)value);

-		}

-		final List<Object> values = new ArrayList<Object>(valuesAsSet);

-		List<Object> interestingObject = filterObject(values);

-		interestingObject = sortObjects(interestingObject);

-		return interestingObject;

-	}

-

-	/**

-	 * 

-	 * @param objects

-	 * @return

-	 */

-	protected List<Object> sortObjects(final List<Object> objects) {

-		return objects;

-	}

-

-	/**

-	 * 

-	 * @param objects

-	 * @return

-	 */

-	protected List<Object> filterObject(final List<Object> objects) {

-		return 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;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canPaste(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration)

-	 * 

-	 * @param configuration

-	 * @return

-	 */

-	//FIXME : must be in emf EObject Axis Manager

-	@Override

-	public boolean canPaste(final IPasteConfiguration configuration) {

-		if(configuration instanceof PasteEObjectConfiguration) {

-			final String elementId = ((PasteEObjectConfiguration)configuration).getPastedElementId();

-			final EStructuralFeature containmentFeature = ((PasteEObjectConfiguration)configuration).getPasteElementContainementFeature();

-			if(elementId != null && canCreateAxisElement(elementId)) {

-				if(containmentFeature != null && getTableContext().eClass().getEAllStructuralFeatures().contains(containmentFeature)) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getPasteCommand(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration)

-	 * 

-	 * @param configuration

-	 * @return

-	 */

-	//	/FIXME : must be in emf EObject Axis Manager

-	@Override

-	public ICommand getPasteCommand(final IPasteConfiguration configuration) {

-		final CompositeCommand command = new CompositeCommand("Paste In Table Command"); //$NON-NLS-1$

-		final PasteEObjectConfiguration config = (PasteEObjectConfiguration)configuration;

-		IElementType elementType = ElementTypeRegistry.getInstance().getType(config.getPastedElementId());

-		final EObject tableContext = getTableContext();

-		final CreateElementRequest createRequest = new CreateElementRequest((TransactionalEditingDomain)getContextEditingDomain(), tableContext, elementType, (EReference)config.getPasteElementContainementFeature());

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(tableContext);

-		final ICommand commandCreation = provider.getEditCommand(createRequest);

-		command.add(commandCreation);

-		return command;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AxisManagerFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/AxisManagerFactory.java
deleted file mode 100644
index 426a2c7609a..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java
deleted file mode 100644
index d7108f53915..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/CompositeAxisManager.java
+++ /dev/null
@@ -1,562 +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.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-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.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.IElementTypeFactory;

-import org.eclipse.gmf.runtime.emf.type.core.requests.AbstractEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-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.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.NattableaxisproviderPackage;

-import org.eclipse.papyrus.infra.nattable.provider.tmp.CompoundFilteredRestrictedContentProvider;

-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.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;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#canPaste(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration)

-	 * 

-	 * @param configuration

-	 * @return

-	 */

-	@Override

-	public boolean canPaste(IPasteConfiguration configuration) {

-		for(final IAxisManager current : this.subManagers) {

-			if(current.canPaste(configuration)) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractAxisManager#getPasteCommand(org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration)

-	 * 

-	 * @param configuration

-	 * @return

-	 */

-	@Override

-	public ICommand getPasteCommand(IPasteConfiguration configuration) {

-		final CompositeCommand command = new CompositeCommand("Paste In Table Command"); //$NON-NLS-1$

-		final PasteEObjectConfiguration config = (PasteEObjectConfiguration)configuration;

-		IElementType elementType = ElementTypeRegistry.getInstance().getType(config.getPastedElementId());

-		final EObject tableContext = getTableContext();

-		CreateElementRequest createRequest = new CreateElementRequest((TransactionalEditingDomain)getContextEditingDomain(), tableContext, elementType, (EReference)config.getPasteElementContainementFeature());

-		final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(tableContext);

-		final ICommand commandCreation = provider.getEditCommand(createRequest);

-		command.add(commandCreation);

-		//		for(final IAxisManager current : this.subManagers) {

-		//			final ICommand cmd = current.getPasteCommand(configuration);

-		//			if(cmd != null) {

-		//				command.add(cmd);

-		//			}

-		//		}

-		return command;

-	}

-

-//	@Override

-//	public Object getAxisType(Object object) {

-//		for(final IAxisManager current : subManagers){

-//			Object result = current.getAxisType(object);

-//			if(result!=null){

-//				return result;

-//			}

-//		}

-//		return null;

-//	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManager.java
deleted file mode 100644
index 71ff1fa0e5a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/IAxisManager.java
+++ /dev/null
@@ -1,295 +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.gmf.runtime.common.core.command.ICommand;

-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.nattableaxisconfiguration.IPasteConfiguration;

-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);

-

-	/**

-	 * 

-	 * @param configuration

-	 *        the paste configuration

-	 * @return

-	 *         <code>true</code> if the axis manager support this paste configuration

-	 */

-	public boolean canPaste(IPasteConfiguration configuration);

-

-	/**

-	 * 

-	 * @param configuration

-	 * @return

-	 *         the command to use for the paste, or <code>null</code> if the paste is not possible for this axis manager

-	 */

-	public ICommand getPasteCommand(final IPasteConfiguration configuration);

-

-//	/**

-//	 * 

-//	 * @param object

-//	 * @return

-//	 */

-//	//FIXME : should be in an FeatureAxisManager?

-//	public Object getAxisType(final Object object);

-	

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/ICompositeAxisManager.java
deleted file mode 100644
index 829e8a67be0..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/InputDialogWithLocation.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/axis/InputDialogWithLocation.java
deleted file mode 100644
index 21ab5b76034..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/AbstractCellManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/AbstractCellManager.java
deleted file mode 100644
index 4cb1f032355..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/AbstractCellManager.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.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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/CellManagerFactory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/CellManagerFactory.java
deleted file mode 100644
index 20120a5ffdf..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/CellManagerFactory.java
+++ /dev/null
@@ -1,126 +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?

-//FIXME : should implements ICellManager or returns getCellManger

-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;

-	}

-

-	/**

-	 * 

-	 * @param obj1

-	 * @param obj2

-	 * @return

-	 */

-	public ICellManager getCellManager(final Object obj1, final Object obj2) {

-		return getCrossValueSolver(obj1, obj2);

-	}

-

-	//FIXME : should me removed

-	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;

-	//	}

-

-	//	public void 

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/ICellManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/ICellManager.java
deleted file mode 100644
index d895767b980..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/cell/ICellManager.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.manager.cell;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.papyrus.infra.emf.utils.EMFStringValueConverter;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * 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 domain

-	 *        the editing domain

-	 * @param tableContext

-	 *        TODO

-	 * @param obj1

-	 *        the first object

-	 * @param obj2

-	 *        the second object

-	 * @param newValue

-	 *        the newValue, represented by a String

-	 * @param valueSolver

-	 *        the solver used to resolve values

-	 */

-	//FIXME : remove EMF dependency for the solver!

-	//FIXME : remove tableContext

-	public ICommand getSetStringValueCommand(final EditingDomain domain, final Table table, EObject tableContext, final Object obj1, final Object obj2, final String newValue, final EMFStringValueConverter valueSolver);

-

-	/**

-	 * 

-	 * @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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
deleted file mode 100644
index 7e825fc406d..00000000000
--- a/sandbox/pasteInNewTable/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.PapyrusExportFormatter;

-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 the NatTable Widget

- * 

- */

-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 PapyrusExportFormatter());

-		}

-		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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ILimitedNattableModelManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ILimitedNattableModelManager.java
deleted file mode 100644
index 49dd414f783..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java
deleted file mode 100644
index 1430f17e68b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java
+++ /dev/null
@@ -1,184 +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 setTableName(String name);

-

-	public String getTableName();

-

-

-	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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITableAxisElementProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/ITableAxisElementProvider.java
deleted file mode 100644
index fca9006646b..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
deleted file mode 100644
index 45132d44a62..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
+++ /dev/null
@@ -1,1036 +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.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.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.nattableconfiguration.NattableconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainuUtils;

-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

-				Display.getDefault().asyncExec(new Runnable() {

-

-					public void run() {

-						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() {

-		return TableEditingDomainuUtils.getTableContextEditingDomain(getTable());

-	}

-

-	/**

-	 * Returns the EditingDomain associated to the context

-	 * 

-	 * @return

-	 */

-	private EditingDomain getContextEditingDomain() {

-		return TableEditingDomainuUtils.getTableContextEditingDomain(getTable());

-	}

-

-	/**

-	 * 

-	 * @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;

-	}

-

-

-	public void setTableName(String name) {

-		SetRequest setNameRequest = new SetRequest(getTable(), NattableconfigurationPackage.eINSTANCE.getTableNamedElement_Name(), name);

-		IElementEditService editService = ElementEditServiceUtils.getCommandProvider(getTable());

-		ICommand setNameCommand = editService.getEditCommand(setNameRequest);

-		getTableEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setNameCommand));

-	}

-

-

-	public String getTableName() {

-		return getTable().getName();

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
deleted file mode 100644
index e3e98cb6f7f..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties
deleted file mode 100644
index cc6af72e69a..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/nattableconfiguration/NattableConfigurationRegistry.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/nattableconfiguration/NattableConfigurationRegistry.java
deleted file mode 100644
index 26309c73190..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/nattableconfiguration/NattableConfigurationRegistry.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.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.Collection;

-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 instantiation

-		initFields();

-	}

-

-

-	/**

-	 * 

-	 * @return

-	 *         the list of the known table configuration

-	 */

-	public Collection<TableConfiguration> getTableConfigurations() {

-		return configsURI.values();

-	}

-

-	/**

-	 * 

-	 * 

-	 * @param newTableConfiguration

-	 * @return

-	 */

-	public void registerTableConfiguration(final TableConfiguration newTableConfiguration) {

-		configsURI.put(newTableConfiguration.getType(), newTableConfiguration);

-	}

-

-

-	/**

-	 * 

-	 * @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) {

-		return this.configsURI.get(tableType).eResource().getURI();

-	}

-

-	/**

-	 * inits the fields of the class

-	 */

-	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) {

-		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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomCheckBoxPainter.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomCheckBoxPainter.java
deleted file mode 100644
index f75ce5c193d..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java
deleted file mode 100644
index 8ab8cf77e6a..00000000000
--- a/sandbox/pasteInNewTable/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.ILabelProviderContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * 

- * Custom Image painter for the header of the table

- * 

- */

-public class CustomImagePainter extends ImagePainter {

-

-	/**

-	 * 

-	 * @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 ILabelProviderContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper(cell, configRegistry);

-		final ILabelProvider provider = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT, contextElement);

-		return provider.getImage(contextElement);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractNattableCellLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractNattableCellLabelProvider.java
deleted file mode 100644
index 813f4fea68b..00000000000
--- a/sandbox/pasteInNewTable/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.ILabelProviderContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.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 LabelProviderCellContextElementWrapper element) {

-		ILabelProviderConfiguration conf = null;

-		final IConfigRegistry configRegistry = ((ILabelProviderContextElementWrapper)element).getConfigRegistry();

-		INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-		LabelStack labels = element.getConfigLabels();

-		if(labels.hasLabel(GridRegion.COLUMN_HEADER)) {

-			conf = LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration(manager.getTable());

-		} else if(labels.hasLabel(GridRegion.ROW_HEADER)) {

-			conf = LabelConfigurationManagementUtils.getUsedRowObjectLabelConfiguration(manager.getTable());

-		}

-		return conf;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/GenericCellLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/GenericCellLabelProvider.java
deleted file mode 100644
index fd1fac6b157..00000000000
--- a/sandbox/pasteInNewTable/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.ILabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;

-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 ILabelProviderContextElementWrapper} and if the cell represents an

-	 *         {@link EStructuralFeature} of an {@link EObject}

-	 */

-	@Override

-	public boolean accept(Object element) {

-		return element instanceof ILabelProviderCellContextElementWrapper;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getText(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(Object element) {

-		final ILabelProviderCellContextElementWrapper contextElement = (ILabelProviderCellContextElementWrapper)element;

-		final IConfigRegistry registry = ((ILabelProviderContextElementWrapper)element).getConfigRegistry();

-		Object value = contextElement.getObject();

-		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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java
deleted file mode 100644
index 6fef13f8b7e..00000000000
--- a/sandbox/pasteInNewTable/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.ILabelProviderContextElementWrapper;

-

-/**

- * The label provider used for the index of the header

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class IndexHeaderLabelProvider extends AbstractNattableCellLabelProvider {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#accept(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public boolean accept(Object element) {

-		if(element instanceof ILabelProviderContextElementWrapper) {

-			Object object = ((ILabelProviderContextElementWrapper)element).getObject();

-			return object instanceof String || object instanceof Integer;

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getText(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public String getText(Object element) {

-		return ((ILabelProviderContextElementWrapper)element).getObject().toString();

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java
deleted file mode 100644
index 32ba131f182..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.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.ILabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * The LabelProvider used in the table

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider {

-

-

-	/**

-	 * 

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	protected String getColumnHeaderLabel(final ILabelProviderCellContextElementWrapper cell, final IConfigRegistry configRegistry) {

-		return getLabel(cell, configRegistry, Constants.HEADER_LABEL_PROVIDER_CONTEXT);

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	protected String getRowHeaderLabel(final ILabelProviderCellContextElementWrapper 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 ILabelProviderCellContextElementWrapper contextElement = (ILabelProviderCellContextElementWrapper)element;

-		final IConfigRegistry configRegistry = contextElement.getConfigRegistry();

-		final LabelStack labels = getLabelStack(contextElement, configRegistry);

-		if(labels.hasLabel(GridRegion.COLUMN_HEADER)) {

-			return getColumnHeaderLabel(contextElement, configRegistry);

-		} else if(labels.hasLabel(GridRegion.ROW_HEADER)) {

-			return getRowHeaderLabel(contextElement, configRegistry);

-		} else if(labels.hasLabel(GridRegion.BODY)) {

-			return getBodyLabel(contextElement, configRegistry);

-		}

-		Object value = contextElement.getObject();

-		if(value != null) {

-			return value.toString();

-		}

-		return ""; //$NON-NLS-1$

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	protected LabelStack getLabelStack(final ILabelProviderCellContextElementWrapper contextElement, final IConfigRegistry configRegistry) {

-		LabelStack labels = contextElement.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(contextElement.getColumnPosition(), contextElement.getRowPosition());

-		}

-		return labels;

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 * @param configRegistry

-	 * @param labelproviderContext

-	 * @return

-	 */

-	protected String getLabel(final ILabelProviderCellContextElementWrapper contextElement, 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, contextElement.getObject());

-			if(labelProvider != null) {

-				txt = labelProvider.getText(contextElement.getObject());

-			} else {

-				labelProvider = serv.getLabelProvider(contextElement.getObject());

-				if(labelProvider != null) {

-					txt = labelProvider.getText(contextElement.getObject());

-				} else {

-					txt = contextElement.getObject().toString();

-				}

-			}

-		}

-		return txt;

-	}

-

-	/**

-	 * 

-	 * @param cellWrapperContextElement

-	 * @param configRegistry

-	 * @return

-	 */

-	protected String getBodyLabel(final ILabelProviderCellContextElementWrapper cellWrapperContextElement, final IConfigRegistry configRegistry) {//Body or data grid?

-		return getLabel(cellWrapperContextElement, 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 ILabelProviderCellContextElementWrapper;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider#getImage(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	@Override

-	public Image getImage(Object element) {

-		final ILabelProviderCellContextElementWrapper contextElement = (ILabelProviderCellContextElementWrapper)element;

-

-

-		Object object = contextElement.getObject();

-		String labelProviderContextId = null;

-		final IConfigRegistry configRegistry = contextElement.getConfigRegistry();

-		if(object instanceof IAxis) {

-			labelProviderContextId = ((IAxis)object).getManager().getLabelProviderContext();

-			return getImage(contextElement, configRegistry, labelProviderContextId);

-		}

-		final LabelStack labels = getLabelStack(contextElement, configRegistry);

-		if(labels.hasLabel(GridRegion.COLUMN_HEADER)) {

-			return getColumnHeaderImage(contextElement, configRegistry);

-		} else if(labels.hasLabel(GridRegion.ROW_HEADER)) {

-			return getRowHeaderImage(contextElement, configRegistry);

-		} else if(labels.hasLabel(GridRegion.BODY)) {

-			return getBodyLabelImage(contextElement, configRegistry);

-		}

-

-		return null;

-	}

-

-	/**

-	 * 

-	 * @param cell

-	 * @param configRegistry

-	 * @return

-	 */

-	private Image getBodyLabelImage(ILabelProviderCellContextElementWrapper 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(ILabelProviderCellContextElementWrapper 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(ILabelProviderCellContextElementWrapper contextElement, IConfigRegistry configRegistry, String labelproviderContext) {

-		Image image = null;

-		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 {

-			Object value = contextElement.getObject();

-			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(ILabelProviderCellContextElementWrapper cell, IConfigRegistry configRegistry) {

-		return getImage(cell, configRegistry, Constants.HEADER_LABEL_PROVIDER_CONTEXT);

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableLabelProvider.java
deleted file mode 100644
index 28b2847bf76..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableLabelProvider.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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.provider;

-

-import java.util.Collection;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.viewers.IStructuredSelection;

-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 AND in the property view

- * 

- */

-public class TableLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider#getText(java.lang.Object)

-	 * 

-	 * @param table

-	 * @return

-	 */

-	@Override

-	public String getText(Object table) {

-		if(table instanceof IStructuredSelection) {

-			return super.getText((IStructuredSelection)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$

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider#getImage(java.lang.Object)

-	 * 

-	 * @param table

-	 * @return

-	 */

-	@Override

-	public Image getImage(Object table) {

-		if(table instanceof IStructuredSelection) {

-			return getImage(((IStructuredSelection)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;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider#accept(java.lang.Object)

-	 * 

-	 * @param object

-	 * @return

-	 */

-	public boolean accept(Object object) {

-		if(object instanceof IStructuredSelection) {

-			return accept((IStructuredSelection)object);

-		}

-		Object el = object;

-		if(object instanceof IAdaptable) {

-			el = EMFHelper.getEObject(object);

-		}

-		if(el != null) {

-			return el instanceof Table;

-		}

-

-		return false;

-	}

-

-	/**

-	 * 

-	 * @param selection

-	 *        a selection

-	 * @return

-	 *         <code>true</code> if all elements in the selection are accepted

-	 */

-	protected boolean accept(final IStructuredSelection selection) {

-		for(final Object current : selection.toList()) {

-			if(!accept(current)) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider#hasCommonImage(java.util.Collection)

-	 * 

-	 * @param objects

-	 * @return

-	 *         <code>true</code> if all selected table have the same icon

-	 */

-	@Override

-	protected boolean hasCommonImage(Collection<?> objects) {

-		String iconPath = null;

-		for(Object current : objects) {

-			Assert.isTrue(current instanceof Table);

-			Table table = (Table)current;

-			String icon = table.getTableConfiguration().getIconPath();

-			Assert.isNotNull(icon);

-			if(iconPath == null) {

-				iconPath = icon;

-			}

-			if(!iconPath.equals(icon)) {

-				return false;

-			}

-		}

-		return true;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider#getNonCommonIcon(java.lang.Object)

-	 * 

-	 * @param commonObject

-	 * @return

-	 */

-	protected Image getNonCommonIcon(final Object commonObject) {

-		return org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(org.eclipse.papyrus.infra.nattable.Activator.PLUGIN_ID, "/icons/table.gif");

-	}

-

-

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableSelectionProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableSelectionProvider.java
deleted file mode 100644
index 8c6ab4fa7f4..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/CompoundFilteredRestrictedContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/CompoundFilteredRestrictedContentProvider.java
deleted file mode 100644
index e0a8fef01b9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/CompoundFilteredRestrictedContentProvider.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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.provider.tmp;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider;;

-/**

- * This class allows to use several content provider for the same widget

- * + restriction behavior see {@link IRestrictedContentProvider} documentation

- * 

- * @author JC236769

- * 

- */

-//FIXME must be deleted after the official extraplugins build and before Papyrus 0.10SR1

-public class CompoundFilteredRestrictedContentProvider extends org.eclipse.papyrus.infra.widgets.providers.CompoundFilteredRestrictedContentProvider implements org.eclipse.papyrus.infra.nattable.provider.tmp.IRestrictedContentProvider {

-

-	private List<IRestrictedContentProvider> encapsulatedContentProviders2 = new ArrayList<IRestrictedContentProvider>();

-

-	public boolean add(IRestrictedContentProvider o) {

-		super.add(o);

-		if(o != null) {

-			return encapsulatedContentProviders2.add(o);

-		}

-		return false;

-	}

-

-

-	@Override

-	public Object[] getElements(Object inputElement) {

-		List<Object> asList = new ArrayList<Object>();

-

-		for(IRestrictedContentProvider encapsulatedContentProvider : encapsulatedContentProviders2) {

-			Object[] directElements = encapsulatedContentProvider.getElements(inputElement);

-			asList.addAll(Arrays.asList(directElements));

-		}

-		return asList.toArray();

-	}

-

-	@Override

-	public Object[] getChildren(Object parentElement) {

-		List<Object> asList = new ArrayList<Object>();

-

-		for(IRestrictedContentProvider encapsulatedContentProvider : encapsulatedContentProviders2) {

-			Object[] directElements = encapsulatedContentProvider.getChildren(parentElement);

-			if(directElements != null && directElements.length != 0) {

-				asList.addAll(Arrays.asList(directElements));

-			}

-		}

-		return asList.toArray();

-	}

-

-	@Override

-	public Object getParent(Object element) {

-		for(IRestrictedContentProvider encapsulatedContentProvider : encapsulatedContentProviders2) {

-			Object parent = encapsulatedContentProvider.getParent(element);

-			if(parent != null) {

-				return parent;

-			}

-		}

-		return null;

-	}

-

-	@Override

-	public boolean hasChildren(Object element) {

-		return true;

-	}

-

-

-

-	@Override

-	public void dispose() {

-		//		super.dispose();

-		this.encapsulatedContentProviders2.clear();

-	}

-

-	@Override

-	public void setRestriction(boolean isRestricted) {

-		for(IRestrictedContentProvider current : encapsulatedContentProviders2) {

-			current.setRestriction(isRestricted);

-		}

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#isRestricted()

-	 * 

-	 * @return

-	 */

-	public boolean isRestricted() {

-		if(!encapsulatedContentProviders2.isEmpty()) {

-			return ((org.eclipse.papyrus.infra.nattable.provider.tmp.IRestrictedContentProvider)encapsulatedContentProviders2.get(0)).isRestricted();

-		}

-		throw new UnsupportedOperationException();

-	}

-

-	@Override

-	public boolean isValidValue(Object element) {

-		boolean result = false;

-		for(final IRestrictedContentProvider current : encapsulatedContentProviders2) {

-			result = result || current.isValidValue(element);

-		}

-		return result;

-	}

-

-	@Override

-	public Object[] getElements() {

-		return getElements(null);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.tmp.IInheritedElementContentProvider#setIgnoreInheritedElements(boolean)

-	 * 

-	 * @param ignoreInheritedElements

-	 */

-	public void setIgnoreInheritedElements(boolean ignoreInheritedElements) {

-		for(final IRestrictedContentProvider current : encapsulatedContentProviders2) {

-			((IInheritedElementContentProvider)current).setIgnoreInheritedElements(ignoreInheritedElements);

-		}

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.tmp.IInheritedElementContentProvider#isIgnoringInheritedElements()

-	 * 

-	 * @return

-	 */

-	public boolean isIgnoringInheritedElements() {

-		return ((IInheritedElementContentProvider)encapsulatedContentProviders2.get(0)).isIgnoringInheritedElements();//the value is the same for all encapsulated content provider

-	}

-

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/FlattenableRestrictedFilteredContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/FlattenableRestrictedFilteredContentProvider.java
deleted file mode 100644
index 292dbd2ed06..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/FlattenableRestrictedFilteredContentProvider.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://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.tmp;

-

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.widgets.providers.AbstractFilteredContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.HierarchicToFlatContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IFlattenableContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.infra.widgets.selectors.ReferenceSelector;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * 

- * @author JC236769

- * 

- */

-//FIXME must be deleted after the official extraplugins build and before Papyrus 0.10SR1

-public class FlattenableRestrictedFilteredContentProvider extends AbstractFilteredContentProvider implements IStaticContentProvider, IRestrictedContentProvider, IFlattenableContentProvider {

-

-	private boolean isFlat = false;

-

-	private ReferenceSelector selector;

-

-	protected IRestrictedContentProvider provider;

-

-	protected HierarchicToFlatContentProvider flatProvider;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param provider

-	 *        the encapsulated content provider

-	 * @param selector

-	 *        the reference selector (we need it to refresh it)

-	 */

-	public FlattenableRestrictedFilteredContentProvider(IRestrictedContentProvider provider, ReferenceSelector selector) {

-		this.provider = provider;

-		flatProvider = new HierarchicToFlatContentProvider(provider);

-		this.selector = selector;

-	}

-

-	/**

-	 * Add 2 checkboxes to the dialog

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.providers.AbstractFilteredContentProvider#createAfter(org.eclipse.swt.widgets.Composite)

-	 * 

-	 * @param parent

-	 */

-	@Override

-	public void createAfter(final Composite parent) {

-

-		super.createAfter(parent);

-		Composite checkboxSection = new Composite(parent, SWT.NONE);

-		checkboxSection.setLayout(new FillLayout(SWT.VERTICAL));

-		final Button onlyCurrentContainersCheckbox = new Button(checkboxSection, SWT.CHECK);

-		onlyCurrentContainersCheckbox.setText("Show all possible values");

-

-		final Button showFlatListOfFeaturesCheckbox = new Button(checkboxSection, SWT.CHECK);

-		showFlatListOfFeaturesCheckbox.setText("Flat View");

-		onlyCurrentContainersCheckbox.addSelectionListener(new SelectionListener() {

-

-			public void widgetSelected(SelectionEvent e) {

-				setRestriction(!onlyCurrentContainersCheckbox.getSelection());

-				viewer.refresh();

-				selector.refresh();

-			}

-

-			public void widgetDefaultSelected(SelectionEvent e) {

-

-			}

-		});

-		showFlatListOfFeaturesCheckbox.addSelectionListener(new SelectionListener() {

-

-			public void widgetSelected(SelectionEvent e) {

-

-				setFlat(showFlatListOfFeaturesCheckbox.getSelection());

-				viewer.refresh();

-				selector.refresh();

-

-			}

-

-			public void widgetDefaultSelected(SelectionEvent e) {

-

-			}

-		});

-	}

-

-	public Object[] getElements(Object inputElement) {

-		if(isFlat) {

-			return flatProvider.getElements(inputElement);

-		}

-		return provider.getElements(inputElement);

-	}

-

-	@Override

-	public void dispose() {

-		flatProvider.dispose();

-		provider.dispose();

-	}

-

-	@Override

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		super.inputChanged(viewer, oldInput, newInput);

-		flatProvider.inputChanged(viewer, oldInput, newInput);

-		provider.inputChanged(viewer, oldInput, newInput);

-	}

-

-	public boolean isValidValue(Object element) {

-		return provider.isValidValue(element);

-	}

-

-	public Object[] getChildren(Object parentElement) {

-		if(isFlat) {

-			return new Object[0];

-		}

-		return provider.getChildren(parentElement);

-	}

-

-	public Object getParent(Object element) {

-		if(isFlat) {

-			return null;

-		}

-		return provider.getParent(element);

-	}

-

-	public boolean hasChildren(Object element) {

-		if(isFlat) {

-			return false;

-		}

-		return provider.hasChildren(element);

-	}

-

-	public void setRestriction(boolean isRestricted) {

-		provider.setRestriction(isRestricted);

-	}

-

-	public void setFlat(boolean flat) {

-		this.isFlat = flat;

-

-	}

-

-	public Object[] getElements() {

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.tmp.IInheritedElementContentProvider#setIgnoreInheritedElements(boolean)

-	 *

-	 * @param ignoreInheritedElements

-	 */

-	public void setIgnoreInheritedElements(boolean ignoreInheritedElements) {

-		provider.setIgnoreInheritedElements(ignoreInheritedElements);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.tmp.IInheritedElementContentProvider#isIgnoringInheritedElements()

-	 *

-	 * @return

-	 */

-	public boolean isIgnoringInheritedElements() {

-		return provider.isIgnoringInheritedElements();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#isRestricted()

-	 *

-	 * @return

-	 */

-	public boolean isRestricted() {

-		return provider.isRestricted();

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/IIgnoreStereotypeBasePropertyContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/IIgnoreStereotypeBasePropertyContentProvider.java
deleted file mode 100644
index f839849f992..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/IIgnoreStereotypeBasePropertyContentProvider.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.provider.tmp;

-

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-

-/**

- * This interface adds 2 methods to allow to the content provider to ignore or not the properties base_ExtendedMetaclass

- * in the stereotype properties

- * 

- * @author vl222926

- * 

- */

-//FIXME must be deleted after the official extraplugins build and before Papyrus 0.10SR1

-public interface IIgnoreStereotypeBasePropertyContentProvider extends IStructuredContentProvider {

-

-	/**

-	 * 

-	 * @param ignoreBaseProperty

-	 *        the new value to use for the content provider. if <code>true</code> the base properties won't be returned

-	 */

-	public void setIgnoreBaseProperty(final boolean ignoreBaseProperty);

-

-	/**

-	 * 

-	 * @return

-	 *         <code>true</code> if the content provider doesn't return the base properties

-	 */

-	public boolean isIgnoringBaseProperty();

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/IInheritedElementContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/IInheritedElementContentProvider.java
deleted file mode 100644
index 33f01b2dd56..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/IInheritedElementContentProvider.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:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.provider.tmp;

-

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-

-/**

- * This interface

- * 

- * @author vl222926

- * 

- */

-//FIXME must be deleted after the official extraplugins build and before Papyrus 0.10SR1

-public interface IInheritedElementContentProvider extends IStructuredContentProvider {

-

-	/**

-	 * 

-	 * @param ignoreInheritedElements

-	 *        if <code>true</code> the inherited elements won't be returned

-	 */

-	public void setIgnoreInheritedElements(final boolean ignoreInheritedElements);

-

-	/**

-	 * 

-	 * @return

-	 *         <code>true</code> if the content provider is ignoring the inherited elements

-	 */

-	public boolean isIgnoringInheritedElements();

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/IRestrictedContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/IRestrictedContentProvider.java
deleted file mode 100644
index 151b012e218..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/tmp/IRestrictedContentProvider.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.provider.tmp;

-

-import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-

-

-/**

- * Add a boolean to choose the display mode :

- * <ul>

- * <li>display all possible values according to the model (restricted==false)</li>

- * <li>display all possible values according to current edited object (restricted==true)</li>

- * </ul>

- * 

- * @author JC236769

- * 

- */

-//FIXME must be deleted after the official extraplugins build and before Papyrus 0.10SR1

-public interface IRestrictedContentProvider extends IHierarchicContentProvider, IStaticContentProvider, org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider, IInheritedElementContentProvider {

-

-

-	/**

-	 * 

-	 * @return

-	 *         <code>true</code> if the content provider is restricted

-	 */

-	public boolean isRestricted();

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomCellDragModeForColumn.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomCellDragModeForColumn.java
deleted file mode 100644
index d0589d99080..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomColumnReorderDragMode.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomColumnReorderDragMode.java
deleted file mode 100644
index 06d894cf01a..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomDefaultColumnReorderBindings.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/reorder/CustomDefaultColumnReorderBindings.java
deleted file mode 100644
index 1fb16f6a614..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/ITableTester.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/ITableTester.java
deleted file mode 100644
index 6044e85572e..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/TableTesterRegistry.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/tester/TableTesterRegistry.java
deleted file mode 100644
index 08bc630f184..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
deleted file mode 100644
index a623bdc7129..00000000000
--- a/sandbox/pasteInNewTable/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 LabelProviderContextElementWrapper(obj, this.configRegistry));

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisUtils.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisUtils.java
deleted file mode 100644
index d0bbb8df3a9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisUtils.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.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.IAxis;

-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 axisElement

-	 *        an axis element

-	 * @return

-	 *         if axisElement is an IAxis, we return the element represented by the IAxis using IAxis.getElement() else we return the element itself

-	 */

-	public static final Object getRepresentedElement(final Object axisElement) {

-		Object representedElement;

-		if(axisElement instanceof IAxis) {

-			representedElement = ((IAxis)axisElement).getElement();

-		} else {

-			representedElement = axisElement;

-		}

-		return representedElement;

-	}

-

-	/**

-	 * 

-	 * @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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/Constants.java
deleted file mode 100644
index 69ecc790412..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.java
deleted file mode 100644
index eae0469748c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/HeaderAxisConfigurationManagementUtils.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.utils;

-

-import org.eclipse.emf.validation.internal.service.GetLiveConstraintsOperation;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-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, managing the inversion of the axis or <code>null</code> if we are

-	 *         using the configuration defined in the table configuration

-	 */

-	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisInTable(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getLocalColumnHeaderAxisConfiguration();

-		if(table.isInvertAxis()) {

-			config = table.getLocalRowHeaderAxisConfiguration();

-		}

-		return config;

-	}

-

-	/**

-	 * 

-	 * @param table

-	 *        a table

-	 * @return

-	 *         the header configuration defined in the tableconfiguration for columns, mananing the inversion of the axis. The result can't be

-	 *         <code>null</code>

-	 */

-	public static final AbstractHeaderAxisConfiguration getColumnAbstractHeaderAxisInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration config = table.getTableConfiguration().getColumnHeaderAxisConfiguration();

-		if(table.isInvertAxis()) {

-			config = table.getTableConfiguration().getRowHeaderAxisConfiguration();

-		}

-		assert config != null;

-		return config;

-	}

-

-	/**

-	 * 

-	 * @param table

-	 *        the table

-	 * @return

-	 *         the header configuration used for columns in the table. The result can't be <code>null</code>

-	 */

-	public static final AbstractHeaderAxisConfiguration 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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElementWrapper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElementWrapper.java
deleted file mode 100644
index ae7cf708c22..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElementWrapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.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.LabelStack;

-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

- * 

- */

-//FIXME : must implements ILayerCell

-public interface ILabelProviderCellContextElementWrapper extends ILabelProviderContextElementWrapper , ILayerCell{

-		

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElementWrapper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElementWrapper.java
deleted file mode 100644
index d9a90866edd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElementWrapper.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 ILabelProviderContextElementWrapper {

-

-	/**

-	 * 

-	 * @return

-	 *         the config registry which can provide useful information

-	 */

-	public IConfigRegistry getConfigRegistry();

-

-	/**

-	 * 

-	 * @return

-	 *         the object for which we want the label

-	 */

-	public Object getObject();

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/IPasteInTableCommandProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/IPasteInTableCommandProvider.java
deleted file mode 100644
index 51e2003373a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/IPasteInTableCommandProvider.java
+++ /dev/null
@@ -1,72 +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.runtime.IProgressMonitor;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.exception.ErrorInPastePreparationException;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * 

- * Interface for paste in table command provider

- * 

- */

-public interface IPasteInTableCommandProvider {

-

-	/**

-	 * 

-	 * @param table

-	 *        the table where the clipboard contents is pasted

-	 * @param commandCreationCancelProvider

-	 *        a progress monitor enabled to provide a cancel during the command creation (can be <code>null</code>)

-	 * @param commandExecutionProgressMonitor

-	 *        the progress monitor used during the command execution (can be <code>null</code>)

-	 * @param clipboardContents

-	 *        the clipboard contents

-	 * 

-	 * @return

-	 *         the command to create the paste in the table command

-	 * @throws ErrorInPastePreparationException

-	 */

-	//FIXME : update documentation

-	public ICommand getPasteFromFromStringCommand(final TransactionalEditingDomain editingDomain,final Table table, final IProgressMonitor commandCreationCancelProvider, final ProgressMonitorDialog commandExecutionProgressMonitor, final String clipboardContents, final INattableModelManager tableManager) throws ErrorInPastePreparationException;

-

-	/**

-	 * 

-	 * @param papyrusTable

-	 *        the paste table where the paste is done

-	 * @param clipboardContents

-	 *        the clipboard contents

-	 * @param iTableWidget

-	 *        the nattable widget

-	 * @return

-	 *         <code>true</code> if the paste is allowed in the table

-	 */

-	//FIXME : update documentation

-//	public boolean isPasteEnabled(final Table papyrusTable, final String clipboardContents);

-

-	/**

-	 * 

-	 * @return

-	 *         a string represented an error message. This message will be displayed to the user

-	 */

-//	public String getPasteErrorMessage();

-

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelConfigurationManagementUtils.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelConfigurationManagementUtils.java
deleted file mode 100644
index 411f23cb9dd..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java
deleted file mode 100644
index 687aa30df76..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.utils;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.nebula.widgets.nattable.layer.ILayer;

-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-import org.eclipse.swt.graphics.Rectangle;

-

-/**

- * This object can used as context to find the best label provider and get the text to display.

- * Its allows to have the context of the value to use it in the label provider

- * 

- * This objects can be used to get the label of an object which is not the current value of the cell, using the label provider used by the cell.

- * example to get the value of the enumeration literal in the combo box for uml stereotype properties

- * 

- * @author Vincent Lorenzo

- * 

- */

-

-public class LabelProviderCellContextElementWrapper extends LabelProviderContextElementWrapper implements ILabelProviderCellContextElementWrapper {

-

-	/** the cell. */

-	private ILayerCell cell;

-

-	/**

-	 * *

-	 * Constructor.

-	 * 

-	 * @param cell

-	 *        the cell for which we want the label/icon, ...

-	 * @param registry

-	 *        the registry used by nattable

-	 */

-	public LabelProviderCellContextElementWrapper(ILayerCell cell, final IConfigRegistry registry) {

-		this(cell, cell.getDataValue(), registry);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param cell

-	 *        the cell

-	 * @param value

-	 *        a value

-	 * @param registry

-	 *        the registry used by nattable

-	 */

-	public LabelProviderCellContextElementWrapper(ILayerCell cell, final Object value, final IConfigRegistry registry) {

-		super(value, registry);

-		this.cell = cell;

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getConfigLabels()

-	 * 

-	 * @return

-	 */

-

-	@Override

-	public LabelStack getConfigLabels() {

-		return this.cell.getConfigLabels();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getOriginColumnPosition()

-	 * 

-	 * @return

-	 */

-

-	@Override

-	public int getOriginColumnPosition() {

-		return cell.getOriginColumnPosition();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getOriginRowPosition()

-	 * 

-	 * @return

-	 */

-

-	@Override

-	public int getOriginRowPosition() {

-		return cell.getOriginRowPosition();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getLayer()

-	 * 

-	 * @return

-	 */

-

-	@Override

-	public ILayer getLayer() {

-		return cell.getLayer();

-	}

-

-	/**

-	 * Gets the column position.

-	 * 

-	 * @return the column position

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnPosition()

-	 */

-

-	@Override

-	public int getColumnPosition() {

-		return cell.getColumnPosition();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowPosition()

-	 * 

-	 * @return

-	 */

-

-	@Override

-	public int getRowPosition() {

-		return cell.getRowPosition();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnIndex()

-	 * 

-	 * @return

-	 */

-

-	@Override

-	public int getColumnIndex() {

-		return cell.getColumnIndex();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowIndex()

-	 * 

-	 * @return

-	 */

-

-	@Override

-	public int getRowIndex() {

-		return cell.getRowIndex();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getColumnSpan()

-	 * 

-	 * @return

-	 */

-

-	@Override

-	public int getColumnSpan() {

-		return cell.getColumnSpan();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getRowSpan()

-	 * 

-	 * @return

-	 */

-

-	@Override

-	public int getRowSpan() {

-		return cell.getRowSpan();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#isSpannedCell()

-	 * 

-	 * @return

-	 */

-

-	@Override

-	public boolean isSpannedCell() {

-		return cell.isSpannedCell();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getDisplayMode()

-	 * 

-	 * @return

-	 */

-

-	@Override

-	public String getDisplayMode() {

-		return cell.getDisplayMode();

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getDataValue()

-	 * 

-	 * @return

-	 */

-	@Override

-	public final Object getDataValue() {

-		throw new UnsupportedOperationException("You must use ILabelProviderCellContextElement#getObject()"); //$NON-NLS-1$

-	}

-

-	/**

-	 * @see org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell#getBounds()

-	 * 

-	 * @return

-	 */

-

-	@Override

-	public Rectangle getBounds() {

-		return cell.getBounds();

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElementWrapper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElementWrapper.java
deleted file mode 100644
index 6b44ccb6353..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElementWrapper.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.utils;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-

-/**

- * This object can used as context to find the best label provider and get the text to display.

- * Its allows to have the context of the value to use it in the label provider

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class LabelProviderContextElementWrapper implements ILabelProviderContextElementWrapper {

-

-	/**

-	 * the config registry of the table

-	 */

-	private IConfigRegistry registry;

-

-	/**

-	 * the object for which we want the label

-	 */

-	private Object object;

-

-	/**

-	 * *

-	 * Constructor.

-	 * 

-	 * @param object

-	 *        the cell for which we want the label/icon, ...

-	 * @param registry

-	 *        the registry used by nattable

-	 */

-	public LabelProviderContextElementWrapper(final Object object, final IConfigRegistry registry) {

-		this.object = object;

-		this.registry = registry;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper#getConfigRegistry()

-	 * 

-	 * @return

-	 */

-	public IConfigRegistry getConfigRegistry() {

-		return this.registry;

-	}

-

-	/**

-	 * 

-	 * @return

-	 */

-	public Object getObject() {

-		return this.object;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LocationValue.java
deleted file mode 100644
index 9013e936401..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableConfigAttributes.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableConfigAttributes.java
deleted file mode 100644
index 262a8d7c924..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableWidgetPropertyTester.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableWidgetPropertyTester.java
deleted file mode 100644
index 819ae160b3d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NattableWidgetPropertyTester.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.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.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-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 IWorkbench workbench = PlatformUI.getWorkbench();

-		IWorkbenchPart current = null;

-		if(workbench != null) {

-			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();

-			if(activeWorkbench != null) {

-				final IWorkbenchPage activePage = activeWorkbench.getActivePage();

-				if(activePage != null) {

-					current = activePage.getActivePart();

-				}

-			}

-		}

-

-		if(current != null) {

-			return (INattableModelManager)current.getAdapter(INattableModelManager.class);

-		}

-		return null;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtil.java
deleted file mode 100644
index 4dd1b51e9e3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtil.java
+++ /dev/null
@@ -1,35 +0,0 @@
-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.IAxisConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-

-

-public class PasteConfigurationUtil {

-

-

-	private PasteConfigurationUtil() {

-		//to prevent instanciation

-	}

-

-	public static final IPasteConfiguration getRowPasteConfigurationDefinedInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration conf = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisInTableConfiguration(table);

-		for(final IAxisConfiguration current : conf.getOwnedAxisConfigurations()) {

-			if(current instanceof IPasteConfiguration) {

-				return (IPasteConfiguration)current;

-			}

-		}

-		return null;

-	}

-

-	public static final IPasteConfiguration getColumnPasteConfigurationDefinedInTableConfiguration(final Table table) {

-		AbstractHeaderAxisConfiguration conf = HeaderAxisConfigurationManagementUtils.getColumnAbstractHeaderAxisInTableConfiguration(table);

-		for(final IAxisConfiguration current : conf.getOwnedAxisConfigurations()) {

-			if(current instanceof IPasteConfiguration) {

-				return (IPasteConfiguration)current;

-			}

-		}

-		return null;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StringComparator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/StringComparator.java
deleted file mode 100644
index 585d6832f0e..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java
deleted file mode 100644
index c6436cf359f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.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.utils;

-

-

-public class TableClipboardUtils {

-

-	/**

-	 * row separator in the clipboard contents

-	 */

-	public static final String ROW_SEPARATOR = "\n"; //$NON-NLS-1$

-

-	/**

-	 * column separator in the clipboard contents

-	 */

-	public static final String COLUMN_SEPARATOR = "\t"; //$NON-NLS-1$

-

-	/**

-	 * the separator used for multivalue

-	 */

-	public static final String MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$

-

-	private TableClipboardUtils() {

-		//to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param fullContents

-	 *        a table represented by a String

-	 * @return the rows for this table

-	 */

-	public static final String[] getRows(final String fullContents) {

-		final String[] rows = fullContents.split(ROW_SEPARATOR);

-		return rows;

-	}

-

-	/**

-	 * 

-	 * @param row

-	 *        a row represented by a String

-	 * @return the cells for this row

-	 */

-	public static final String[] getCells(final String row) {

-		return row.split(COLUMN_SEPARATOR);

-	}

-

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableEditingDomainuUtils.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableEditingDomainuUtils.java
deleted file mode 100644
index 95d82922775..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableEditingDomainuUtils.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.utils;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

-import org.eclipse.papyrus.infra.nattable.Activator;

-import org.eclipse.papyrus.infra.nattable.messages.Messages;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-

-/**

- * 

- * Utils class to get the best editing domain to use

- * 

- */

-public class TableEditingDomainuUtils {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 */

-	private TableEditingDomainuUtils() {

-		//to prevent instanciation

-	}

-

-	/**

-	 * Returns the EditingDomain associated to the table

-	 * 

-	 * @return

-	 *         the EditingDomain associated to the table

-	 */

-	public static final TransactionalEditingDomain getTableEditingDomain(final Table table) {

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(table);

-			return (TransactionalEditingDomain)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

-	 *         the EditingDomain associated to the context

-	 */

-	public static final TransactionalEditingDomain getTableContextEditingDomain(final Table table) {

-		ServicesRegistry registry = null;

-		try {

-			registry = ServiceUtilsForEObject.getInstance().getServiceRegistry(table.getContext());

-			return (TransactionalEditingDomain)registry.getService(EditingDomain.class);

-		} catch (final ServiceException e) {

-			Activator.log.error(Messages.NattableModelManager_ServiceRegistryNotFound, e);

-		}

-		return null;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableGridRegion.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableGridRegion.java
deleted file mode 100644
index 965031183c5..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableHelper.java
deleted file mode 100644
index 4756fd67690..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/widget/NatComboButton.java
deleted file mode 100644
index f4c7cbd554e..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.infra.tools/.classpath b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/.classpath
deleted file mode 100644
index 947a9a83f9e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/.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/tools/databinding/MultipleObservableList.java" kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/.project b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/.project
deleted file mode 100644
index c539737c29a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.tools</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/pasteInNewTable/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.core.prefs b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/.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/pasteInNewTable/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
deleted file mode 100644
index 3dd0468f2b1..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1",

- org.eclipse.core.databinding;bundle-version="1.4.1",

- org.eclipse.emf.common;bundle-version="2.9.0",

- org.eclipse.emf.ecore;bundle-version="2.9.0",

- org.eclipse.emf.ecore.xmi;bundle-version="2.9.0",

- org.eclipse.emf.edit;bundle-version="2.9.0",

- org.eclipse.core.expressions;bundle-version="3.4.500"

-Export-Package: org.eclipse.papyrus.infra.tools.databinding,

- org.eclipse.papyrus.infra.tools.util

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.10.1.qualifier

-Eclipse-BuddyPolicy: dependent

-Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.tools.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.tools

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/OSGI-INF/l10n/bundle.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index d4d67eb13ea..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.papyrus.infra.tools

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Papyrus Tools (Incubation)
\ No newline at end of file
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/about.html b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/about.html
deleted file mode 100644
index 209103075a7..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/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>November 14, 2008</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>
\ No newline at end of file
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/build.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/build.properties
deleted file mode 100644
index 8b7b2f0fc1a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               OSGI-INF/

-src.includes = about.html

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/Activator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/Activator.java
deleted file mode 100644
index c41ea145653..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/Activator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.papyrus.infra.tools;

-

-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.tools"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-

-	/**

-	 * The plug-in's logger

-	 */

-	public static LogHelper log;

-

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	@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/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/AggregatedObservable.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/AggregatedObservable.java
deleted file mode 100644
index 294506260ba..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/AggregatedObservable.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.tools.databinding;

-

-import org.eclipse.core.databinding.observable.IObservable;

-

-/**

- * An interface to aggregate many IObservables in a single one.

- * A modification on the aggregated observable should be dispatched to all

- * the encapsulated observables.

- * 

- * @author Camille Letavernier

- */

-public interface AggregatedObservable extends IObservable {

-

-	/**

-	 * Aggregates the current Observable with the given observable.

-	 * Returns the aggregated Observable, or null if the aggregation is not

-	 * possible

-	 * 

-	 * Typically, only IObservable with similar ValueTypes can be

-	 * aggregated.

-	 * 

-	 * @param observable

-	 *        The IObservable to aggregate to the current IObservable

-	 * @return

-	 *         The aggregated IObservable, or null if the aggregation is not

-	 *         possible

-	 */

-	public AggregatedObservable aggregate(IObservable observable);

-

-	/**

-	 * Tests if the sub-observables have different values

-	 * 

-	 * @return true if the sub-observables have different values

-	 */

-	public boolean hasDifferentValues();

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableList.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableList.java
deleted file mode 100644
index c44970aca08..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableList.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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.tools.databinding;

-

-import java.util.Collection;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.databinding.observable.list.IObservableList;

-import org.eclipse.core.databinding.observable.list.ObservableList;

-import org.eclipse.papyrus.infra.widgets.databinding.AggregatedObservable;

-import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

-import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

-

-//TODO : Implement the getters

-//The list may be either the union or the intersection of all sublists

-//Union : allows the "remove" and "removeAll" on a group of lists (Even if one of the sublists doesn't contain the given element)

-//Intersection : Closer to the behavior of the CompositeValue (The current value is displayed only if it is shared by all elements)

-//The Union is probably a better solution

-//Simple solution : bind read operations to the first sub-list

-

-/**

- * A Composite ObservableList. Modifications are forwarded to each sublist

- * The read operations are not supported. This list behaves as if it were empty

- * 

- * @author Camille Letavernier

- */

-//TODO : Add listeners on sub-observables, and remove them on dispose

-public class MultipleObservableList extends ObservableList implements ICommitListener, AggregatedObservable {

-

-	List<IObservableList> observableLists = new LinkedList<IObservableList>();

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 */

-	public MultipleObservableList() {

-		super(new LinkedList<Object>(), Object.class);

-		throw new UnsupportedOperationException("This class is not supported yet"); //$NON-NLS-1$

-	}

-

-	@Override

-	public void add(int index, Object element) {

-		for(IObservableList observableList : observableLists) {

-			observableList.add(index, element);

-		}

-	}

-

-	@Override

-	public void clear() {

-		for(IObservableList observableList : observableLists) {

-			observableList.clear();

-		}

-	}

-

-	@Override

-	public boolean contains(Object o) {

-		boolean contains = false;

-

-		for(IObservableList observableList : observableLists) {

-			if(observableList.contains(o)) {

-				contains = true;

-			} else {

-				return false;

-			}

-		}

-

-		return contains;

-	}

-

-	@Override

-	public boolean add(Object o) {

-		for(IObservableList observableList : observableLists) {

-			observableList.add(o);

-		}

-		return true;

-	}

-

-	@Override

-	public boolean remove(Object o) {

-		for(IObservableList observableList : observableLists) {

-			observableList.remove(o);

-		}

-		return true;

-	}

-

-	@Override

-	public boolean containsAll(Collection c) {

-		boolean containsAll = false;

-		for(IObservableList observableList : observableLists) {

-			containsAll = containsAll && observableList.containsAll(c);

-		}

-		return containsAll;

-	}

-

-	@Override

-	public boolean addAll(Collection c) {

-		for(IObservableList observableList : observableLists) {

-			observableList.addAll(c);

-		}

-		return true;

-	}

-

-	@Override

-	public boolean addAll(int index, Collection c) {

-		for(IObservableList observableList : observableLists) {

-			observableList.addAll(index, c);

-		}

-		return true;

-	}

-

-	@Override

-	public boolean removeAll(Collection c) {

-		for(IObservableList observableList : observableLists) {

-			observableList.removeAll(c);

-		}

-		return true;

-	}

-

-	@Override

-	public boolean retainAll(Collection c) {

-		for(IObservableList observableList : observableLists) {

-			observableList.retainAll(c);

-		}

-		return true;

-	}

-

-	@Override

-	public Object set(int index, Object element) {

-		for(IObservableList observableList : observableLists) {

-			observableList.set(index, element);

-		}

-		return null;

-	}

-

-	@Override

-	public Object move(int oldIndex, int newIndex) {

-		for(IObservableList observableList : observableLists) {

-			observableList.move(oldIndex, newIndex);

-		}

-		return null;

-	}

-

-	@Override

-	public Object remove(int index) {

-		for(IObservableList observableList : observableLists) {

-			observableList.remove(index);

-		}

-		return null;

-	}

-

-	public void commit(AbstractEditor editor) {

-		for(IObservableList observableList : observableLists) {

-			if(observableList instanceof ICommitListener) {

-				((ICommitListener)observableList).commit(editor);

-			}

-		}

-	}

-

-	@Override

-	public void dispose() {

-		super.dispose();

-		for(IObservableList observable : observableLists) {

-			observable.dispose();

-		}

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableValue.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableValue.java
deleted file mode 100644
index bd8dadf1e11..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableValue.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.tools.databinding;

-

-import java.util.Collection;

-import java.util.LinkedList;

-import java.util.List;

-

-import org.eclipse.core.databinding.observable.ChangeEvent;

-import org.eclipse.core.databinding.observable.IChangeListener;

-import org.eclipse.core.databinding.observable.IObservable;

-import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

-import org.eclipse.core.databinding.observable.value.IObservableValue;

-import org.eclipse.core.databinding.observable.value.ValueDiff;

-

-/**

- * MultipleObservableValue is used to map a single element

- * to a collection of model elements.

- * 

- * It is especially used when displaying a Property View for multiple elements,

- * when we want to edit the same property for all of them.

- * 

- * All sub-elements will be edited at the same time, with the same value.

- */

-//TODO : Add listeners on sub-observables, and remove them on dispose

-public class MultipleObservableValue extends AbstractObservableValue implements AggregatedObservable, IChangeListener {

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param values

-	 *        The collection of sub-elements for this MultipleObservableValue

-	 * 

-	 */

-	public MultipleObservableValue(Collection<IObservableValue> values) {

-		if(values != null) {

-			observableValues.addAll(values);

-		}

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 */

-	public MultipleObservableValue() {

-

-	}

-

-	public Object getValueType() {

-		if(observableValues.isEmpty()) {

-			return null;

-		}

-

-		return observableValues.get(0).getValueType();

-	}

-

-	/**

-	 * If all objects have the same value, returns this value

-	 * Otherwise, returns the defaultGetValue

-	 * If the defaultGetValue hasn't been set, returns null

-	 */

-	@Override

-	protected Object doGetValue() {

-		if(hasDifferentValues() || observableValues.isEmpty()) {

-			return null;

-		}

-

-		return observableValues.get(0).getValue();

-	}

-

-	private boolean equals(Object value, Object currentValue) {

-		if(value == currentValue) {

-			return true;

-		}

-		if(value == null) {

-			return false;

-		}

-		return value.equals(currentValue);

-	}

-

-	@Override

-	protected void doSetValue(Object value) {

-		for(IObservableValue observable : observableValues) {

-			observable.setValue(value);

-		}

-	}

-

-	public AggregatedObservable aggregate(IObservable observable) {

-		if(observable instanceof IObservableValue) {

-			observableValues.add((IObservableValue)observable);

-			observable.addChangeListener(this);

-			return this;

-		}

-		return null;

-	}

-

-	/**

-	 * @return the list of sub-observable values

-	 */

-	public List<IObservableValue> getObservableValues() {

-		return observableValues;

-	}

-

-	/**

-	 * @return the list of observed values

-	 */

-	public List<Object> getObservedValues() {

-		List<Object> result = new LinkedList<Object>();

-		for(IObservableValue value : getObservableValues()) {

-			result.add(value.getValue());

-		}

-		return result;

-	}

-

-	@Override

-	public synchronized void dispose() {

-		super.dispose();

-		for(IObservableValue observable : observableValues) {

-			observable.removeChangeListener(this);

-			observable.dispose();

-		}

-	}

-

-	/**

-	 * The {@link IObservableValue}s aggregated by this Observable

-	 */

-	protected List<IObservableValue> observableValues = new LinkedList<IObservableValue>();

-

-	public boolean hasDifferentValues() {

-		if(observableValues.isEmpty()) {

-			return false;

-		}

-

-		Object currentValue = null;

-		boolean firstValue = true;

-		for(IObservableValue observable : observableValues) {

-			if(firstValue) {

-				firstValue = false;

-				currentValue = observable.getValue();

-			} else {

-				Object value = observable.getValue();

-				if(equals(value, currentValue)) {

-					continue;

-				}

-				return true;

-			}

-		}

-

-		return false;

-	}

-

-	public void handleChange(ChangeEvent event) {

-		//We're not interested in the old and new values

-		//We just return two different values so that a change event is fired

-		super.fireValueChange(new ValueDiff() {

-

-			@Override

-			public Object getOldValue() {

-				return true;

-			}

-

-			@Override

-			public Object getNewValue() {

-				return false;

-			}

-		});

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/AbstractCreateMenuFromCommandCategory.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/AbstractCreateMenuFromCommandCategory.java
deleted file mode 100644
index 146b04d1a92..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/AbstractCreateMenuFromCommandCategory.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.tools.util;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.List;

-import java.util.Set;

-import java.util.TreeSet;

-

-import org.eclipse.core.commands.AbstractHandler;

-import org.eclipse.core.commands.Category;

-import org.eclipse.core.commands.Command;

-import org.eclipse.core.commands.IHandler;

-import org.eclipse.core.commands.common.NotDefinedException;

-import org.eclipse.core.expressions.EvaluationResult;

-import org.eclipse.core.expressions.Expression;

-import org.eclipse.core.expressions.IEvaluationContext;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.papyrus.infra.tools.Activator;

-import org.eclipse.swt.SWT;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.commands.ICommandService;

-import org.eclipse.ui.menus.CommandContributionItem;

-import org.eclipse.ui.menus.CommandContributionItemParameter;

-import org.eclipse.ui.menus.ExtensionContributionFactory;

-import org.eclipse.ui.menus.IContributionRoot;

-import org.eclipse.ui.services.IServiceLocator;

-

-/**

- * Abstract Class to create menu from an Eclipse Command category

- * 

- * @author VL222926

- * 

- */

-public abstract class AbstractCreateMenuFromCommandCategory extends ExtensionContributionFactory {

-

-	/** the category of the command contributing to this menu */

-	protected final String commandCateogyId;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param commandCategoryId

-	 *        the category of the command contributing to this menu

-	 */

-	public AbstractCreateMenuFromCommandCategory(final String commandCategoryId) {

-		this.commandCateogyId = commandCategoryId;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.ui.menus.AbstractContributionFactory#createContributionItems(org.eclipse.ui.services.IServiceLocator,

-	 *      org.eclipse.ui.menus.IContributionRoot)

-	 * 

-	 * @param serviceLocator

-	 * @param additions

-	 */

-	@Override

-	public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {

-		//test to know if we can create elements if it is possible...

-		Expression visibleWhen = new Expression() {

-

-			@Override

-			public EvaluationResult evaluate(IEvaluationContext context) throws CoreException {

-				return EvaluationResult.TRUE;

-			}

-		};

-		for(final CommandContributionItem item : addCreationItems(serviceLocator, additions, null)) {

-			additions.addContributionItem(item, visibleWhen);

-		}

-	}

-

-	/**

-	 * 

-	 * @param serviceLocator

-	 * @param additions

-	 * @param parent

-	 * @return

-	 */

-	protected List<CommandContributionItem> addCreationItems(final IServiceLocator serviceLocator, final IContributionRoot additions, IContributionManager parent) {

-		final ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);

-		final List<CommandContributionItem> items = new ArrayList<CommandContributionItem>();

-		final Category category = commandService.getCategory(this.commandCateogyId);

-		final Set<Command> commands = new TreeSet<Command>();

-		commands.addAll(Arrays.asList(commandService.getDefinedCommands()));

-		for(Command command : commands) {

-			Category currentCategory = null;

-			try {

-				currentCategory = command.getCategory();

-			} catch (NotDefinedException e) {

-				Activator.log.debug(e.getLocalizedMessage());

-				continue;

-			}

-			if(command.isDefined() && category.equals(currentCategory)) {

-				final IHandler handler = command.getHandler();

-				if(handler instanceof AbstractHandler) {

-

-					//required!?!?! in some case can avoid the message for handler conflicting (ex : Allocate in SysML NatTable Allocation

-					((AbstractHandler)handler).setEnabled(null);

-					boolean isEnabled = handler.isEnabled();

-					command.setEnabled(null);

-					((AbstractHandler)handler).setEnabled(null);

-

-					isEnabled = handler.isEnabled();

-					try {

-						if(isEnabled) {

-							CommandContributionItemParameter p = new CommandContributionItemParameter(serviceLocator, "", command.getId(), SWT.PUSH); //$NON-NLS-1$

-							p.label = command.getDescription();

-							p.icon = EclipseCommandUtils.getCommandIcon(command);

-							CommandContributionItem item = new CommandContributionItem(p);

-							items.add(item);

-						}

-					} catch (NotDefinedException e) {

-						Activator.log.debug(e.getLocalizedMessage());

-					}

-				}

-			}

-		}

-		return items;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/BooleanHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/BooleanHelper.java
deleted file mode 100644
index ecfd0c97955..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/BooleanHelper.java
+++ /dev/null
@@ -1,38 +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.tools.util;

-

-/**

- * 

- * This class provides an useful methods for boolean

- * 

- */

-public class BooleanHelper {

-

-	private BooleanHelper() {

-		//to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param str

-	 *        a string

-	 * @return

-	 *         <code>true</code> if the string represents a boolean value

-	 */

-	public static final boolean isBoolean(final String str) {

-		return "true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java
deleted file mode 100644
index da6ae044f7d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.tools.util;

-

-import org.eclipse.papyrus.infra.tools.Activator;

-

-/**

- * A Helper class for Class Loading.

- * 

- * @author Camille Letavernier

- */

-//This class needs the "BuddyPolicy" set to "dependent" in the Manifest.MF, 

-//in order to be able to retrieve the classes it loads

-//

-//This is the org.eclipse.papyrus.infra.tools class loader which is used for loading

-//a class, instead of each caller's ClassLoader

-//

-//Plug-ins using this class should also either set their Buddy-policy to dependent or 

-//reexport the dependency to oep.infra.tools

-public class ClassLoaderHelper {

-

-	/**

-	 * Loads the class matching the given className. Exceptions are caught and sent

-	 * to the Logger.

-	 * 

-	 * @param className

-	 *        The qualified name of the Class to load.

-	 * @return

-	 *         The loaded Class, or null if an error occured

-	 */

-	public static Class<?> loadClass(String className) {

-		try {

-			Class<?> clazz = Activator.getDefault().getBundle().loadClass(className);

-			return clazz;

-		} catch (ClassNotFoundException ex) {

-			Activator.log.error(String.format("The class %s doesn't exist", className), ex); //$NON-NLS-1$ 

-		} catch (NullPointerException ex) {

-			Activator.log.error("Cannot load class " + className, ex); //$NON-NLS-1$

-		}

-

-		return null;

-	}

-

-	/**

-	 * Loads and returns the class denoted by the given className.

-	 * Checks that the loaded class is a subtype of the given Class.

-	 * 

-	 * @param className

-	 *        The qualified name of the class to be loaded

-	 * @param asSubClass

-	 *        The interface or class that the loaded class must implement or extend

-	 * @return

-	 *         The loaded class, or null if the class doesn't exist or is invalid.

-	 *         In such a case, the exception is logged.

-	 */

-	public static <T> Class<? extends T> loadClass(String className, Class<T> asSubClass) {

-		Class<?> theClass = loadClass(className);

-		if(theClass == null) {

-			return null;

-		}

-

-		try {

-			Class<? extends T> typedClass = theClass.asSubclass(asSubClass);

-			return typedClass;

-		} catch (ClassCastException ex) {

-			Activator.log.error(String.format("The class %1$s doesn't extend or implement %2$s", className, asSubClass.getName()), ex); //$NON-NLS-1$

-		}

-

-		return null;

-	}

-

-	/**

-	 * Creates a new instance of class denoted by the given className.

-	 * Checks that the instantiated class is a subtype of the given class

-	 * 

-	 * @param className

-	 *        The qualified name of the class to be instantiated

-	 * @param asSubclass

-	 *        The interface or class that the loaded class must implement or extend

-	 * @return

-	 *         An instance of the loaded class, or null if a valid instance

-	 *         cannot be created. In such a case, the exception is logged.

-	 */

-	public static <T> T newInstance(String className, Class<T> asSubclass) {

-		Class<? extends T> typedClass = loadClass(className, asSubclass);

-		if(typedClass == null) {

-			return null;

-		}

-

-		return newInstance(typedClass);

-	}

-

-	/**

-	 * Returns a new Instance of the given class

-	 * 

-	 * @param className

-	 *        The qualified name of the Class to instantiate

-	 * @return

-	 *         A new instance of the given class, or null if the class couldn't be

-	 *         instantiated

-	 */

-	public static Object newInstance(String className) {

-		return newInstance(loadClass(className));

-	}

-

-	/**

-	 * Returns a new Instance of the given class

-	 * 

-	 * @param theClass

-	 *        The Class to instantiate

-	 * @return

-	 *         A new instance of the given class, or null if the class couldn't be

-	 *         instantiated

-	 */

-	public static <T extends Object> T newInstance(Class<T> theClass) {

-		if(theClass == null) {

-			return null;

-		}

-

-		try {

-			return theClass.newInstance();

-		} catch (IllegalAccessException ex) {

-			Activator.log.error("Cannot find a valid public constructor for the class " + theClass.getName(), ex); //$NON-NLS-1$

-		} catch (InstantiationException ex) {

-			Activator.log.error(String.format("The class %s cannot be instantiated.", theClass.getName()), ex); //$NON-NLS-1$

-		}

-

-		return null;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClipboardUtils.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClipboardUtils.java
deleted file mode 100644
index d3edb898d6f..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClipboardUtils.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.tools.util;

-

-import java.awt.Toolkit;

-import java.awt.datatransfer.DataFlavor;

-import java.awt.datatransfer.UnsupportedFlavorException;

-import java.io.IOException;

-

-import org.eclipse.papyrus.infra.tools.Activator;

-

-

-/**

- * 

- * @author vl222926

- *

- */

-public class ClipboardUtils {

-

-	

-	private ClipboardUtils() {

-		//to prevent instanciationF

-	}

-	

-	/**

-	 * 

-	 * @return

-	 *         the clipboard contents used to build the command

-	 */

-	public static final String getClipboardContents() {

-		// examine system clipboard

-		String bufferSystem = null;

-

-		//using AWT

-		/*

-		 * final DataFlavor[] dataFlavors = Toolkit.getDefaultToolkit().getSystemClipboard().getAvailableDataFlavors();

-		 * for(final DataFlavor dataFlavor : dataFlavors) {

-		 * try {

-		 * if(dataFlavor.isFlavorTextType() && dataFlavor.isMimeTypeEqual(DataFlavor.stringFlavor)) {

-		 * bufferSystem = Toolkit.getDefaultToolkit().getSystemClipboard().getData(dataFlavor).toString();

-		 * }

-		 * } catch (final Exception e) {

-		 * Activator.log.error(e);

-		 * }

-		 * }

-		 */

-		java.awt.datatransfer.Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();

-		if(clipboard.isDataFlavorAvailable(DataFlavor.stringFlavor)) {

-			try {

-				bufferSystem = clipboard.getData(DataFlavor.stringFlavor).toString();

-			} catch (UnsupportedFlavorException e) {

-				Activator.log.error(e);

-			} catch (IOException e) {

-				Activator.log.error(e);

-			}

-		}

-		//using SWT

-		//		final Display display = Display.getCurrent();

-		//		final Clipboard cb = new Clipboard(display);

-		//		//we use the text transfert

-		//		final TextTransfer transfer = TextTransfer.getInstance();

-		//

-		//		final Clipboard cb = new Clipboard(clipboard);

-		//		final String contents = (String)cb.getContents(transfer);

-

-

-		return bufferSystem;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/EclipseCommandUtils.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/EclipseCommandUtils.java
deleted file mode 100644
index 28eed32b17c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/EclipseCommandUtils.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.tools.util;

-

-import java.util.Collection;

-import java.util.Set;

-import java.util.TreeSet;

-

-import org.eclipse.core.commands.Category;

-import org.eclipse.core.commands.Command;

-import org.eclipse.core.commands.common.NotDefinedException;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.papyrus.infra.tools.Activator;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.commands.ICommandImageService;

-import org.eclipse.ui.commands.ICommandService;

-

-/**

- * This class provides useful methods to manipulate Eclipse Command

- * 

- * @author vl222926

- * 

- */

-public class EclipseCommandUtils {

-

-	private EclipseCommandUtils() {

-		//to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param categoryId

-	 *        a category id

-	 * @return

-	 *         all commands defined for this category

-	 */

-	public static final Collection<Command> getAllExistingCommandsInCategory(final String categoryId) {

-		final Set<Command> commands = new TreeSet<Command>();

-		final ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);

-		final Category category = commandService.getCategory(categoryId);

-		for(final Command command : commandService.getDefinedCommands()) {

-			Category currentCategory = null;

-			try {

-				currentCategory = command.getCategory();

-			} catch (NotDefinedException e) {

-				Activator.log.debug(e.getLocalizedMessage());

-				continue;

-			}

-			if(/* command.isDefined() && */category.equals(currentCategory)) {

-				commands.add(command);

-			}

-		}

-		return commands;

-	}

-

-	/**

-	 * 

-	 * @param command

-	 *        an Eclipse command

-	 * @return

-	 *         the image descriptor associated to this command

-	 */

-	public static final ImageDescriptor getCommandIcon(final Command command) {

-		final IWorkbench workbench = PlatformUI.getWorkbench();

-		final ICommandImageService service = (ICommandImageService)workbench.getService(ICommandImageService.class);

-		final ImageDescriptor imageDescriptor = service.getImageDescriptor(command.getId());

-		return imageDescriptor;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/EditorHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/EditorHelper.java
deleted file mode 100644
index 6ca2e7a1d0d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/EditorHelper.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.tools.util;

-

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * 

- * a helper for the Editor

- * 

- */

-public class EditorHelper {

-

-	private EditorHelper() {

-		//nothing to do

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the current editor or <code>null</code> if not found

-	 */

-	public static final IEditorPart getCurrentEditor() {

-		final IWorkbench workbench = PlatformUI.getWorkbench();

-		if(workbench != null) {

-			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();

-			if(activeWorkbench != null) {

-				final IWorkbenchPage activePage = activeWorkbench.getActivePage();

-				if(activePage != null) {

-					return activePage.getActiveEditor();

-				}

-			}

-		}

-		return null;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IntegerAndSpreadsheetNumberConverter.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IntegerAndSpreadsheetNumberConverter.java
deleted file mode 100644
index 08d4e17cb3b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/IntegerAndSpreadsheetNumberConverter.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.tools.util;

-

-/**

- *

- * This class allows to converter an int into a String like a spreadsheet numerotation and vice-versa. Fox example :

- * <ul>

- * <li>1 <-> A</li>

- * <li>26 <-> Z</li>

- * <li>27 <-> AA</li>

- * <li>28<-> AB</li>

- * </ul>

- *

- *

- *

- *

- */

-//adapted code from http://www.developpez.net/forums/d1197058/dotnet/general-dotnet/contribuez/extensions-types-int-string-conversion-format-colonne-excel/

-public class IntegerAndSpreadsheetNumberConverter {

-

-	/**

-	 *

-	 * Constructor.

-	 *

-	 */

-	private IntegerAndSpreadsheetNumberConverter() {

-		//to prevent instanciation

-	}

-

-	/**

-	 *

-	 * @param number

-	 *        an integer

-	 * @return

-	 *         the string representing this integer in a spreedsheet

-	 */

-	public static String toString(int number) {

-		if(number <= 0) {

-			throw new NumberFormatException();

-		}

-		int tmp = number;

-		String string = ""; //$NON-NLS-1$

-		while(tmp > 0) {

-			final int r = (tmp - 1) % 26;

-			string = (char)('A' + r) + string;

-			tmp = (tmp - r) / 26;

-		}

-

-		return string;

-	}

-

-	/**

-	 *

-	 * @unused

-	 * @param string

-	 *        a string

-	 * @return

-	 *         the number corresponding to the string

-	 */

-	public static int toInt(String string) {

-		if(string == null || string.length() == 0) {

-			throw new NumberFormatException();

-		}

-		string = string.toUpperCase();

-		int multiplier = 1;

-		int columnNumber = 0;

-		for(int i = string.length() - 1; i >= 0; i--) {

-			final char c = string.charAt(i);

-			if(c < 'A' || c > 'Z') {

-				throw new NumberFormatException();

-			}

-			final int value = (c - 'A' + 1) * multiplier;

-			columnNumber += value;

-			multiplier *= 26;

-		}

-		return columnNumber;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ListHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ListHelper.java
deleted file mode 100644
index 2376440f512..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ListHelper.java
+++ /dev/null
@@ -1,81 +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:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.tools.util;

-

-import java.util.ArrayList;

-import java.util.List;

-

-public class ListHelper {

-

-	/**

-	 * Converts an array to a List

-	 * 

-	 * This method is similar to Arrays.asList, except that it returns

-	 * a writeable list

-	 * 

-	 * @param array

-	 *        The array to transform into a List

-	 * @return

-	 *         A List containing the same elements as the array

-	 */

-	public static <T> List<T> asList(T[] array) {

-		if(array == null) {

-			return new ArrayList<T>();

-		}

-

-		List<T> result = new ArrayList<T>(array.length);

-		for(T t : array) {

-			result.add(t);

-		}

-		return result;

-	}

-

-	/**

-	 * Invokes the toString() method recursively on this list's elements.

-	 * The values are separated by ", "

-	 * 

-	 * @param list

-	 *        The list whose string representation to return

-	 * @return

-	 * 

-	 * @see #deepToString(List, String)

-	 */

-	public static String deepToString(List<?> list) {

-		return deepToString(list, ", ");

-	}

-

-	/**

-	 * Invokes the toString() method recursively on this list's elements.

-	 * The values are separated by the given separator

-	 * 

-	 * @param list

-	 *        The list whose string representation to return

-	 * @param separator

-	 *        The string to insert between each element's string representation

-	 * @return

-	 * 

-	 * @see #deepToString(List)

-	 */

-	public static String deepToString(List<?> list, String separator) {

-		boolean firstElement = true;

-		String result = "";

-		for(Object item : list) {

-			if(firstElement) {

-				firstElement = false;

-			} else {

-				result += separator;

-			}

-			result += item == null ? null : item.toString();

-		}

-		return result;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/PlatformHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/PlatformHelper.java
deleted file mode 100644
index afb2db195ee..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/PlatformHelper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.papyrus.infra.tools.util;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.Platform;

-

-

-public class PlatformHelper {

-

-	public static Object getAdapter(Object adaptable, Class<?> adapterType) {

-		if (adapterType.isInstance(adaptable)) {

-			return adaptable;

-		}

-		if (adaptable instanceof IAdaptable) {

-			Object result = ((IAdaptable)adaptable).getAdapter(adapterType);

-			if (result != null) {

-				return result;

-			}

-		}

-		return Platform.getAdapterManager().getAdapter(adaptable, adapterType);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ReflectHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ReflectHelper.java
deleted file mode 100644
index b80d2884630..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ReflectHelper.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.tools.util;

-

-import java.lang.reflect.Method;

-

-/**

- * 

- * This helper provides methods to get methods reflectively

- * It is not the better way to access to method, but sometimes it can be interested to avoid to duplicate

- * lot of code

- * 

- */

-public class ReflectHelper {

-

-	/**

-	 * 

-	 * Should not be instantiated

-	 * 

-	 */

-	private ReflectHelper() {

-		// prevents instantiation

-	}

-

-	/**

-	 * Warning : each call of this method should be tested with a JUnit test, in order to know

-	 * when the API has changed

-	 * 

-	 * @param aClass

-	 *        a class

-	 * @param methodName

-	 *        the name of the method to find

-	 * @param parameterTypes

-	 *        an array owning the type of the parameters of the called method

-	 * @return

-	 *         the wanted method

-	 * @throws NoSuchMethodException

-	 * @throws SecurityException

-	 */

-	public static Method getMethod(final Class<?> aClass, final String methodName, Class<?>[] parameterTypes) throws SecurityException, NoSuchMethodException {

-		Method m = null;

-		m = aClass.getDeclaredMethod(methodName, parameterTypes);

-		m.setAccessible(true);

-		return m;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypesConstants.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypesConstants.java
deleted file mode 100644
index 4d6ab720cfc..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/TypesConstants.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.tools.util;

-

-/**

- * 

- * This class provides some constants used to identify java types

- * 

- * @author vl222926

- * 

- */

-public class TypesConstants {

-

-

-	private TypesConstants() {

-		//to prevent instanciation

-	}

-

-	public static final String STRING = "String";

-

-	public static final String BOOLEAN = "Boolean";

-

-	public static final String INTEGER = "Integer";

-

-	public static final String DOUBLE = "Double";

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/WorkbenchPartHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/WorkbenchPartHelper.java
deleted file mode 100644
index 9b1bde932e9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/WorkbenchPartHelper.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.tools.util;

-

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * 

- * a helper for the Eclipse workbench part

- * 

- */

-public class WorkbenchPartHelper {

-

-	private WorkbenchPartHelper() {

-		//nothing to do

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the current editor or <code>null</code> if not found

-	 */

-	public static final IWorkbenchPart getCurrentActiveWorkbenchPart() {

-		final IWorkbench workbench = PlatformUI.getWorkbench();

-		if(workbench != null) {

-			final IWorkbenchWindow activeWorkbench = workbench.getActiveWorkbenchWindow();

-			if(activeWorkbench != null) {

-				final IWorkbenchPage activePage = activeWorkbench.getActivePage();

-				if(activePage != null) {

-					return activePage.getActivePart();

-				}

-			}

-		}

-		return null;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/.classpath b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/.classpath
deleted file mode 100644
index dd6c4e1a60d..00000000000
--- a/sandbox/pasteInNewTable/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/JavaSE-1.6"/>

-	<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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/.project b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/.project
deleted file mode 100644
index 87987e77a69..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
deleted file mode 100644
index 4e972768f74..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,43 +0,0 @@
-Manifest-Version: 1.0

-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.1",

- org.eclipse.nebula.widgets.nattable.core;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.widgets;bundle-version="0.10.1",

- org.eclipse.papyrus.uml.tools;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.emf;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.emf.nattable;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.nattable.model;bundle-version="0.10.1",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.1",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.1",

- org.eclipse.papyrus.infra.nattable;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.core;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.1",

- org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.widgets.toolbox,

- org.eclipse.papyrus.infra.tools

-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

-Bundle-Vendor: %Bundle-Vendor

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.10.1.qualifier

-Bundle-Name: %Bundle-Name

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.nattable.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/OSGI-INF/l10n/bundle.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index fb1195dca7a..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/about.html b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/about.html
deleted file mode 100644
index 598b3684879..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/build.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/build.properties
deleted file mode 100644
index 9ba7958efa7..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/icons/aggreg_shared.gif b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/icons/aggreg_shared.gif
deleted file mode 100644
index efaa877cccc..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/icons/aggreg_shared.gif
+++ /dev/null
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/plugin.pdoc b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/plugin.pdoc
deleted file mode 100644
index b4e5c067f2c..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/plugin.xml b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/plugin.xml
deleted file mode 100644
index c9035644704..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/plugin.xml
+++ /dev/null
@@ -1,109 +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>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.papyrus.uml.nattable.handler.RowPasteHandler"

-            commandId="org.eclipse.ui.edit.paste">

-             <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.ui.menus">

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.ui.popup.any">

-         <command

-               commandId="org.eclipse.ui.edit.paste"

-               label="Paste rows"

-               style="push">

-               <visibleWhen>

-             <with

-                   variable="selection">

-                <test

-                      forcePluginActivation="true"

-                      property="org.eclipse.papyrus.infra.nattable.tester.isNattableWidget"

-                      value="true">

-                </test>

-             </with>

-          </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>
-</plugin>

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/Activator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/Activator.java
deleted file mode 100644
index 9f70ea359ae..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
deleted file mode 100644
index 924eff11530..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLSingleReferenceComboBoxDataProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLSingleReferenceComboBoxDataProvider.java
deleted file mode 100644
index 3ce42b15cf7..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLSingleReferenceComboBoxDataProvider.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.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) {

-		Object colElement = this.elementProvider.getColumnElement(columnIndex);

-		Object rowElement = this.elementProvider.getRowElement(rowIndex);

-

-		colElement = AxisUtils.getRepresentedElement(colElement);

-		rowElement = AxisUtils.getRepresentedElement(rowElement);

-		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) {

-		Object colElement = this.elementProvider.getColumnElement(columnIndex);

-		Object rowElement = this.elementProvider.getRowElement(rowIndex);

-		colElement= AxisUtils.getRepresentedElement(colElement);

-		rowElement = AxisUtils.getRepresentedElement(rowElement);

-		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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLStereotypeSingleEnumerationComboBoxDataProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLStereotypeSingleEnumerationComboBoxDataProvider.java
deleted file mode 100644
index eb1d96d40da..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/dataprovider/UMLStereotypeSingleEnumerationComboBoxDataProvider.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.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);

-		el = AxisUtils.getRepresentedElement(el);

-		rowElement = AxisUtils.getRepresentedElement(rowElement);

-		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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/AbstractUMLMultiValueCellEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/AbstractUMLMultiValueCellEditor.java
deleted file mode 100644
index b05e94a789e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/AbstractUMLMultiValueCellEditor.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://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();

-		Object row = this.manager.getRowElement(rowIndex);

-		Object column = this.manager.getColumnElement(columnIndex);

-		row = AxisUtils.getRepresentedElement(row);

-		column = AxisUtils.getRepresentedElement(column);

-		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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiBooleanCellEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiBooleanCellEditor.java
deleted file mode 100644
index f89cf6729f8..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiEnumCellEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiEnumCellEditor.java
deleted file mode 100644
index 61f9d908b29..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiIntegerCellEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiIntegerCellEditor.java
deleted file mode 100644
index 59f5f52b670..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiRealCellEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiRealCellEditor.java
deleted file mode 100644
index 7a57255d957..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiReferenceCellEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiReferenceCellEditor.java
deleted file mode 100644
index 32095677a00..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiStringCellEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiStringCellEditor.java
deleted file mode 100644
index 1c05dd50002..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiUnlimitedNaturalCellEditor.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/MultiUnlimitedNaturalCellEditor.java
deleted file mode 100644
index e266e164f16..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/handler/PasteInPapyrusTableCommandProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/handler/PasteInPapyrusTableCommandProvider.java
deleted file mode 100644
index ecb18ee6140..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/handler/PasteInPapyrusTableCommandProvider.java
+++ /dev/null
@@ -1,353 +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.handler;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Map;

-

-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.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.papyrus.infra.emf.utils.EMFStringValueConverter;

-import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;

-import org.eclipse.papyrus.infra.nattable.manager.cell.ICellManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-import org.eclipse.papyrus.infra.nattable.utils.IPasteInTableCommandProvider;

-import org.eclipse.papyrus.infra.nattable.utils.TableClipboardUtils;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.uml.tools.utils.NameResolutionHelper;

-import org.eclipse.papyrus.uml.tools.utils.UMLStringValueConverter;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.UMLPackage;

-

-

-/**

- * 

- * This class allows to get the paste command for the FlowPortTable.

- * This paste used the visible columns to execute the paste action.

- * The columns representing direct features AND stereotype properties are used. Ohters visible columns (like self) are ignored.

- * 

- * 

- */

-public class PasteInPapyrusTableCommandProvider implements IPasteInTableCommandProvider {

-

-	/**

-	 * the error message for the command

-	 */

-	protected String pasteErrorMessage = null;

-

-	private static final int MIN_ROWS_FOR_PROGRESS_MONITOR = 5;

-

-	private static final String TYPE_FORMAT_ERROR_MESSAGE = "The String {0} is not valid to create a {1}";

-

-	/**

-	 * this map associates EClass to their nameResolutionHelper

-	 */

-	//	final protected Map<EClass, NameResolutionHelper> nameResolutionHelpers = new HashMap<EClass, NameResolutionHelper>();

-

-	/** this map associates profile qualified name, with name resolution helper */

-	final protected Map<String, NameResolutionHelper> stereotypesHelper = new HashMap<String, NameResolutionHelper>();

-

-	//	final protected Map<StereotypePropertyElement, Property> stereotypePropertiesMap = new HashMap<StereotypePropertyElement, Property>();

-	//FIXME : change the return command to a GMF Command

-	public ICommand getPasteFromFromStringCommand(final TransactionalEditingDomain editingDomain, final Table papyrusTable, final IProgressMonitor commandCreationCancelProvider, final ProgressMonitorDialog commandExecutionProgressMonitor, final String clipboardContents, final INattableModelManager tableManager) {

-		//FIXME : verify that the context is a Namespace

-		final EMFStringValueConverter stringResolvers = new UMLStringValueConverter((Namespace)papyrusTable.getContext(), TableClipboardUtils.MULTI_VALUE_SEPARATOR);

-

-		//initialize the values

-		final CompositeCommand cmd = new CompositeCommand("Paste from String Command");

-		final Element tableContext = (Element)papyrusTable.getContext();//FIXME : add a test for that in the isEnabled

-		final EReference containementfeature = UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();

-

-		//0. we reset the paste error message

-		this.pasteErrorMessage = null;

-

-		//1. we clear the map of the NameResolutionHelpers

-		//		this.nameResolutionHelpers.clear();

-		//		this.stereotypesHelper.clear();

-

-		//		this.stereotypePropertiesMap.clear();

-		final Collection<Stereotype> stereotypeToApply = getStereotypesToApply(papyrusTable, tableManager);

-

-		//3. we get the managed features

-		//final List<EStructuralFeature> features = getManagedFeatures(iTableWidget);

-

-		//4. we determine if we should add a command to add the pasted elements in the table

-		//		final boolean addToTable = FillMode.USER == papyrusTable.getFillMode();

-

-		final boolean addToTable = !tableManager.getRowAxisManager().isDynamic();//FIXME : rows/columns

-

-		//5. get the rows to create

-		final String[] rows = TableClipboardUtils.getRows(clipboardContents);

-

-		//6. this list will be used to add the created elements to the table

-		final List<ICommand> createCommands = new ArrayList<ICommand>();

-

-		//7. we launch the dialog used for the command creation

-		if(commandCreationCancelProvider != null) {

-			commandCreationCancelProvider.beginTask("Initialize Paste Action", rows.length + 1);

-		}

-

-		//8. we build the command itself

-		final boolean useDialog = (commandExecutionProgressMonitor != null) && (rows.length > MIN_ROWS_FOR_PROGRESS_MONITOR);

-

-		//8.1 create the command to open the progress monitor dialog during the command execution

-		if(useDialog) {

-			final AbstractTransactionalCommand beginMonitor = new AbstractTransactionalCommand(editingDomain, "Launch Progress Monitor Dialog", Collections.emptyList()) {

-

-				@Override

-				protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {

-					commandExecutionProgressMonitor.open();

-					commandExecutionProgressMonitor.getProgressMonitor().setTaskName("Pasting In Table");

-					commandExecutionProgressMonitor.getProgressMonitor().beginTask("Pasting In Table", rows.length);

-					return CommandResult.newOKCommandResult();

-				}

-			};

-			cmd.add(beginMonitor);

-		}

-

-		//8.2 we iterate on the rows

-		for(final String row : rows) {

-			if(useDialog) {

-				commandCreationCancelProvider.worked(1);

-			}

-			if((commandCreationCancelProvider != null) && commandCreationCancelProvider.isCanceled()) {

-				//the user click on the cancel button

-				return null;

-			}

-

-			//8.3 we get the string values of the cells

-			final String[] cells = TableClipboardUtils.getCells(row);

-

-

-

-			//8.4 bis : update the paste execution dialog

-			if(useDialog) {

-				final ICommand dialogCommand = new AbstractTransactionalCommand(editingDomain, null, null) {

-

-					@Override

-					protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {

-						commandExecutionProgressMonitor.getProgressMonitor().subTask("Pasting : " + row);

-						return CommandResult.newOKCommandResult();

-					}

-				};

-				cmd.add(dialogCommand);

-			}

-

-			//8.5 we create the element itself

-			//FIXME : we ignore the case where an element with the same name and type already exists

-			final CreateElementRequest createRequest = new CreateElementRequest(editingDomain, tableContext, getIElementTypeToCreateElement(papyrusTable), containementfeature);

-			final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(tableContext);

-			final ICommand commandCreation = provider.getEditCommand(createRequest);

-			//we add the creation command to the list of the creation command to be able to add the result of these command to the table

-

-			createCommands.add(commandCreation);

-

-			cmd.add(commandCreation);

-

-			//8.6 we apply the required stereotypes on it

-			//FIXME

-			//			if(stereotypeToApply.size() != 0) {

-			//				final ICommand applyStereotypesCmd = new AbstractTransactionalCommand(editingDomain, "Apply Required Stereotype", null) { //$NON-NLS-1$

-			//

-			//					@Override

-			//					protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {

-			//						final Element el = (Element)commandCreation.getCommandResult().getReturnValue();

-			//						final PasteWarningStatus rootStatus = new PasteWarningStatus("Problem to apply stereotype", el);

-			//						for(final Stereotype ste : stereotypeToApply) {

-			//							if(el.getApplicableStereotype(ste.getQualifiedName()) == null) {

-			//								final IStatus status = new StereotypeApplicationErrorStatus(NLS.bind("The Stereotype {0} can't be applied", ste.getQualifiedName(), el), el, ste.getQualifiedName());

-			//								rootStatus.addChildren(status);

-			//							}

-			//							if(el.getAppliedStereotype(ste.getQualifiedName()) == null) {

-			//								el.applyStereotype(ste);

-			//							}

-			//						}

-			//						if(rootStatus.isMultiStatus()) {

-			//							return new CommandResult(rootStatus, rootStatus);

-			//						}

-			//						return CommandResult.newOKCommandResult();

-			//					}

-			//				};

-			//				cmd.append(new GMFtoEMFCommandWrapper(applyStereotypesCmd));

-			//			}

-

-			//8.7 we set these properties values

-			final List<Object> columns = tableManager.getColumnElementsList();

-

-			//			for(int i = 0; i < java.lang.Math.min(cells.length, visibleColumns.size()); i++) {

-

-			for(int i = 0; i < columns.size(); i++) {

-				final Object column = columns.get(i);

-				final String valueAsString = cells[i];

-				final AbstractTransactionalCommand setValuesCommand = new AbstractTransactionalCommand(editingDomain, "Set Value Command", null) {

-

-					@Override

-					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-						final EObject createdElement = (EObject)commandCreation.getCommandResult().getReturnValue();

-						//FIXME : doit on toujours l'appeler ou peut-on garder les cellManager associés aux columns? 

-						//FIXME : attention au cas du SysML CellManager pour flowport atomic avec N/A!

-						ICellManager cellManager = CellManagerFactory.INSTANCE.getCellManager(createdElement, column);

-						boolean isEditable = CellManagerFactory.INSTANCE.isCellEditable(createdElement, column);

-						if(isEditable) {//FIXME add a test for featureisChangeable!

-							final ICommand setValueCommand = cellManager.getSetStringValueCommand(editingDomain, papyrusTable, tableContext, createdElement, column, valueAsString, stringResolvers);

-							if(setValueCommand != null && setValueCommand.canExecute()) {

-								setValueCommand.execute(null, null);

-							}

-						}

-						return null;

-					}

-				};

-

-				cmd.add(setValuesCommand);

-			}

-

-			//8.8 update the command paste dialog

-			if(useDialog) {

-				final ICommand dialogCommand = new AbstractTransactionalCommand(editingDomain, null, null) {

-

-					@Override

-					protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {

-						commandExecutionProgressMonitor.getProgressMonitor().worked(1);

-						return CommandResult.newOKCommandResult();

-					}

-				};

-				cmd.add(dialogCommand);

-			}

-		}

-

-		//add the created element to the table

-		if(addToTable) {

-			final AbstractTransactionalCommand addToTableCommand = new AbstractTransactionalCommand(editingDomain, "Add To Table After Paste Command", null) {

-

-				@Override

-				protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-					final Collection<Object> objectsToAdd = Collections.EMPTY_LIST;

-					for(final ICommand current : createCommands) {

-						objectsToAdd.add(current.getCommandResult().getReturnValue());//FIXME : verify that the object are alwaed in the table

-					}

-					Command cmd = tableManager.getAddRowElementCommand(objectsToAdd);

-					cmd.execute();

-					return null;

-				}

-			};

-		}

-

-		//close the dialog used during the paste command execution

-		if(useDialog) {

-			final AbstractTransactionalCommand endMonitor = new AbstractTransactionalCommand(editingDomain, "Close Progress Monitor Dialog", Collections.emptyList()) { //$NON-NLS-1$

-

-				@Override

-				protected CommandResult doExecuteWithResult(final IProgressMonitor monitor, final IAdaptable info) throws ExecutionException {

-					commandExecutionProgressMonitor.getProgressMonitor().done();

-					commandExecutionProgressMonitor.close();

-					return CommandResult.newOKCommandResult();

-				}

-			};

-			cmd.add(endMonitor);

-		}

-

-		if(!cmd.isEmpty()) {

-			if(cmd.canExecute()) {

-				return cmd;

-			}

-		}

-		return UnexecutableCommand.INSTANCE;

-	}

-

-	//FIXME : remove this method

-	private IElementType getIElementTypeToCreateElement(Table papyrusTable) {

-		final String id = "org.eclipse.papyrus.sysml.FlowPort";//FIXME

-		return ElementTypeRegistry.getInstance().getType(id);

-	}

-

-

-	/**

-	 * 

-	 * 

-	 * @param pTable

-	 *        the PapyrusTable

-	 * @param iTableWidget

-	 *        the tableWidget

-	 * @return

-	 *         the list of the stereotypes to apply on the table. This method can contribute to the

-	 *         {@link AbstractPasteInTableCommandProvider#pasteErrorMessage}

-	 */

-	protected Collection<Stereotype> getStereotypesToApply(final Table pTable, final INattableModelManager iTableWidget)/*

-																														 * throws

-																														 * ErrorInPastePreparationException

-																														 */{

-		//FIXME

-		//		final Collection<String> stereotypeQualifiedName = new ArrayList<String>();

-		//		//for(final Column col : getManagedColumns(iTableWidget)) {

-		//		for(final Column col : this.visibleColumns) {

-		//			if(col instanceof FeatureColumn) {

-		//				final ETypedElement feature = ((FeatureColumn)col).getFeature();

-		//				if(feature instanceof StereotypePropertyElement) {

-		//					StereotypeFacet facet = (StereotypeFacet)feature.eContainer();

-		//					stereotypeQualifiedName.add(facet.getStereotypeQualifiedName());

-		//				}

-		//			}

-		//		}

-		//

-		//

-		//		final List<Profile> appliedProfiles = ((Element)pTable.getTable().getContext()).getNearestPackage().getAllAppliedProfiles();

-		final Collection<Stereotype> toApply = new HashSet<Stereotype>();

-		//		for(final String steQN : stereotypeQualifiedName) {

-		//			final String stereotypeName = NamedElementUtil.getNameFromQualifiedName(steQN);

-		//			final String profileQN = NamedElementUtil.getParentQualifiedName(steQN);

-		//			NameResolutionHelper helper = stereotypesHelper.get(profileQN);

-		//			if(helper == null) {

-		//				for(final Profile prof : appliedProfiles) {

-		//					if(prof.getQualifiedName().equals(profileQN)) {

-		//						helper = new NameResolutionHelper(prof, UMLPackage.eINSTANCE.getStereotype());

-		//						final List<NamedElement> foundElement = helper.getNamedElements(stereotypeName);

-		//						if(foundElement.size() == 1) {

-		//							final Stereotype ste = (Stereotype)foundElement.get(0);

-		//							toApply.add(ste);

-		//						} else {

-		//							throw new ErrorInPastePreparationException(NLS.bind(Messages.PasteInPapyrusTableCommandProvider_RequiredStereotypeCantBeFound, stereotypeName));

-		//						}

-		//						break;

-		//					}

-		//				}

-		//

-		//			}

-		//		}

-		return toApply;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/handler/RowPasteHandler.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/handler/RowPasteHandler.java
deleted file mode 100644
index 554a17dd6f2..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/handler/RowPasteHandler.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.eclipse.papyrus.uml.nattable.handler;

-

-import java.awt.Toolkit;

-import java.awt.datatransfer.DataFlavor;

-import java.awt.datatransfer.UnsupportedFlavorException;

-import java.io.IOException;

-import java.lang.reflect.InvocationTargetException;

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.jface.window.Window;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.emf.dialog.CommandCreationProgressMonitorDialog;

-import org.eclipse.papyrus.infra.nattable.exception.ErrorInPastePreparationException;

-import org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler;

-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.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.IPasteInTableCommandProvider;

-import org.eclipse.papyrus.infra.nattable.utils.PasteConfigurationUtil;

-import org.eclipse.papyrus.infra.nattable.utils.TableClipboardUtils;

-import org.eclipse.papyrus.infra.tools.util.ClipboardUtils;

-import org.eclipse.papyrus.infra.widgets.toolbox.notification.builders.NotificationBuilder;

-import org.eclipse.papyrus.uml.nattable.Activator;

-import org.eclipse.swt.widgets.Display;

-

-//FIXME : improve the handler declaration in the plugin.xml + the command visibility in the plugin.xml

-public class RowPasteHandler extends AbstractTableHandler {

-

-	//FIXME : move them in an upper plugin? 

-	/**

-	 * this field is used to determine if we want open a dialog to prevent the user that the command creation and the command execution can take a

-	 * long time

-	 */

-	private boolean useProgressMonitorDialog = true;

-

-	private final IPasteInTableCommandProvider provider = new PasteInPapyrusTableCommandProvider();

-

-	/**

-	 * 

-	 * @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 {

-		INattableModelManager manager = getCurrentNattableModelManager();

-		final Table papyrusTable = manager.getTable();

-		if(papyrusTable != null) {

-			final String contents = getClipboard();

-			if(this.useProgressMonitorDialog) {//we create the command using a progress monitor

-				return executeWithProgressMonitorDialog(manager, papyrusTable, contents);

-			} else {

-				return executeWithoutProgressMonitorDialog(manager, papyrusTable, contents);

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

-	 * 

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(final Object evaluationContext) {

-		final Table table = getCurrentNattableModelManager().getTable();

-		IPasteConfiguration configuration = PasteConfigurationUtil.getRowPasteConfigurationDefinedInTableConfiguration(table);

-		boolean baseEnabled = false;

-		if(configuration != null) {

-			String contents = getClipboard();

-			String[] rows = TableClipboardUtils.getRows(contents);

-			if(rows.length > 0) {

-				String[] cells = TableClipboardUtils.getCells(rows[0]);

-				if(cells.length == getCurrentNattableModelManager().getColumnCount()) {

-					baseEnabled = getRowAxisManager().canPaste(configuration);

-				}

-			}

-		}

-		setBaseEnabled(baseEnabled);

-	}

-

-	protected Object executeWithProgressMonitorDialog(final INattableModelManager tableManager, final Table pTable, final String contents) {

-		Command createdCommand;

-		int returnCode = Window.OK;

-		final TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)getContextEditingDomain();

-		final CommandCreationProgressMonitorDialog commandCreationDialog = new CommandCreationProgressMonitorDialog(Display.getCurrent().getActiveShell());

-		final ProgressMonitorDialog commandExecutionProgressMonitor = new ProgressMonitorDialog(Display.getCurrent().getActiveShell());

-		commandCreationDialog.getProgressMonitor().setTaskName("Paste command creation");

-		try {

-			commandCreationDialog.run(true, true, new IRunnableWithProgress() {

-

-				public void run(final IProgressMonitor cancelProvider) throws InvocationTargetException, InterruptedException {

-					ICommand cmd;

-					try {

-						cmd = RowPasteHandler.this.provider.getPasteFromFromStringCommand(editingDomain, tableManager.getTable(), cancelProvider, commandExecutionProgressMonitor, contents, tableManager);

-						commandCreationDialog.setCreatedCommand(new GMFtoEMFCommandWrapper(cmd));

-					} catch (ErrorInPastePreparationException e) {

-						commandCreationDialog.setCaughtException(e);

-						commandCreationDialog.setCreatedCommand(null);

-					}

-				}

-			});

-		} catch (final InvocationTargetException e) {

-			Activator.log.error(e);

-		} catch (final InterruptedException e) {

-			Activator.log.error(e);

-		}

-		final Exception e = commandCreationDialog.getCaughtException();

-		if(e != null) {

-			if(e instanceof ErrorInPastePreparationException)

-				NotificationBuilder.createErrorPopup(e.getMessage()).run();

-			return null;

-		}

-

-		returnCode = commandCreationDialog.getReturnCode();

-		createdCommand = commandCreationDialog.getCreatedCommand();

-

-

-		if(returnCode == Window.OK) {

-			if(createdCommand != null) {

-				if(createdCommand.canExecute()) {

-					getContextEditingDomain().getCommandStack().execute(createdCommand);

-					manageCommandResult(createdCommand.getResult());

-				} else {

-					NotificationBuilder.createErrorPopup("The paste command can't be executed");

-				}

-			} else {

-				//an error occured during the command creation, nothing to do

-			}

-			//we don't use dialogs to do the paste

-		} else if(returnCode == Window.CANCEL) {

-			NotificationBuilder.createInfoPopup("Paste Cancelled").run();

-		}

-		return null;

-	}

-

-	protected Object executeWithoutProgressMonitorDialog(final INattableModelManager tableManager, final Table pTable, final String clipboardContents) {

-		ICommand createdCommand;

-		try {

-			createdCommand = this.provider.getPasteFromFromStringCommand((TransactionalEditingDomain)getContextEditingDomain(), pTable, null, null, clipboardContents, tableManager);

-		} catch (ErrorInPastePreparationException e) {

-			System.out.println(e.getMessage());//FIXME?

-			return null;

-		}

-

-		getContextEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createdCommand));

-		//		manageCommandResult(createdCommand.getCommandResult());

-		return null;

-	}

-

-

-	/**

-	 * allows to define if we want use dialog to prevent the user that the command creation and the command execution can take a long time

-	 * 

-	 */

-	public void setWithProgressMonitorDialog(final boolean useProgressMonitorDialog) {

-		this.useProgressMonitorDialog = useProgressMonitorDialog;

-	}

-

-	//FIXME

-	private Collection<IStatus> getInterestingIStatus(final Collection<?> result) {

-		final Collection<IStatus> status = new ArrayList<IStatus>();

-		for(final Object current : result) {

-			if(current instanceof IStatus) {

-				status.add((IStatus)current);

-			}

-		}

-		return status;

-	}

-

-	/**

-	 * 

-	 * @param commandResult

-	 *        the result of the executed command

-	 */

-	//FIXME

-	private void manageCommandResult(final Collection<?> commandResult) {

-		final Collection<IStatus> status = getInterestingIStatus(commandResult);

-		for(IStatus iStatus : status) {

-			final int severity = iStatus.getSeverity();

-			if(severity == IStatus.ERROR || severity == IStatus.WARNING) {

-				Activator.getDefault().getLog().log(iStatus);

-			}

-		}

-	}

-

-	protected String getClipboard() {

-		return ClipboardUtils.getClipboardContents();

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/AbstractUMLSynchronizedOnFeatureAxisManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/AbstractUMLSynchronizedOnFeatureAxisManager.java
deleted file mode 100644
index 7194284efba..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/AbstractUMLSynchronizedOnFeatureAxisManager.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.uml.nattable.manager.axis;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager;

-

-/**

- * *

- * 

- * @author vl222926

- * 

- */

-public abstract class AbstractUMLSynchronizedOnFeatureAxisManager extends AbstractSynchronizedOnFeatureAxisManager {

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.manager.axis.AbstractSynchronizedOnFeatureAxisManager#addContextFeatureValueListener()

-	 * 

-	 */

-	@Override

-	protected void addContextFeatureValueListener() {

-		//see bug Bug 394623

-		this.featureListener = new PapyrusUMLDerivedSubsetAdapter() {//this listener allows to receive notification from some derived UML Feature

-

-			@Override

-			public void notifyChanged(Notification notification, EClass eClass, EStructuralFeature derivedUnion) {

-				if(getListenFeatures().contains(derivedUnion)) {

-					getTableManager().updateAxisContents(getRepresentedContentProvider());

-				}

-			}

-

-			@Override

-			public void notifyChanged(Notification msg) {

-				if(getListenFeatures().contains(msg.getFeature())) {

-					getTableManager().updateAxisContents(getRepresentedContentProvider());

-				}

-				super.notifyChanged(msg);

-			};

-

-		};

-		getTableContext().eAdapters().add(this.featureListener);

-	}

-

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/ClassifierDerivedSubSetAdapter.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/ClassifierDerivedSubSetAdapter.java
deleted file mode 100644
index a7d3178af5d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/ClassifierDerivedSubSetAdapter.java
+++ /dev/null
@@ -1,470 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://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.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter;

-

-/**

- * 

- * @see for generation see {@link PapyrusUMLDerivedSubsetAdapter} This adapter allows to receive the notifications of the following derived subset

- *      features :

- *      <ul>

- *      <li>UMLPackage.Literals.CLASS__SUPER_CLASS</li>

- *      <li>UMLPackage.Literals.CLASSIFIER__GENERALIZATION</li>

- *      </ul>

- * 

- * @author vl222926

- * 

- */

-//FIXME : move me in oep.uml.tools or others uml plugin

-public class ClassifierDerivedSubSetAdapter extends UMLDerivedUnionAdapter {

-

-	@Override

-	protected void notifyStereotypeChanged(Notification notification, EClass eClass) {

-		super.notifyStereotypeChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Stereotype.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyClassChanged(Notification notification, EClass eClass) {

-		super.notifyClassChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Class.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyExtensionChanged(Notification notification, EClass eClass) {

-		super.notifyExtensionChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Extension.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyAssociationChanged(Notification notification, EClass eClass) {

-		super.notifyAssociationChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Association.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyDeploymentSpecificationChanged(Notification notification, EClass eClass) {

-		super.notifyDeploymentSpecificationChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.DeploymentSpecification.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyArtifactChanged(Notification notification, EClass eClass) {

-		super.notifyArtifactChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Artifact.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyInterfaceChanged(Notification notification, EClass eClass) {

-		super.notifyInterfaceChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Interface.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifySignalChanged(Notification notification, EClass eClass) {

-		super.notifySignalChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Signal.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyProtocolStateMachineChanged(Notification notification, EClass eClass) {

-		super.notifyProtocolStateMachineChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.ProtocolStateMachine.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyStateMachineChanged(Notification notification, EClass eClass) {

-		super.notifyStateMachineChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.StateMachine.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyDataTypeChanged(Notification notification, EClass eClass) {

-		super.notifyDataTypeChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.DataType.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyEnumerationChanged(Notification notification, EClass eClass) {

-		super.notifyEnumerationChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Enumeration.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyPrimitiveTypeChanged(Notification notification, EClass eClass) {

-		super.notifyPrimitiveTypeChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.PrimitiveType.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyCollaborationChanged(Notification notification, EClass eClass) {

-		super.notifyCollaborationChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Collaboration.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyUseCaseChanged(Notification notification, EClass eClass) {

-		super.notifyUseCaseChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.UseCase.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyActivityChanged(Notification notification, EClass eClass) {

-		super.notifyActivityChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Activity.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyInteractionChanged(Notification notification, EClass eClass) {

-		super.notifyInteractionChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Interaction.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyActorChanged(Notification notification, EClass eClass) {

-		super.notifyActorChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Actor.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyAssociationClassChanged(Notification notification, EClass eClass) {

-		super.notifyAssociationClassChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.AssociationClass.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyCommunicationPathChanged(Notification notification, EClass eClass) {

-		super.notifyCommunicationPathChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.CommunicationPath.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyComponentChanged(Notification notification, EClass eClass) {

-		super.notifyComponentChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Component.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyDeviceChanged(Notification notification, EClass eClass) {

-		super.notifyDeviceChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Device.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyNodeChanged(Notification notification, EClass eClass) {

-		super.notifyNodeChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Node.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyExecutionEnvironmentChanged(Notification notification, EClass eClass) {

-		super.notifyExecutionEnvironmentChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.ExecutionEnvironment.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyFunctionBehaviorChanged(Notification notification, EClass eClass) {

-		super.notifyFunctionBehaviorChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.FunctionBehavior.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyOpaqueBehaviorChanged(Notification notification, EClass eClass) {

-		super.notifyOpaqueBehaviorChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.OpaqueBehavior.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyInformationItemChanged(Notification notification, EClass eClass) {

-		super.notifyInformationItemChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.InformationItem.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/PackageDerivedSubsetAdapter.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/PackageDerivedSubsetAdapter.java
deleted file mode 100644
index 8f9132f956e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/PackageDerivedSubsetAdapter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://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.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter;

-

-/**

- * @see for generation see {@link PapyrusUMLDerivedSubsetAdapter}

- * This adapter allows to receive notifications for changes on feature :

- * *

- * <ul>

- * <li>UMLPackage.Literals.PACKAGE__NESTED_PACKAGE</li>

- * <li>UMLPackage.Literals.PACKAGE__OWNED_STEREOTYPE</li>

- * <li>UMLPackage.Literals.PACKAGE__OWNED_TYPE</li>

- * </ul>

- * 

- * @author vl222926

- * 

- */

-//FIXME : move me in oep.uml.tools or others uml plugin

-public class PackageDerivedSubsetAdapter extends UMLDerivedUnionAdapter {

-

-	@Override

-	protected void notifyPackageChanged(Notification notification, EClass eClass) {

-		super.notifyPackageChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Package.class)) {

-		case UMLPackage.PACKAGE__PACKAGED_ELEMENT:

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__NESTED_PACKAGE);

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_STEREOTYPE);

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_TYPE);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyProfileChanged(Notification notification, EClass eClass) {

-		super.notifyProfileChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Profile.class)) {

-		case UMLPackage.PACKAGE__PACKAGED_ELEMENT:

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__NESTED_PACKAGE);

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_STEREOTYPE);

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_TYPE);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyModelChanged(Notification notification, EClass eClass) {

-		super.notifyModelChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Model.class)) {

-		case UMLPackage.PACKAGE__PACKAGED_ELEMENT:

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__NESTED_PACKAGE);

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_STEREOTYPE);

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_TYPE);

-			break;

-		default:

-		}

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/PapyrusUMLDerivedSubsetAdapter.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/PapyrusUMLDerivedSubsetAdapter.java
deleted file mode 100644
index 5f4897554ac..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/PapyrusUMLDerivedSubsetAdapter.java
+++ /dev/null
@@ -1,836 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://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.List;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter;

-

-/**

- * This class allows to receive notification for derived subset feature, according to the UML bug 394623

- * the following features are managed :

- * <ul>

- * <li>Class::superClass -> Classifier::generalization</li>

- * <li>Classifier::general -> Classifier::generalization</li>

- * <li>EncapsulatedClassifier::ownedPort -> StructuredClassifier::ownedAttribute</li>

- * <li>Package::nestedPackage -> Package::packagedElement</li>

- * <li>Package::ownedStereotype -> Package::packagedElement</li>

- * <li>Package::ownedType -> Package::packagedElement</li>

- * </ul>

- * .

- * Unfortunately, the main part of the derived features, referenced in the bug 394623 are not managed by this class

- * @author vl222926

- * 

- *         This class has not been generated

- */

-//FIXME : move me in oep.uml.tools or others uml plugin

-public class PapyrusUMLDerivedSubsetAdapter extends UMLDerivedUnionAdapter {

-

-	/**

-	 * This method has been used to write in the console the text for the 3 managed EClass.

-	 * 

-	 * @param eClass

-	 *        the e class

-	 */

-	private static final void writeAllSubTypeMethodInConsole(final EClass eClass) {

-		List<EClass> subType = new ArrayList<EClass>();

-		for(EClassifier current : UMLPackage.eINSTANCE.getEClassifiers()) {

-			if(current instanceof EClass) {

-				if(eClass.isSuperTypeOf((EClass)current)) {

-					if(!((EClass)current).isAbstract() && !((EClass)current).isInterface()) {

-						subType.add((EClass)current);

-					}

-				}

-			}

-		}

-

-		for(EClass current : subType) {

-			String name = current.getName();

-			String methodeName = "notify" + name + "Changed"; //$NON-NLS-1$ //$NON-NLS-2$

-			System.out.println("@Override\n protected void " + methodeName + "(Notification notification, EClass eClass){"); //$NON-NLS-1$ //$NON-NLS-2$

-			System.out.println("super." + methodeName + "(notification,eClass);"); //$NON-NLS-1$ //$NON-NLS-2$

-			System.out.println("switch(notification.getFeatureID(org.eclipse.uml2.uml." + name + ".class)) {\n"); //$NON-NLS-1$ //$NON-NLS-2$

-			if(eClass == UMLPackage.eINSTANCE.getClassifier()) {

-				System.out.println("case UMLPackage.CLASSIFIER__GENERALIZATION: \n notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS); \n break; \n case UMLPackage.CLASSIFIER__GENERAL:notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);\n"); //$NON-NLS-1$

-			}

-			if(eClass == UMLPackage.eINSTANCE.getStructuredClassifier()) {

-				System.out.println("case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE: \n 	notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);"); //$NON-NLS-1$

-			}

-			if(eClass == UMLPackage.eINSTANCE.getPackage()) {

-				System.out.println("case UMLPackage.PACKAGE__PACKAGED_ELEMENT:\n notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__NESTED_PACKAGE);\n notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_STEREOTYPE); \n notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_TYPE);\n"); //$NON-NLS-1$

-			}

-			System.out.println("break; \n default:\n}}"); //$NON-NLS-1$

-		}

-	}

-

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyActivityChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyActivityChanged(Notification notification, EClass eClass) {

-		super.notifyActivityChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Activity.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-			break;

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyActorChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyActorChanged(Notification notification, EClass eClass) {

-		super.notifyActorChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Actor.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyArtifactChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyArtifactChanged(Notification notification, EClass eClass) {

-		super.notifyArtifactChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Artifact.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyAssociationChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyAssociationChanged(Notification notification, EClass eClass) {

-		super.notifyAssociationChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Association.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyAssociationClassChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyAssociationClassChanged(Notification notification, EClass eClass) {

-		super.notifyAssociationClassChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.AssociationClass.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-			break;

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyClassChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyClassChanged(Notification notification, EClass eClass) {

-		super.notifyClassChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Class.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-			break;

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyCollaborationChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyCollaborationChanged(Notification notification, EClass eClass) {

-		super.notifyCollaborationChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Collaboration.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyCommunicationPathChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyCommunicationPathChanged(Notification notification, EClass eClass) {

-		super.notifyCommunicationPathChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.CommunicationPath.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyComponentChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyComponentChanged(Notification notification, EClass eClass) {

-		super.notifyComponentChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Component.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-			break;

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyDataTypeChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyDataTypeChanged(Notification notification, EClass eClass) {

-		super.notifyDataTypeChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.DataType.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyDeploymentSpecificationChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyDeploymentSpecificationChanged(Notification notification, EClass eClass) {

-		super.notifyDeploymentSpecificationChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.DeploymentSpecification.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyDeviceChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyDeviceChanged(Notification notification, EClass eClass) {

-		super.notifyDeviceChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Device.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-			break;

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyEnumerationChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyEnumerationChanged(Notification notification, EClass eClass) {

-		super.notifyEnumerationChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Enumeration.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyExecutionEnvironmentChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyExecutionEnvironmentChanged(Notification notification, EClass eClass) {

-		super.notifyExecutionEnvironmentChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.ExecutionEnvironment.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-			break;

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyExtensionChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyExtensionChanged(Notification notification, EClass eClass) {

-		super.notifyExtensionChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Extension.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyFunctionBehaviorChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyFunctionBehaviorChanged(Notification notification, EClass eClass) {

-		super.notifyFunctionBehaviorChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.FunctionBehavior.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-			break;

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyInformationItemChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyInformationItemChanged(Notification notification, EClass eClass) {

-		super.notifyInformationItemChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.InformationItem.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyInteractionChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyInteractionChanged(Notification notification, EClass eClass) {

-		super.notifyInteractionChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Interaction.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-			break;

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyInterfaceChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyInterfaceChanged(Notification notification, EClass eClass) {

-		super.notifyInterfaceChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Interface.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyNodeChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyNodeChanged(Notification notification, EClass eClass) {

-		super.notifyNodeChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Node.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-			break;

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyOpaqueBehaviorChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyOpaqueBehaviorChanged(Notification notification, EClass eClass) {

-		super.notifyOpaqueBehaviorChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.OpaqueBehavior.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-			break;

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyPrimitiveTypeChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyPrimitiveTypeChanged(Notification notification, EClass eClass) {

-		super.notifyPrimitiveTypeChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.PrimitiveType.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyProtocolStateMachineChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyProtocolStateMachineChanged(Notification notification, EClass eClass) {

-		super.notifyProtocolStateMachineChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.ProtocolStateMachine.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-			break;

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifySignalChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifySignalChanged(Notification notification, EClass eClass) {

-		super.notifySignalChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Signal.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyStateMachineChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyStateMachineChanged(Notification notification, EClass eClass) {

-		super.notifyStateMachineChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.StateMachine.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-			break;

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyStereotypeChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyStereotypeChanged(Notification notification, EClass eClass) {

-		super.notifyStereotypeChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Stereotype.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-			break;

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyUseCaseChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyUseCaseChanged(Notification notification, EClass eClass) {

-		super.notifyUseCaseChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.UseCase.class)) {

-

-		case UMLPackage.CLASSIFIER__GENERALIZATION:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASS__SUPER_CLASS);

-			break;

-		case UMLPackage.CLASSIFIER__GENERAL:

-			notifyChanged(notification, eClass, UMLPackage.Literals.CLASSIFIER__GENERALIZATION);

-

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyPackageChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyPackageChanged(Notification notification, EClass eClass) {

-		super.notifyPackageChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Package.class)) {

-		case UMLPackage.PACKAGE__PACKAGED_ELEMENT:

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__NESTED_PACKAGE);

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_STEREOTYPE);

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_TYPE);

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyProfileChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyProfileChanged(Notification notification, EClass eClass) {

-		super.notifyProfileChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Profile.class)) {

-		case UMLPackage.PACKAGE__PACKAGED_ELEMENT:

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__NESTED_PACKAGE);

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_STEREOTYPE);

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_TYPE);

-			break;

-		default:

-		}

-	}

-

-	/**

-	 * @see org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter#notifyModelChanged(org.eclipse.emf.common.notify.Notification,

-	 *      org.eclipse.emf.ecore.EClass)

-	 * 

-	 * @param notification

-	 * @param eClass

-	 */

-

-	@Override

-	protected void notifyModelChanged(Notification notification, EClass eClass) {

-		super.notifyModelChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Model.class)) {

-		case UMLPackage.PACKAGE__PACKAGED_ELEMENT:

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__NESTED_PACKAGE);

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_STEREOTYPE);

-			notifyChanged(notification, eClass, UMLPackage.Literals.PACKAGE__OWNED_TYPE);

-			break;

-		default:

-		}

-	}

-

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/StructuredClassifierDerivedSubsetAdapter.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/StructuredClassifierDerivedSubsetAdapter.java
deleted file mode 100644
index c3515a97c54..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/StructuredClassifierDerivedSubsetAdapter.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.uml.nattable.manager.axis;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.util.UMLDerivedUnionAdapter;

-

-/**

- * @see for generation see {@link PapyrusUMLDerivedSubsetAdapter} This adapter allows to receive the notifications of the following derived subset

- *      features :

- *      <ul>

- *      <li>UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT</li>

- *      *

- *      </ul>

- * 

- * @author vl222926

- * @see PapyrusUMLDerivedSubsetAdapter

- */

-//FIXME : move me in oep.uml.tools or others uml plugin

-public class StructuredClassifierDerivedSubsetAdapter extends UMLDerivedUnionAdapter {

-

-	@Override

-	protected void notifyStereotypeChanged(Notification notification, EClass eClass) {

-		super.notifyStereotypeChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Stereotype.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyClassChanged(Notification notification, EClass eClass) {

-		super.notifyClassChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Class.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyProtocolStateMachineChanged(Notification notification, EClass eClass) {

-		super.notifyProtocolStateMachineChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.ProtocolStateMachine.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyStateMachineChanged(Notification notification, EClass eClass) {

-		super.notifyStateMachineChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.StateMachine.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyCollaborationChanged(Notification notification, EClass eClass) {

-		super.notifyCollaborationChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Collaboration.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyActivityChanged(Notification notification, EClass eClass) {

-		super.notifyActivityChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Activity.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyInteractionChanged(Notification notification, EClass eClass) {

-		super.notifyInteractionChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Interaction.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyAssociationClassChanged(Notification notification, EClass eClass) {

-		super.notifyAssociationClassChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.AssociationClass.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyComponentChanged(Notification notification, EClass eClass) {

-		super.notifyComponentChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Component.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyDeviceChanged(Notification notification, EClass eClass) {

-		super.notifyDeviceChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Device.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyNodeChanged(Notification notification, EClass eClass) {

-		super.notifyNodeChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.Node.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyExecutionEnvironmentChanged(Notification notification, EClass eClass) {

-		super.notifyExecutionEnvironmentChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.ExecutionEnvironment.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyFunctionBehaviorChanged(Notification notification, EClass eClass) {

-		super.notifyFunctionBehaviorChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.FunctionBehavior.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-	@Override

-	protected void notifyOpaqueBehaviorChanged(Notification notification, EClass eClass) {

-		super.notifyOpaqueBehaviorChanged(notification, eClass);

-		switch(notification.getFeatureID(org.eclipse.uml2.uml.OpaqueBehavior.class)) {

-

-		case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE:

-			notifyChanged(notification, eClass, UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT);

-			break;

-		default:

-		}

-	}

-

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLElementAxisManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLElementAxisManager.java
deleted file mode 100644
index ac952b3e766..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLElementAxisManager.java
+++ /dev/null
@@ -1,60 +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.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.emf.nattable.manager.axis.EObjectAxisManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-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

-	}

-	

-	@Override

-	public boolean canPaste(final IPasteConfiguration configuration) {

-		boolean result = super.canPaste(configuration);

-		if(result){

-			final EStructuralFeature feature = ((PasteEObjectConfiguration)configuration).getPasteElementContainementFeature();

-			//FIXME

-			

-		}

-		return result;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLFeatureAxisManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLFeatureAxisManager.java
deleted file mode 100644
index f8d6c2cd0ce..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLStereotypePropertyAxisManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLStereotypePropertyAxisManager.java
deleted file mode 100644
index 24e13cbf5e7..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/axis/UMLStereotypePropertyAxisManager.java
+++ /dev/null
@@ -1,298 +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) {

-		return new UMLStereotypeRestrictedPropertyContentProvider(this, isRestricted);

-	}

-

-	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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java
deleted file mode 100644
index 3a1e10bc640..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.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.uml.nattable.manager.cell;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.nebula.widgets.nattable.edit.editor.ICellEditor;

-import org.eclipse.papyrus.infra.emf.utils.EMFStringValueConverter;

-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

-//FIXME : only used in SysML.

-//FIXME : remove it?

-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;

-	}

-

-	@Override

-	public ICommand getSetStringValueCommand(EditingDomain domain, Table table, EObject tableContext, Object obj1, Object obj2, String newValue, EMFStringValueConverter valueSolver) {

-		return null;

-	}

-

-	

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/UMLFeatureCellManager.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/UMLFeatureCellManager.java
deleted file mode 100644
index 6b40b4273da..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/UMLFeatureCellManager.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://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.Collection;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.runtime.Assert;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.util.Enumerator;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EEnum;

-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.CompositeCommand;

-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.osgi.util.NLS;

-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFFeatureValueCellManager;

-import org.eclipse.papyrus.infra.emf.utils.EMFStringValueConverter;

-import org.eclipse.papyrus.infra.emf.utils.MultiConvertedValueContainer;

-import org.eclipse.papyrus.infra.emf.utils.ConvertedValueContainer;

-import org.eclipse.papyrus.infra.emf.utils.StringValueConverterStatus;

-import org.eclipse.papyrus.infra.nattable.model.nattable.EObjectCell;

-import org.eclipse.papyrus.infra.nattable.model.nattable.ICell;

-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.PasteProblem;

-import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

-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.Activator;

-import org.eclipse.papyrus.uml.nattable.utils.UMLTableUtils;

-import org.eclipse.papyrus.uml.tools.utils.EnumerationUtil;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-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 EClassifier eType = steApFeature.getEType();

-					if(eType instanceof EDataType && newValue == null) {

-						return null;

-					}

-

-					final AbstractEditCommandRequest request = new SetRequest((TransactionalEditingDomain)domain, stereotypeApplication, steApFeature, newValue);

-					final IElementEditService provider = ElementEditServiceUtils.getCommandProvider(stereotypeApplication);

-					final ICommand editCommand = provider.getEditCommand(request);

-					System.out.println(editCommand.canExecute());

-					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;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.nattable.manager.cell.EMFFeatureValueCellManager#getSetStringValueCommand(org.eclipse.emf.edit.domain.EditingDomain,

-	 *      EObject, java.lang.Object, java.lang.Object, java.lang.String, java.util.Map)

-	 * 

-	 * @param domain

-	 * @param tableContext

-	 * @param obj1

-	 * @param obj2

-	 * @param newValue

-	 * @param stringResolvers

-	 * @return

-	 */

-	@Override

-	public ICommand getSetStringValueCommand(final EditingDomain domain, final Table table, EObject tableContext, final Object obj1, final Object obj2, final String newValue, final EMFStringValueConverter valueSolver) {

-		final Object editedObject;

-		final Object editedFeature;

-		final List<EObject> objects = organizeObject(obj1, obj2);

-		final List<Object> umlObjects = organizeUMLObject(obj1, obj2);

-		boolean stereotypePropertyCase = false;

-		if(objects.size() == 2) {

-			editedObject = objects.get(0);

-			editedFeature = objects.get(1);

-		} else {

-			Assert.isTrue(umlObjects.size() == 2);

-			editedObject = umlObjects.get(0);

-			editedFeature = umlObjects.get(1);

-			stereotypePropertyCase = true;

-		}

-		final TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)domain;

-

-		ConvertedValueContainer<?> solvedValue;

-		if(stereotypePropertyCase) {

-			final Property prop;

-			final List<Stereotype> stereotypes;

-			//FIXME faire en sorte de ne pas résoudre plusieurs fois la propriété de stéréotype

-			Assert.isTrue(editedFeature instanceof String);

-			final Element el = (Element)umlObjects.get(0);

-			final String id = (String)umlObjects.get(1);

-			switch(UMLTableUtils.getAppliedSteretoypesWithThisProperty(el, id).size()) {

-			case 1:

-				stereotypes = UMLTableUtils.getAppliedSteretoypesWithThisProperty(((Element)editedObject), (String)editedFeature);

-				prop = UMLTableUtils.getRealStereotypeProperty(el, id);

-				break;

-			default:

-				prop = null;

-				stereotypes = Collections.emptyList();

-			}

-			solvedValue = valueSolver.deduceValueFromString(prop, newValue);

-

-			if(prop.getType() instanceof EnumerationLiteral) {

-				final EObject stereotypeApplication = el.getStereotypeApplication(stereotypes.get(0));

-				final EStructuralFeature steApFeature = stereotypeApplication.eClass().getEStructuralFeature(prop.getName());

-				EEnum eenum = (EEnum)steApFeature.getEType();

-				Object value = solvedValue.getConvertedValue();

-

-				if(value instanceof Collection<?>) {

-					final Collection<Enumerator> enumeratorList = EnumerationUtil.adaptToEnumeratorList(eenum, (Collection<?>)value);

-					if(enumeratorList.size() == ((Collection<?>)value).size()) {

-						solvedValue = new MultiConvertedValueContainer<Enumerator>(enumeratorList, solvedValue.getStatus());

-					} else {

-						IStatus status = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, "Some enumeration literal can't be resolved", Collections.<String> emptyList());

-						solvedValue = new ConvertedValueContainer<Object>(enumeratorList, status);

-					}

-				} else if(value instanceof EnumerationLiteral) {

-					if(value != null) {

-						final Enumerator enumerator = EnumerationUtil.adaptToEnumerator(eenum, (EnumerationLiteral)value);

-						if(enumerator != null) {

-							solvedValue = new ConvertedValueContainer<Enumerator>(enumerator, solvedValue.getStatus());

-						} else {

-							IStatus status = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind("The enumeration literal represented by {0} can be resolved", newValue), Collections.singletonList(newValue));

-							solvedValue = new ConvertedValueContainer<Object>(null, status);

-						}

-					}

-				}

-			}

-		} else {

-			solvedValue = valueSolver.deduceValueFromString(editedFeature, newValue);

-		}

-

-

-

-

-		final CompositeCommand cmd = new CompositeCommand("Set Value As String Command");

-		Object value = solvedValue.getConvertedValue();

-		Command setValueCommand = getSetValueCommand(domain, obj1, obj2, value);

-		if(setValueCommand != null) {

-			cmd.add(new EMFtoGMFCommandWrapper(setValueCommand));

-		}

-		final IStatus status = solvedValue.getStatus();

-		if(!status.isOK()) {

-			if(status.matches(IStatus.ERROR)) {

-				cmd.add(new EMFtoGMFCommandWrapper(getCreatePasteErrorCellCommand(editingDomain, table, (EObject)obj1, (EObject)obj2, newValue, status)));

-			} else {

-				throw new UnsupportedOperationException("The status {0} is not managed");

-			}

-		}

-		if(cmd.isEmpty()) {

-			return null;

-		}

-		return cmd;

-	}

-

-	protected Command getCreatePasteErrorCellCommand(final TransactionalEditingDomain domain, final Table table, final EObject rowElement, final EObject columnElement, final String pastedText, final IStatus status) {

-		final CompositeCommand command = new CompositeCommand("Create Cell For Error Command");

-		EObjectCell cell = null;

-		for(final ICell current : table.getCells()) {

-			if(current.getRowElement() == rowElement && current.getColumnElement() == columnElement && current instanceof EObjectCell) {

-				cell = (EObjectCell)current;

-				break;

-			}

-		}

-		//FIXME : find existing cell

-

-		if(cell == null) {

-			cell = NattableFactory.eINSTANCE.createEObjectCell();

-			SetRequest setRequest = new SetRequest(domain, table, NattablePackage.eINSTANCE.getTable_Cells(), cell);

-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(table);

-			command.add(provider.getEditCommand(setRequest));

-

-			provider = ElementEditServiceUtils.getCommandProvider(cell);

-

-			setRequest = new SetRequest(domain, cell, NattablePackage.eINSTANCE.getEObjectCell_RowElement(), rowElement);

-			command.add(provider.getEditCommand(setRequest));

-

-			setRequest = new SetRequest(domain, cell, NattablePackage.eINSTANCE.getEObjectCell_ColumnElement(), columnElement);

-			command.add(provider.getEditCommand(setRequest));

-		}

-

-		final PasteProblem problem = NattableFactory.eINSTANCE.createPasteProblem();

-		problem.setName("Paste Problem");

-		problem.setDescription(status.getMessage());

-		problem.setPastedText(pastedText);

-

-		if(status instanceof StringValueConverterStatus) {

-			problem.getUnresolvedText().addAll(((StringValueConverterStatus)status).getUnresolvedString());

-		}

-

-		SetRequest setProblemRequest = new SetRequest(domain, cell, NattablePackage.eINSTANCE.getICell_Problems(), problem);

-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(cell);

-		command.add(provider.getEditCommand(setProblemRequest));

-		return new GMFtoEMFCommandWrapper(command);

-	}

-

-

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/Messages.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/Messages.java
deleted file mode 100644
index ad29531cc4c..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/messages.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/messages/messages.properties
deleted file mode 100644
index 2e5815723a9..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/AbstractUMLNattableCellLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/AbstractUMLNattableCellLabelProvider.java
deleted file mode 100644
index 9ac67e14962..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyCellLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyCellLabelProvider.java
deleted file mode 100644
index 9b04c5fde1e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyCellLabelProvider.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.uml.nattable.provider;

-

-import java.util.List;

-

-import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderCellContextElementWrapper;

-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 ILabelProviderCellContextElementWrapper) {

-			final ILabelProviderCellContextElementWrapper cellWrapperContextElement = (ILabelProviderCellContextElementWrapper)element;

-

-			final IConfigRegistry registry = cellWrapperContextElement.getConfigRegistry();

-

-			//now it is possible that we accepts the element

-			final Object rowObject = getRowObject(cellWrapperContextElement, registry);

-			final Object columnObject = getColumnObject(cellWrapperContextElement, 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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java
deleted file mode 100644
index 9affd0bb8a5..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://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.nattableaxis.FeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;

-import org.eclipse.papyrus.infra.widgets.Activator;

-import org.eclipse.papyrus.uml.nattable.messages.Messages;

-import org.eclipse.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 ILabelProviderContextElementWrapper) {

-			final Object value = ((ILabelProviderContextElementWrapper)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 = ((ILabelProviderContextElementWrapper)element).getConfigRegistry();

-		String alias = ""; //$NON-NLS-1$

-		if(element instanceof LabelProviderCellContextElementWrapper) {

-			INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-			LabelStack labels = ((LabelProviderCellContextElementWrapper)element).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 ""; //$NON-NLS-1$

-		}

-		final Object value = ((ILabelProviderContextElementWrapper)element).getObject();

-		if(value instanceof FeatureAxis) {

-			alias = ((FeatureAxis)value).getAlias();

-		}

-		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) {

-			String nameToDisplay = prop.getName();

-			if(alias != null && !alias.equals("")) { //$NON-NLS-1$

-				nameToDisplay = alias;

-			}

-			return getText((FeatureLabelProviderConfiguration)conf, configRegistry, nameToDisplay, 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 = ((ILabelProviderContextElementWrapper)element).getObject();

-		final IConfigRegistry configRegistry = ((ILabelProviderContextElementWrapper)element).getConfigRegistry();

-		final INattableModelManager modelManager = (INattableModelManager)getAxisContentProvider(configRegistry);

-		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElementWrapper) {

-			INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-			LabelStack labels = ((LabelProviderCellContextElementWrapper)element).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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLFeatureRestrictedContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLFeatureRestrictedContentProvider.java
deleted file mode 100644
index f7b560da7c7..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLFeatureRestrictedContentProvider.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://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.emf.ecore.EcorePackage;

-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.uml.nattable.manager.axis.UMLFeatureAxisManager;

-import org.eclipse.papyrus.uml.nattable.provider.tmp.AbstractRestrictedContentProvider;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * 

- * @author vl222926

- * 

- */

-//FIXME : we should create or extends an EMF-content provider

-public class UMLFeatureRestrictedContentProvider extends AbstractRestrictedContentProvider {

-

-	/** the uml feature axis manager */

-	private final UMLFeatureAxisManager axisManager;

-

-

-	/**

-	 * 

-	 * Constructor.

-	 * boolean fields are initialized to false

-	 * 

-	 * @param axisManager

-	 *        the axis manager used by this content provider

-	 */

-	public UMLFeatureRestrictedContentProvider(final UMLFeatureAxisManager axisManager) {

-		this(axisManager, false);

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 * Inits {@link #ignoreInheritedFeatures} to true

-	 * others boolean fields are initialized to false

-	 * 

-	 * @param axisManager

-	 *        the axis manager used by this content provider

-	 * @param isRestricted

-	 *        if <code>true</code> we return only elements accessible from the current contents of the table

-	 */

-	public UMLFeatureRestrictedContentProvider(UMLFeatureAxisManager axisManager, boolean isRestricted) {

-		super(isRestricted);

-		this.axisManager = axisManager;

-		setIgnoreInheritedElements(false);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object)

-	 * 

-	 * @param inputElement

-	 * @return

-	 */

-	public Object[] getElements(Object inputElement) {

-		final AbstractAxisProvider secondAxisProvider = getSecondAxisProvider();

-		final List<?> elements = axisManager.getTableManager().getElementsList(secondAxisProvider);

-		if(isRestricted() && elements.isEmpty()) {//we must returns nothing when the table is empty

-			return new Object[0];

-		} else {

-			return this.axisManager.getAllPossibleAxis().toArray();

-		}

-	}

-

-	/**

-	 * 

-	 * @return

-	 */

-	protected AbstractAxisProvider getManagedAxisProvider() {

-		return this.axisManager.getRepresentedContentProvider();

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the other axis provider

-	 */

-	protected AbstractAxisProvider getSecondAxisProvider() {//FIXME : move me in an upper class

-		AbstractAxisProvider secondAxisProvider = this.axisManager.getTableManager().getVerticalAxisProvider();

-		if(secondAxisProvider == this.axisManager) {

-			secondAxisProvider = this.axisManager.getTableManager().getHorizontalAxisProvider();

-		}

-		return secondAxisProvider;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)

-	 * 

-	 * @param parentElement

-	 * @return

-	 */

-	public Object[] getChildren(Object parentElement) {

-		List<Object> asList = new ArrayList<Object>();

-		if(parentElement instanceof EClass) {

-			EClass eClass = (EClass)parentElement;

-			if(isIgnoringInheritedElements()) {

-				asList.addAll(eClass.getEStructuralFeatures());

-			} else {

-				asList.addAll(eClass.getEAllStructuralFeatures());

-			}

-			return asList.toArray();

-		} else if(parentElement instanceof EPackage) {

-			EPackage ePackage = (EPackage)parentElement;

-			Collection<EClassifier> eClassifiers = null;

-			if(isRestricted()) {

-				eClassifiers = new HashSet<EClassifier>();

-				AbstractAxisProvider axisProvider = ((INattableModelManager)this.axisManager.getTableManager()).getHorizontalAxisProvider();

-				if(axisProvider == this.axisManager.getRepresentedContentProvider()) {

-					axisProvider = ((INattableModelManager)this.axisManager.getTableManager()).getVerticalAxisProvider();

-				}

-				List<Object> elementsList = this.axisManager.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();

-			}

-			eClassifiers.remove(EcorePackage.eINSTANCE.getEModelElement());

-

-			for(EClassifier eClassifier : eClassifiers) {

-				if(eClassifier instanceof EClass && eClassifier != EcorePackage.eINSTANCE.getEModelElement()) {

-					asList.add(eClassifier);//we returns EClass with no EStructural feature too

-				}

-			}

-			return asList.toArray();

-		}

-		return null;

-

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	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;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	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;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider#getElements()

-	 * 

-	 * @return

-	 */

-	public Object[] getElements() {

-		return getElements(null);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider#isValidValue(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 *         <code>true</code> if the element is a UML Feature

-	 */

-	public boolean isValidValue(Object element) {

-		return element instanceof EStructuralFeature && UMLPackage.eINSTANCE.eContents().contains(((EObject)element).eContainer());

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLStereotypeRestrictedPropertyContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLStereotypeRestrictedPropertyContentProvider.java
deleted file mode 100644
index f2229eace49..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLStereotypeRestrictedPropertyContentProvider.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://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.Arrays;

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;

-import org.eclipse.papyrus.infra.nattable.provider.tmp.IRestrictedContentProvider;

-import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

-import org.eclipse.papyrus.uml.nattable.manager.axis.UMLStereotypePropertyAxisManager;

-import org.eclipse.papyrus.uml.nattable.provider.tmp.UMLStereotypePropertyContentProvider;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.ElementImport;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.PackageImport;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.ProfileApplication;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * Restricted Content Provider for the properties of Stereotypes

- * 

- * @author JC236769

- * 

- */

-//FIXME we maybe should use the AbstractRestrictedContentProvider

-//of extends a  generic uml content provider?

-public class UMLStereotypeRestrictedPropertyContentProvider extends UMLStereotypePropertyContentProvider implements IRestrictedContentProvider {

-

-	/**

-	 * we show the value according to the table content

-	 * if <code>true</code> -> the properties of stereotypes which are not applied on elements visible on the table aren't returned

-	 */

-	private boolean isRestricted;

-

-	/**

-	 * the stereotype axis manager

-	 */

-	private UMLStereotypePropertyAxisManager umlStereotypePropertyManager;

-

-	/**

-	 * the list of the allowed contents (Profile and Stereotype) when we are in restricted mode

-	 */

-	private Collection<Element> restrictedElements;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param umlStereotypePropertyManager

-	 *        the UML stereotype axis manager

-	 * @param isRestricted

-	 *        restrict mode

-	 */

-	public UMLStereotypeRestrictedPropertyContentProvider(final UMLStereotypePropertyAxisManager umlStereotypePropertyManager, final boolean isRestricted) {

-		super();

-		setIgnoreBaseProperty(true);

-		//		setIgnoreInheritedElements(true);

-		this.isRestricted = isRestricted;

-		this.umlStereotypePropertyManager = umlStereotypePropertyManager;

-		init();

-	}

-

-	/**

-	 * inits the fields of the table

-	 */

-	protected void init() {

-		setProfiles(new ArrayList<Profile>(getAllAvailableProfiles()));

-		this.restrictedElements = calculusOfAllowedElements();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.tools.providers.UMLStereotypePropertyContentProvider#getElements()

-	 * 

-	 * @return

-	 */

-	@Override

-	public Object[] getElements() {

-		if(this.isRestricted) {

-			final AbstractAxisProvider secondAxisProvider = getOtherAxisProvider();

-			final List<?> elements = umlStereotypePropertyManager.getTableManager().getElementsList(secondAxisProvider);

-			if(elements.isEmpty()) {

-				return new Object[0];

-			} else {

-				List<Object> values = Arrays.asList(super.getElements());

-				values = new ArrayList<Object>(values);

-				values.retainAll(restrictedElements);

-				return values.toArray();

-			}

-		} else {

-			return super.getElements();

-		}

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the list of the allowed profiles and stereotypes

-	 */

-	protected Collection<Element> calculusOfAllowedElements() {

-		final Collection<Element> restrictedElements = new HashSet<Element>();

-		//we are restricted so we show only the elements available for the current contents of the table

-		final Set<Stereotype> restrictedStereotypes = new HashSet<Stereotype>();

-		final AbstractAxisProvider otherAxisProvider = getOtherAxisProvider();

-		final List<Object> elementsList = this.umlStereotypePropertyManager.getTableManager().getElementsList(otherAxisProvider);

-		for(Object object : elementsList) {

-			Object representedElement = AxisUtils.getRepresentedElement(object);

-			if(representedElement instanceof Element) {

-				restrictedStereotypes.addAll(((Element)representedElement).getAppliedStereotypes());

-			}

-		}

-

-		final Collection<Namespace> stereotypesNamespace = new HashSet<Namespace>();

-		stereotypesNamespace.addAll(restrictedStereotypes);

-		for(Stereotype stereotype : restrictedStereotypes) {

-			stereotypesNamespace.addAll(stereotype.allNamespaces());

-		}

-

-		restrictedElements.addAll(restrictedStereotypes);

-		restrictedElements.addAll(stereotypesNamespace);

-		return restrictedElements;

-	}

-

-	protected Profile getTopRootProfile(final Profile profile, final Collection<Profile> availableProfiles) {

-		EObject container = profile.eContainer();

-		Profile topProfile = profile;

-		while(container != null) {

-			if(container instanceof Profile) {

-				if(availableProfiles.contains(container)) {

-					topProfile = (Profile)container;

-				}

-			}

-			container = container.eContainer();

-		}

-

-		return topProfile;

-	}

-

-	/**

-	 * 

-	 * @return

-	 *         the list of all the profiles applied somewhere in the model

-	 */

-	protected Set<Profile> getAllAvailableProfiles() {

-		final Set<Profile> coll = new HashSet<Profile>();

-		final EObject context = umlStereotypePropertyManager.getTableManager().getTableContext();

-		if(context instanceof Element) {

-			final EObject container = EcoreUtil.getRootContainer(context);

-			if(container instanceof Package) {

-				//get the list of all profile applied in the model

-				final Collection<Profile> allAppliedProfiles = getAppliedProfilesInWholePackage((Package)container);

-

-

-				for(Profile profile : allAppliedProfiles) {

-					coll.add(getTopRootProfile(profile, allAppliedProfiles));

-				}

-

-

-				//				//				coll.addAll(allAppliedProfiles);

-				//				//for each of these profiles, we look for the top profile which is applied in the model

-				//				//for example, if only SysML::Blocks is applied, we don't want to display SysML as root profile, but only SysML::Blocks 

-				//				for(final Profile current : allAppliedProfiles) {

-				//					Profile topPackage = null;

-				//					for(final Package pack : current.allOwningPackages()) {

-				//						if(pack instanceof Profile && allAppliedProfiles.contains(pack)) {

-				//							topPackage = (Profile)pack;

-				//							break;

-				//						}

-				//					}

-				//					if(topPackage == null) {

-				//						topPackage = current;

-				//					}

-				//					coll.add(topPackage);

-				//				}

-			}

-		}

-		return coll;

-	}

-

-

-	/**

-	 * 

-	 * @param pack

-	 *        a package

-	 * @return

-	 *         a collection with all profiles applied in the package and its subpackage

-	 *         //FIXME : should be moved in an upper plugin

-	 */

-	private static final Collection<Profile> getAppliedProfilesInWholePackage(final Package pack) {

-		final Collection<Profile> appliedProfiles = new HashSet<Profile>();

-		final List<ProfileApplication> result = getInstancesFilteredByType(pack, ProfileApplication.class, null);

-		for(ProfileApplication profileApplication : result) {

-			if(EcoreUtil.getRootContainer((((ProfileApplication)profileApplication).getApplyingPackage())) == pack) {//restriction to avoid to find profile application from an imported model

-				appliedProfiles.add(profileApplication.getAppliedProfile());

-			}

-		}

-		return appliedProfiles;

-	}

-	

-	/**

-	 * Retrieve an list of all instances in the model that are instances of

-	 * the java.lang.Class metaType or with a stereotype applied

-	 * 

-	 * @param <T>

-	 * 

-	 * @param metaType

-	 *        selected classes

-	 * @param model

-	 *        to check

-	 * @param appliedStereotype

-	 *        may be null, metatype is ignored if not null

-	 * @return a list containing the selected instances

-	 */

-	//FIXME : replace me by ElementUtils.getInstance...

-	@SuppressWarnings("unchecked")

-	private static final <T extends EObject> List<T> getInstancesFilteredByType(final Package topPackage, final java.lang.Class<T> metaType, final Stereotype appliedStereotype) {

-		// retrieve parent element

-		// Package topPackage = Util.topPackage(element);

-		// Assert.isNotNull(topPackage,

-		// "Top package should not be null for element " + element);

-		Iterator<EObject> iter = topPackage.eAllContents();

-		List<T> filteredElements = new ArrayList<T>();

-

-		while(iter.hasNext()) {

-			EObject currentElt = iter.next();

-

-			// If currentElt is an ElementImport, it is replaced by the imported

-			// Element.

-			if(currentElt instanceof ElementImport) {

-				ElementImport elementImport = (ElementImport)currentElt;

-				currentElt = elementImport.getImportedElement();

-			}

-

-			/* package imports treatment */

-			else if(currentElt instanceof PackageImport) {

-				Iterator<EObject> piIter = ((PackageImport)currentElt).getImportedPackage().eAllContents();

-				while(piIter.hasNext()) {

-					EObject piCurrentElt = piIter.next();

-					if(piCurrentElt instanceof Element) {

-						if(appliedStereotype != null) {

-

-							Iterator<Stereotype> appStIter = ((Element)piCurrentElt).getAppliedStereotypes().iterator();

-							while(appStIter.hasNext()) {

-								Stereotype currentSt = (Stereotype)appStIter.next();

-

-								if(currentSt.conformsTo(appliedStereotype)) {

-									filteredElements.add((T)piCurrentElt);

-								}

-							}

-

-						} else { // if (appliedStereotype == null)

-							if(metaType.isInstance(piCurrentElt)) {

-								filteredElements.add((T)piCurrentElt);

-							}

-

-							/** add imported meta elements */

-							else if(piCurrentElt instanceof ElementImport) {

-								Iterator<EObject> eIter = ((ElementImport)piCurrentElt).getImportedElement().eAllContents();

-								while(eIter.hasNext()) {

-									EObject currentEIelt = eIter.next();

-									if(metaType.isInstance(currentEIelt))

-										filteredElements.add((T)currentEIelt);

-								}

-							}

-						}

-					}

-

-				}

-			}

-

-			// Filtering elements

-			if(currentElt instanceof Element) {

-

-				if(appliedStereotype != null) {

-

-					Iterator<Stereotype> appStIter = ((Element)currentElt).getAppliedStereotypes().iterator();

-					while(appStIter.hasNext()) {

-						Stereotype currentSt = (Stereotype)appStIter.next();

-

-						if(currentSt.conformsTo(appliedStereotype)) {

-							filteredElements.add((T)currentElt);

-						}

-					}

-

-				} else { // if (appliedStereotype == null)

-					if(metaType.isInstance(currentElt)) {

-						filteredElements.add((T)currentElt);

-					}

-

-					/** add imported meta elements */

-					else if(currentElt instanceof ElementImport) {

-						Iterator<EObject> eIter = ((ElementImport)currentElt).getImportedElement().eAllContents();

-						while(eIter.hasNext()) {

-							EObject currentEIelt = eIter.next();

-							if(metaType.isInstance(currentEIelt))

-								filteredElements.add((T)currentEIelt);

-						}

-					}

-				}

-			}

-		}

-

-		return filteredElements;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#setRestriction(boolean)

-	 * 

-	 * @param isRestricted

-	 *        Setter for {@link #isRestricted}

-	 */

-	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 Package || parentElement instanceof Stereotype)) {

-			return new Object[0];

-		}

-		final Object[] children = super.getChildren(parentElement);

-		if(!isRestricted || !(parentElement instanceof Package)) {

-			return children;

-		} else {

-			//we are restricted so we show only the elements available for the current contents of the table

-			final Collection<Object> returnedValues = new ArrayList<Object>();

-			returnedValues.addAll(Arrays.asList(children));

-			returnedValues.retainAll(this.restrictedElements);

-			return returnedValues.toArray();

-		}

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.uml.tools.providers.UMLStereotypePropertyContentProvider#dispose()

-	 * 

-	 */

-	@Override

-	public void dispose() {

-		super.dispose();

-		this.umlStereotypePropertyManager = null;

-		this.restrictedElements.clear();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#isRestricted()

-	 * 

-	 * @return

-	 */

-	public boolean isRestricted() {

-		return isRestricted;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLUnlimitedNaturalLabelProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLUnlimitedNaturalLabelProvider.java
deleted file mode 100644
index eb5fe242f17..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLUnlimitedNaturalLabelProvider.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:

- *  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.papyrus.infra.nattable.utils.Constants;

-import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderCellContextElementWrapper;

-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 ILabelProviderCellContextElementWrapper) {

-			final ILabelProviderCellContextElementWrapper cellWrapperContext = ((ILabelProviderCellContextElementWrapper)element);

-			final IConfigRegistry registry = cellWrapperContext.getConfigRegistry();

-

-			//we do some quick test on the value

-			final Object value = cellWrapperContext.getObject();

-			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(cellWrapperContext, registry);

-			final Object columnObject = getColumnObject(cellWrapperContext, 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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/tmp/AbstractRestrictedContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/tmp/AbstractRestrictedContentProvider.java
deleted file mode 100644
index d1d62195355..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/tmp/AbstractRestrictedContentProvider.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:

- *  Juan Cadavid (CEA LIST) juan.cadavid@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.nattable.provider.tmp;

-

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.provider.tmp.IRestrictedContentProvider;

-

-/**

- * Abstract Implementation for {@link IRestrictedContentProvider}

- * 

- * @author JC236769

- * 

- */

-//FIXME must be deleted after the official extraplugins build and before Papyrus 0.10SR1

-public abstract class AbstractRestrictedContentProvider implements IRestrictedContentProvider {

-

-	/**

-	 * flag to indicate the useage of the restriction in the content provider

-	 */

-	private boolean isRestricted;

-

-	/**

-	 * if <code>false</code> the inherited features will be displayed

-	 */

-	private boolean ignoreInheritedFeatures;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param isRestricted

-	 */

-	public AbstractRestrictedContentProvider(final boolean isRestricted) {

-		this.isRestricted = isRestricted;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#setRestriction(boolean)

-	 * 

-	 * @param isRestricted

-	 */

-	public final void setRestriction(boolean isRestricted) {

-		this.isRestricted = isRestricted;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

-	 * 

-	 * @param viewer

-	 * @param oldInput

-	 * @param newInput

-	 */

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

-	 * 

-	 */

-	public void dispose() {

-

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.tmp.IInheritedElementContentProvider#setIgnoreInheritedElements(boolean)

-	 * 

-	 * @param ignoreInheritedElements

-	 */

-	public void setIgnoreInheritedElements(boolean ignoreInheritedElements) {

-		this.ignoreInheritedFeatures = ignoreInheritedElements;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.tmp.IInheritedElementContentProvider#isIgnoringInheritedElements()

-	 * 

-	 * @return

-	 */

-	public boolean isIgnoringInheritedElements() {

-		return this.ignoreInheritedFeatures;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IRestrictedContentProvider#isRestricted()

-	 * 

-	 * @return

-	 */

-	public boolean isRestricted() {

-		return this.isRestricted;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/tmp/UMLStereotypePropertyContentProvider.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/tmp/UMLStereotypePropertyContentProvider.java
deleted file mode 100644
index 1b4a3eef0ce..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/tmp/UMLStereotypePropertyContentProvider.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://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.tmp;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.common.util.TreeIterator;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.nattable.provider.tmp.IIgnoreStereotypeBasePropertyContentProvider;

-import org.eclipse.papyrus.infra.nattable.provider.tmp.IInheritedElementContentProvider;

-import org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider;

-import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-

-/**

- * 

- * This content providers is used to get the properties of stereotypes

- * 

- */

-//FIXME must be deleted after the official extraplugins build and before Papyrus 0.10SR1

-public class UMLStereotypePropertyContentProvider implements IHierarchicContentProvider, IInheritedElementContentProvider, IIgnoreStereotypeBasePropertyContentProvider {

-

-	/**

-	 * the profiles

-	 */

-	protected List<Profile> profiles;

-

-	/**

-	 * this boolean is used to know if we should returns the Property base_EXTENDED_METACLASS or not

-	 */

-	private boolean ignoreBaseProperty;

-

-

-	/**

-	 * if <code>true</code> we don't return the inherited properties

-	 */

-	private boolean ignoreInheritedProperties;

-

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param profiles

-	 *        the profiles to navigate

-	 * 

-	 *        the boolean fields are initialized to false

-	 */

-	public UMLStereotypePropertyContentProvider(final List<Profile> profiles) {

-		this.profiles = profiles;

-		this.ignoreBaseProperty = false;

-		this.ignoreInheritedProperties = false;

-	}

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 */

-	public UMLStereotypePropertyContentProvider() {

-		this(null);

-	}

-

-

-	/**

-	 * 

-	 * @return

-	 */

-	public Object[] getElements() {

-		return this.profiles.toArray();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object)

-	 * 

-	 * @param inputElement

-	 * @return

-	 */

-	public Object[] getElements(Object inputElement) {

-		return getElements();

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)

-	 * 

-	 * @param parentElement

-	 * @return

-	 */

-	public Object[] getChildren(Object parentElement) {

-		List<Object> children = new ArrayList<Object>();

-		if(hasChildren(parentElement)) {

-			if(parentElement instanceof Package) {

-				for(final EObject current : ((Package)parentElement).getOwnedMembers()) {

-					if(hasChildren(current)) {

-						children.add(current);

-					}

-				}

-			} else if(parentElement instanceof Stereotype) {

-				if(ignoreInheritedProperties) {

-					if(this.ignoreBaseProperty) {

-						children.addAll(StereotypeUtil.getStereotypePropertiesWithoutBaseProperties((Stereotype)parentElement));

-					} else {

-						children.addAll((((Stereotype)parentElement).getOwnedAttributes()));

-					}

-

-				} else {

-					if(this.ignoreBaseProperty) {

-						children.addAll(getAllStereotypePropertiesWithoutBaseProperties((Stereotype)parentElement));

-

-					} else {

-						children.addAll((((Stereotype)parentElement).getAllAttributes()));

-					}

-				}

-			}

-		}

-		return children.toArray();

-	}

-

-

-	/**

-	 * 

-	 * @param stereotype

-	 *        a stereotype

-	 * @return

-	 *         the list of the properties of this stereotype, excluding the properties of the extending metaclasses

-	 */

-	public static final List<Property> getAllStereotypePropertiesWithoutBaseProperties(final Stereotype stereotype) {

-		final List<Property> properties = new ArrayList<Property>();

-		for(Property property : stereotype.getAllAttributes()) {

-			if(StereotypeUtil.isValidStereotypeProperty(property)) {

-				properties.add(property);

-			}

-		}

-		return properties;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	public Object getParent(Object element) {

-		if(element instanceof EObject) {

-			return ((EObject)element).eContainer();

-		}

-		return null;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)

-	 * 

-	 * @param element

-	 * @return

-	 */

-	public boolean hasChildren(Object element) {

-		if(element instanceof Element) {

-			final TreeIterator<EObject> iter = ((EObject)element).eAllContents();

-			while(iter.hasNext()) {

-				if(isValidValue(iter.next())) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-

-	public void dispose() {

-		profiles.clear();

-	}

-

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.widgets.providers.IHierarchicContentProvider#isValidValue(java.lang.Object)

-	 * 

-	 * @param element

-	 *        an element

-	 * @return

-	 *         <code>true</code> if the element is a Property owned by a Stereotype

-	 */

-	public boolean isValidValue(Object element) {

-		if(element instanceof Element) {

-			boolean result = element instanceof Property && ((Element)element).eContainer() instanceof Stereotype;

-			if(result) {

-				return StereotypeUtil.isValidStereotypeProperty((Property)element);

-			}

-			return result;

-		}

-		return false;

-	}

-

-	/**

-	 * 

-	 * @param profiles

-	 *        the list of the profiles to navigate

-	 */

-	public void setProfiles(final List<Profile> profiles) {

-		this.profiles = profiles;

-	}

-

-	/**

-	 * Setter for {@link #ignoreBaseProperty}

-	 * 

-	 * @param ignoreBaseProperty

-	 */

-	public void setIgnoreBaseProperty(boolean ignoreBaseProperty) {

-		this.ignoreBaseProperty = ignoreBaseProperty;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.tmp.IInheritedElementContentProvider#setIgnoreInheritedElements(boolean)

-	 * 

-	 * @param ignoreInheritedElements

-	 */

-	public void setIgnoreInheritedElements(final boolean ignoreInheritedElements) {

-		this.ignoreInheritedProperties = ignoreInheritedElements;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.tmp.IInheritedElementContentProvider#isIgnoringInheritedElements()

-	 * 

-	 * @return

-	 */

-	public boolean isIgnoringInheritedElements() {

-		return this.ignoreInheritedProperties;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.provider.tmp.IIgnoreStereotypeBasePropertyContentProvider#isIgnoringBaseProperty()

-	 * 

-	 * @return

-	 */

-	public boolean isIgnoringBaseProperty() {

-		return this.ignoreBaseProperty;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/tester/IsUMLElementTester.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/tester/IsUMLElementTester.java
deleted file mode 100644
index d290392ca18..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/Constants.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/Constants.java
deleted file mode 100644
index 0efdd94d4a8..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/utils/UMLTableUtils.java
deleted file mode 100644
index 688adbb0442..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/validator/RealDataValidator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/validator/RealDataValidator.java
deleted file mode 100644
index 05643bc4a48..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/validator/UnlimitedNaturalDataValidator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/validator/UnlimitedNaturalDataValidator.java
deleted file mode 100644
index 776dd563d01..00000000000
--- a/sandbox/pasteInNewTable/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/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/widget/UMLDialogComboAction.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/widget/UMLDialogComboAction.java
deleted file mode 100644
index 376fde6881d..00000000000
--- a/sandbox/pasteInNewTable/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;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/.classpath b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/.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/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/.project b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/.project
deleted file mode 100644
index 41cb67dc32e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.tools.utils</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>com.ibm.etools.common.migration.MigrationBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<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/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/.settings/org.eclipse.jdt.core.prefs b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c20d04158e3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Aug 26 16:57:01 CEST 2008

-eclipse.preferences.version=1

-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/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF
deleted file mode 100644
index 022aac4afed..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.uml2.uml,

- org.eclipse.jface;bundle-version="3.4.1",

- org.eclipse.emf.transaction;bundle-version="1.2.1",

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.emf;bundle-version="0.10.1",

- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.core;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.1",

- org.eclipse.ui.workbench

-Export-Package: org.eclipse.papyrus.uml.tools.utils

-Bundle-Vendor: %pluginProvider

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.10.1.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.tools.utils.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.tools.utils;singleton:=tr

- ue

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/about.html b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/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/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/build.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/build.properties
deleted file mode 100644
index 98f3821699b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#

-#Mon Sep 12 09:30:24 CEST 2011

-bin.includes=META-INF/,.,plugin.properties,about.html

-output..=bin/

-src.includes = about.html

-source..=src/

-bin..=bin/

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/plugin.properties b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/plugin.properties
deleted file mode 100644
index 7289324c408..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################

-# Copyright (c) 2008 CEA LIST.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation

-################################################################################

-pluginName=Papyrus UML Utils (Incubation)

-pluginProvider=Eclipse Modeling Project

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/Activator.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/Activator.java
deleted file mode 100644
index c71297b931b..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/Activator.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation
- *  
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle.
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	/**
-	 * 
-	 */
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.tools.utils";
-
-	// The shared instance
-	/**
-	 * 
-	 */
-	private static Activator plugin;
-
-	// Resource bundle.
-	/**
-	 * 
-	 */
-	private ResourceBundle resourceBundle;
-	
-	public static LogHelper log;
-
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("com.cea.papyrus.umlutils.PluginManagerResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	/**
-	 * 
-	 * 
-	 * @param context
-	 * 
-	 * @throws Exception
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		log = new LogHelper(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	/**
-	 * 
-	 * 
-	 * @param context
-	 * 
-	 * @throws Exception
-	 */
-	@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;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not found.
-	 * 
-	 * @param key
-	 * 
-	 * @return
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = Activator.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,.
-	 * 
-	 * @return
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-
-	/**
-	 * Logs a warning message in the plugin log
-	 * 
-	 * @param message
-	 *        the message to log
-	 */
-	public static void logWarning(String message) {
-		getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, message));
-	}
-
-	/**
-	 * Logs an error message in the plugin log
-	 * 
-	 * @param message
-	 *        the message to log
-	 */
-	public static void logError(String message) {
-		getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, message));
-	}
-
-	/**
-	 * Logs an information message in the plugin log
-	 * 
-	 * @param message
-	 *        the message to log
-	 */
-	public static void logInfo(String message) {
-		getDefault().getLog().log(new Status(IStatus.INFO, Activator.PLUGIN_ID, message));
-	}
-
-	/**
-	 * Logs an error message in the plugin log
-	 * 
-	 * @param exception
-	 *        the exception to log
-	 */
-	public static void logException(Exception exception) {
-		getDefault().getLog().log(
-				new Status(IStatus.ERROR, Activator.PLUGIN_ID, exception.getLocalizedMessage(), exception));
-	}
-}
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ActivityUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ActivityUtil.java
deleted file mode 100644
index ef4bf5e1620..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ActivityUtil.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Iterator;

-

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.ActivityEdge;

-import org.eclipse.uml2.uml.ActivityNode;

-import org.eclipse.uml2.uml.ControlFlow;

-import org.eclipse.uml2.uml.InitialNode;

-

-/**

- * This class encapsulates an <code>org.eclipse.uml2.uml.Activity</code><BR>

- */

-

-public class ActivityUtil {

-

-	/**

-	 * Returns the uml2Activity's initial node. We consider that there is at most one initial node

-	 * in an activity.

-	 * 

-	 * @param uml2Activity

-	 *        investigated

-	 * @return the initial node of uml2Activity, null otherwise.

-	 */

-	// @unused

-	public static InitialNode getInitialNode(Activity uml2Activity) {

-		Iterator<ActivityNode> nodesIter = uml2Activity.getNodes().iterator();

-		while(nodesIter.hasNext()) {

-			ActivityNode currentNode = nodesIter.next();

-			if(currentNode instanceof InitialNode)

-				return (InitialNode)currentNode;

-		}

-		return null;

-	}

-

-	/**

-	 * Returns the activity node that is connected to uml2ActivityNode by a control flow. We

-	 * consider that there is at most one outgoing control flow from an activity node (first one

-	 * found is returned).

-	 * 

-	 * @param uml2ActivityNode

-	 *        origin node

-	 * @return next node of uml2ActivityNode, null otherwise.

-	 */

-	// @unused

-	public static ActivityNode getNextNode(ActivityNode uml2ActivityNode) {

-		Iterator<ActivityEdge> edgeIter = uml2ActivityNode.getOutgoings().iterator();

-		while(edgeIter.hasNext()) {

-			ActivityEdge currentEdge = edgeIter.next();

-			if(currentEdge instanceof ControlFlow)

-				return currentEdge.getTarget();

-		}

-		return null;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/CollaborationUseUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/CollaborationUseUtil.java
deleted file mode 100644
index 3f256a7d23c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/CollaborationUseUtil.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.tools.utils;

-

-import org.eclipse.uml2.uml.CollaborationUse;

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.CollaborationUse</code><BR>

- */

-public class CollaborationUseUtil {

-

-	public final static String UNDEFINED_TYPE_NAME = "<Undefined>";

-

-	/**

-	 * return the full label of the CollaborationUse, given UML2 specification.

-	 * 

-	 * @return the string corresponding to the label of the CollaborationUse

-	 */

-	public static String getLabel(CollaborationUse collaborationUse) {

-		StringBuffer buffer = new StringBuffer();

-		// visibility

-		buffer.append(" ");

-		buffer.append(NamedElementUtil.getVisibilityAsSign(collaborationUse));

-

-		// name

-		buffer.append(" ");

-		buffer.append(collaborationUse.getName());

-

-		// type

-		if(collaborationUse.getType() != null) {

-			buffer.append(": " + collaborationUse.getType().getName());

-		} else {

-			buffer.append(": " + UNDEFINED_TYPE_NAME);

-		}

-

-		return buffer.toString();

-	}

-

-	/**

-	 * return the custom label of the CollaborationUse, given UML2 specification and a custom style.

-	 * 

-	 * @param style

-	 *        the integer representing the style of the label

-	 * 

-	 * @return the string corresponding to the label of the CollaborationUse

-	 */

-	public static String getCustomLabel(CollaborationUse collaborationUse, int style) {

-		StringBuffer buffer = new StringBuffer();

-		// visibility

-

-		buffer.append(" ");

-		if((style & ICustomAppearence.DISP_VISIBILITY) != 0) {

-			buffer.append(NamedElementUtil.getVisibilityAsSign(collaborationUse));

-		}

-

-		// name

-		if((style & ICustomAppearence.DISP_NAME) != 0) {

-			buffer.append(" ");

-			buffer.append(collaborationUse.getName());

-		}

-

-		if((style & ICustomAppearence.DISP_TYPE) != 0) {

-			// type

-			if(collaborationUse.getType() != null) {

-				buffer.append(": " + collaborationUse.getType().getName());

-			} else {

-				buffer.append(": " + UNDEFINED_TYPE_NAME);

-			}

-		}

-

-		return buffer.toString();

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ControlFlowUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ControlFlowUtil.java
deleted file mode 100644
index 786a3eea939..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ControlFlowUtil.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:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.ActivityNode;

-import org.eclipse.uml2.uml.ControlFlow;

-import org.eclipse.uml2.uml.InitialNode;

-import org.eclipse.uml2.uml.ObjectFlow;

-

-

-/**

- * Utility class for {@link ObjectFlow}

- */

-public class ControlFlowUtil {

-	

-	/**

-	 * Check condition on control flows

-	 * @param container container of the object flow

-	 * @param linkInstance object flow itself

-	 * @param source 

-	 * @param target

-	 * @return

-	 */

-	public static boolean canExistControlFlow(Activity container, ControlFlow linkInstance, ActivityNode source, ActivityNode target) {

-		try {

-			if(target instanceof InitialNode) {

-				return false;

-			}

-			return true;

-		} catch (Exception e) {

-			Activator.log.error(e);

-			return false;

-		}

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/DataTypeUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/DataTypeUtil.java
deleted file mode 100644
index 1452b39bdec..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/DataTypeUtil.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) - Initial API and implementation

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.util.UMLUtil;

-

-

-/**

- * this class contains util methods about UML DataType

- *

- */

-public class DataTypeUtil {

-

-	/**

-	 * test if the eclass is a definition of a dataType

-	 * @param eclass the eclass that will be tested

-	 * @return true if this is a definition of a DataType else false

-	 */

-	public static boolean isDataTypeDefinition(EClass eclass){

-		if(eclass.getEAnnotations().size() > 0) {

-			UMLPackage.eINSTANCE.getNsURI();

-			EAnnotation eAnnotation = eclass.getEAnnotation(UMLUtil.UML2_UML_PACKAGE_2_0_NS_URI);

-			if(eAnnotation!=null) {

-				if((eAnnotation.getReferences().get(0) instanceof org.eclipse.uml2.uml.DataType)) {

-					return true;

-				}

-			}

-

-		}

-		return false;

-

-	}

-}
\ No newline at end of file
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ElementUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ElementUtil.java
deleted file mode 100644
index f2d17196218..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ElementUtil.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *  
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EClass;
-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.util.EcoreUtil;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.ElementImport;
-import org.eclipse.uml2.uml.Image;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.PackageImport;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.resource.UMLResource;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-public class ElementUtil {
-
-
-	/**
-	 * Check if the StereotypedElement has the given stereotype, or if one of
-	 * its stereotype is inherits from the stereotype passed in parameter. This
-	 * method currently exists in UMLUtils, this one is a copy created to avoid
-	 * some dependencies propagated by UMLUtils (jface...). Current UMLUtils
-	 * plug-in should probably be separated into two parts one depending on UML2
-	 * plug-in only, and the other bringing ui related features;
-	 * 
-	 * @deprecated prefer using {@link UMLUtil#getStereotypeApplication(Element, Class)}
-	 */
-	@Deprecated
-	public static EObject hasStereotype(Element elt, EClass stereotypeClass) {
-		return UMLUtil.getStereotypeApplication(elt, stereotypeClass.getClass());
-	}
-
-	/**
-	 * Convenient method to retrieve the StereotypeApplication by passing an
-	 * element of the static profile.
-	 * 
-	 * @deprecated prefer using {@link UMLUtil#getStereotypeApplication(Element, Class)}
-	 */
-	@Deprecated
-	public static <T extends EObject> T getStereotypeApplication(Element element, java.lang.Class<T> clazz) {
-		return UMLUtil.getStereotypeApplication(element, clazz);
-	}
-
-	/**
-	 * Getter to select an image for a stereotyped element (based on 1st applied stereotype)
-	 * 
-	 * @param element
-	 *        the element for which we are looking the icon
-	 * @param stereotype
-	 *        the stereotype that should have the icon
-	 * @param kind
-	 *        kind of display, should be <code>"icon"</code> or <code>"shape"</code>
-	 * @return the image corresponding to the stereotype or <code>null</code> if no image can be
-	 *         found
-	 */
-	public static Image getStereotypeImage(Element element, Stereotype stereotype, String kind) {
-		if(stereotype == null || element.getAppliedStereotypes() == null) {
-			return null;
-		}
-
-		Image image = null;
-
-		// Try to retrieve image based on getter implemented in static profile
-		image = ElementUtil.getStereotypeImageFromGetter(element, stereotype, kind);
-
-		if(image == null) {
-			// No image found by getters
-			// Search for the image verifying expressions
-			EList<Image> availableImages = new BasicEList<Image>();
-			if("icon".equals(kind)) {
-				availableImages = StereotypeUtil.getIcons(stereotype);
-			} else if("shape".equals(kind)) {
-				availableImages = StereotypeUtil.getShapes(stereotype);
-			}
-
-			if(!(availableImages).isEmpty()) {
-				// Retrieve first image verifying expression or
-				// first image if no expression is verified
-				image = ImageUtil.findImageVerifyingExpression(element, availableImages);
-
-				if(image == null) {
-					image = availableImages.get(0);
-				}
-			}
-		}
-
-		return image;
-	}
-
-	/**
-	 * Getter to select an image for a stereotyped element (based on 1st applied stereotype)
-	 * 
-	 * @param element
-	 *        to check
-	 * @param kind
-	 *        of image ("icon" | "shape")
-	 * @return {@link Image} or null
-	 */
-	public static Image getStereotypeImage(Element element, String kind) {
-		// Get first stereotype
-		if(element.getAppliedStereotypes() == null || element.getAppliedStereotypes().isEmpty()) {
-			return null; // null
-		}
-
-		// The image is one of the 1st stereotype
-		Stereotype stereotype = element.getAppliedStereotypes().get(0);
-
-		return getStereotypeImage(element, stereotype, kind);
-	}
-
-	/**
-	 * Find the image using a getter implemented in a static profile
-	 * 
-	 * @param element
-	 *        the stereotyped element
-	 * @param stereotype
-	 *        the applied stereotype
-	 * @param kind
-	 *        the kind of searched image ("icon" | "shape")
-	 * @return {@link Image} or null
-	 */
-	public static Image getStereotypeImageFromGetter(Element element, Stereotype stereotype, String kind) {
-
-		// Prepare getter method name
-		String getterName = "";
-		if("icon".equals(kind)) {
-			getterName += "getIcon";
-
-		} else if("shape".equals(kind)) {
-			getterName += "getShape";
-
-		} else {
-			// Unknown kind : abort and return null (no image)
-			return null;
-		}
-
-		// If the getter is implemented, it is implemented by the
-		// StereotypeApplication class
-		EObject stApp = element.getStereotypeApplication(stereotype);
-		Method getter = null;
-		try {
-			getter = stApp.getClass().getDeclaredMethod(getterName);
-		} catch (Exception e) {
-			// Implementation not found
-		}
-
-		// If the getter exists, invoke
-		if(getter != null) {
-			try {
-
-				// Retrieve image via getter in static profile
-				Image image = (Image)getter.invoke(stApp);
-
-				return image;
-
-			} catch (Exception e) {
-				// Invoke getter has failed
-				return null;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Test if the element has stereotype icons to display
-	 * 
-	 * @param element
-	 *        the element for which icon are searched
-	 * @return <code>true</code> if icons were found
-	 */
-	public static boolean hasIcons(Element element) {
-		if(!element.getAppliedStereotypes().isEmpty()) {
-			return hasIcons(element, element.getAppliedStereotypes().get(0));
-		}
-		return false;
-	}
-
-	/**
-	 * Test if the element has icons for the given stereotype
-	 * 
-	 * @param stereotype
-	 *        the stereotype we check to see if it has icon or not
-	 * @param element
-	 *        the stereotyped element
-	 * @return <code>true</code> if icons were found
-	 */
-	public static boolean hasIcons(Element element, Stereotype stereotype) {
-		return stereotype != null && !StereotypeUtil.getIcons(stereotype).isEmpty();
-	}
-
-	/**
-	 * Test if the element has stereotype shape to display
-	 * 
-	 * @param element
-	 *        the element for which shape are searched
-	 * @return <code>true</code> if shape were found
-	 */
-	// @unused
-	public static boolean hasShapes(Element element) {
-		if(!element.getAppliedStereotypes().isEmpty()) {
-			return hasShapes(element, element.getAppliedStereotypes().get(0));
-		}
-		return false;
-	}
-
-	/**
-	 * Test if the stereotype has shapes
-	 * 
-	 * @param stereotype
-	 * @return true if shapes were found
-	 */
-	public static boolean hasShapes(Element element, Stereotype stereotype) {
-		return stereotype != null && !StereotypeUtil.getShapes(stereotype).isEmpty();
-	}
-
-	/**
-	 * look for all metaclasses of the meta model UML2 for a profile.
-	 * 
-	 * @param element
-	 *        the profile which needs the metaclasses list
-	 * @return the possible metaclasses
-	 */
-	// @unused
-	public static List<org.eclipse.uml2.uml.Class> getPossibleMetaclasses(Element element) {
-		List<org.eclipse.uml2.uml.Class> metaList = new ArrayList<org.eclipse.uml2.uml.Class>();
-		List<Type> metaclasses = getMetaclasses(element); // get all type of the
-		// metaclass
-
-		for(int i = 0; i < metaclasses.size(); i++) {
-			if(metaclasses.get(i) instanceof org.eclipse.uml2.uml.Class) {
-				metaList.add((org.eclipse.uml2.uml.Class)metaclasses.get(i));
-			}
-		}
-
-		return metaList;
-	}
-
-	/**
-	 * return all type contained in the metamodel UML2. Elements in the list are the UML2
-	 * representation of the concepts of the metamodel. each element of the list must be casted with
-	 * org.eclipse.uml2.Classifier
-	 * 
-	 * @return list of metaclasses of the metamodel UML2
-	 */
-	public static List<Type> getMetaclasses(Element element) {
-		if(element == null) {
-			System.err.println("element should not be null to retrieve metaclasses");
-		}
-		org.eclipse.uml2.uml.Package uml2Metamodel = contentload(URI.createURI(UMLResource.UML_METAMODEL_URI), element);
-
-		return uml2Metamodel.getOwnedTypes();
-	}
-
-	/**
-	 * Loads content for the given URI, and returns the top package of this content.
-	 * 
-	 * @param uri
-	 *        the uri of the content to load
-	 * @param element
-	 *        the Element used to retrieve ResourceSet
-	 * @return the top package of the loaded content
-	 */
-	public static org.eclipse.uml2.uml.Package contentload(URI uri, Element element) {
-		ResourceSet resourceSet = element.eResource().getResourceSet();
-		org.eclipse.uml2.uml.Package package_ = null;
-		try {
-			Resource resource = resourceSet.getResource(uri, true);
-
-			package_ = (org.eclipse.uml2.uml.Package)EcoreUtil.getObjectByType(resource.getContents(), UMLPackage.eINSTANCE.getPackage());
-		} catch (WrappedException we) {
-			Activator.logError("impossible to load content for URI: " + uri);
-		}
-
-		return package_;
-	}
-
-	/**
-	 * Retrieve an list of all instances in the model that are instances of
-	 * the java.lang.Class metaType or with a stereotype applied
-	 * 
-	 * @param <T>
-	 * 
-	 * @param metaType
-	 *        selected classes
-	 * @param model
-	 *        to check
-	 * @param appliedStereotype
-	 *        may be null, metatype is ignored if not null
-	 * @return a list containing the selected instances
-	 */
-	//duplicated code from /org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/util/Util.java
-	//+add template to this method
-	@SuppressWarnings("unchecked")
-	public static final <T extends EObject> List<T> getInstancesFilteredByType(final Package topPackage, final java.lang.Class<T> metaType, final Stereotype appliedStereotype) {
-		// retrieve parent element
-		// Package topPackage = Util.topPackage(element);
-		// Assert.isNotNull(topPackage,
-		// "Top package should not be null for element " + element);
-		Iterator<EObject> iter = topPackage.eAllContents();
-		List<T> filteredElements = new ArrayList<T>();
-
-		while(iter.hasNext()) {
-			EObject currentElt = iter.next();
-
-			// If currentElt is an ElementImport, it is replaced by the imported
-			// Element.
-			if(currentElt instanceof ElementImport) {
-				ElementImport elementImport = (ElementImport)currentElt;
-				currentElt = elementImport.getImportedElement();
-			}
-
-			/* package imports treatment */
-			else if(currentElt instanceof PackageImport) {
-				Iterator<EObject> piIter = ((PackageImport)currentElt).getImportedPackage().eAllContents();
-				while(piIter.hasNext()) {
-					EObject piCurrentElt = piIter.next();
-					if(piCurrentElt instanceof Element) {
-						if(appliedStereotype != null) {
-
-							Iterator<Stereotype> appStIter = ((Element)piCurrentElt).getAppliedStereotypes().iterator();
-							while(appStIter.hasNext()) {
-								Stereotype currentSt = (Stereotype)appStIter.next();
-
-								if(currentSt.conformsTo(appliedStereotype)) {
-									filteredElements.add((T)piCurrentElt);
-								}
-							}
-
-						} else { // if (appliedStereotype == null)
-							if(metaType.isInstance(piCurrentElt)) {
-								filteredElements.add((T)piCurrentElt);
-							}
-
-							/** add imported meta elements */
-							else if(piCurrentElt instanceof ElementImport) {
-								Iterator<EObject> eIter = ((ElementImport)piCurrentElt).getImportedElement().eAllContents();
-								while(eIter.hasNext()) {
-									EObject currentEIelt = eIter.next();
-									if(metaType.isInstance(currentEIelt))
-										filteredElements.add((T)currentEIelt);
-								}
-							}
-						}
-					}
-
-				}
-			}
-
-			// Filtering elements
-			if(currentElt instanceof Element) {
-
-				if(appliedStereotype != null) {
-
-					Iterator<Stereotype> appStIter = ((Element)currentElt).getAppliedStereotypes().iterator();
-					while(appStIter.hasNext()) {
-						Stereotype currentSt = (Stereotype)appStIter.next();
-
-						if(currentSt.conformsTo(appliedStereotype)) {
-							filteredElements.add((T)currentElt);
-						}
-					}
-
-				} else { // if (appliedStereotype == null)
-					if(metaType.isInstance(currentElt)) {
-						filteredElements.add((T)currentElt);
-					}
-
-					/** add imported meta elements */
-					else if(currentElt instanceof ElementImport) {
-						Iterator<EObject> eIter = ((ElementImport)currentElt).getImportedElement().eAllContents();
-						while(eIter.hasNext()) {
-							EObject currentEIelt = eIter.next();
-							if(metaType.isInstance(currentEIelt))
-								filteredElements.add((T)currentEIelt);
-						}
-					}
-				}
-			}
-		}
-
-		return filteredElements;
-	}
-
-}
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/EnumerationUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/EnumerationUtil.java
deleted file mode 100644
index 6a7e31f10c2..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/EnumerationUtil.java
+++ /dev/null
@@ -1,118 +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.tools.utils;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.util.Enumerator;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EEnumLiteral;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-

-/**

- * 

- * This class provides utilities for Enum

- * 

- */

-public class EnumerationUtil {

-

-

-	private EnumerationUtil() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * 

-	 * @param enumeration

-	 *        the uml enumeration

-	 * @param enumerator

-	 *        the enumerator to adapt to a uml EnumerationLiteral

-	 * @return

-	 */

-	public static final EnumerationLiteral findEnumerationLiteral(final Enumeration enumeration, final Enumerator enumerator) {

-		final EnumerationLiteral lit = enumeration.getOwnedLiteral(enumerator.getLiteral());

-		if(lit != null) {

-			return lit;

-		}

-		Activator.log.error(NLS.bind("The EnumerationLiteral for {0} has not been found", enumerator), new NullPointerException()); //$NON-NLS-1$

-		return null;

-	}

-

-

-	/**

-	 * 

-	 * @param enumeration

-	 *        the uml enumeration

-	 * @param toAdapt

-	 *        the list of the element to adapt to UML EnumerationLiteral

-	 * @return

-	 */

-	public static final List<EnumerationLiteral> adaptToEnumerationLiteralList(final Enumeration enumeration, final Collection<?> toAdapt) {

-		final List<EnumerationLiteral> returnedValue = new ArrayList<EnumerationLiteral>();

-		for(Object object : toAdapt) {

-			if(object instanceof EnumerationLiteral) {

-				returnedValue.add((EnumerationLiteral)object);

-			} else if(object instanceof Enumerator) {

-				returnedValue.add(EnumerationUtil.findEnumerationLiteral(enumeration, (Enumerator)object));

-			}

-		}

-		assert returnedValue.size() == toAdapt.size();

-		return returnedValue;

-	}

-

-	/**

-	 * 

-	 * @param eenum

-	 *        an eemf enumeration

-	 * @param toConvert

-	 *        a list of enumeration literal to convert

-	 * @return

-	 *         the list of the converted element (/!\ in case of fail, the returned list contains less elements than the initial list)

-	 */

-	public static final List<Enumerator> adaptToEnumeratorList(final EEnum eenum, final Collection<?> toConvert) {

-		final List<Enumerator> convertedvalues = new ArrayList<Enumerator>();

-		for(final Object object : toConvert) {

-			if(object instanceof EnumerationLiteral) {

-				final EEnumLiteral literal = eenum.getEEnumLiteral(((EnumerationLiteral)object).getName());

-				if(literal != null) {

-					convertedvalues.add(literal.getInstance());

-				}

-			}

-		}

-		return convertedvalues;

-

-	}

-

-	/**

-	 * 

-	 * @param eenum

-	 *        an emf enumeration

-	 * @param umlLiteral

-	 *        a uml literal

-	 * @return

-	 *         the enumerator to use for this enumeration literal (/!\ can be null in case of fail)

-	 */

-	public static final Enumerator adaptToEnumerator(final EEnum eenum, final EnumerationLiteral umlLiteral) {

-		final EEnumLiteral literal = eenum.getEEnumLiteral(umlLiteral.getName());

-		if(literal != null) {

-			return literal.getInstance();

-		}

-		return null;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ExecutionSpecificationUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ExecutionSpecificationUtil.java
deleted file mode 100644
index 912376d6bdd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ExecutionSpecificationUtil.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 		Atos Origin - Initial API and implementation

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import org.eclipse.uml2.uml.ExecutionSpecification;

-import org.eclipse.uml2.uml.Lifeline;

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Executionspecification</code><BR>

- */

-public class ExecutionSpecificationUtil {

-

-	/**

-	 * Retrieve the Lifeline associated with an ExecutionSpecification.

-	 * According to the UML Specification, an ExecutionSpecification must have a start and a finish.

-	 * 

-	 * In Papyrus, an ExecutionSpecification may not have a start and finish.

-	 * To handle this specific case, we return the first Lifeline that the ES covered.

-	 * 

-	 * @param es

-	 *        the targeted execution specification

-	 * @return the associated Lifeline, or null if the ES has no start, no finish, no covered Lifeline.

-	 */

-	public static Lifeline getExecutionSpecificationLifeline(ExecutionSpecification es) {

-		Lifeline lifeline = null;

-		if(es.getStart() != null) {

-			lifeline = es.getStart().getCovereds().get(0);

-		} else if(es.getFinish() != null) {

-			lifeline = es.getFinish().getCovereds().get(0);

-		}

-

-		if(lifeline == null) {

-			if(!es.getCovereds().isEmpty()) {

-				lifeline = es.getCovereds().get(0);

-			}

-		}

-		return lifeline;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ExtensionPointUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ExtensionPointUtil.java
deleted file mode 100644
index c63a0829680..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ExtensionPointUtil.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.tools.utils;

-

-import org.eclipse.uml2.uml.ExtensionPoint;

-

-/**

- * Utility class for {@link ExtensionPoint}

- */

-// @unused

-public class ExtensionPointUtil {

-

-	/**

-	 * Returns the explanation for the extension point element

-	 * 

-	 * @return the string defining explanation for the extension point element

-	 */

-	// @unused

-	public static String getExplanation(ExtensionPoint extensionPoint) {

-		String explanation = "";

-		final String name = ((extensionPoint.getName() != null) ? extensionPoint.getName() : "");

-		int startIndexOfExplanation = name.lastIndexOf(":");

-		if((startIndexOfExplanation > 0) && (startIndexOfExplanation != name.length())) {

-			explanation = name.substring(startIndexOfExplanation + 1).trim();

-		}

-		return explanation;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearence.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearence.java
deleted file mode 100644
index 53a2a785a6c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ICustomAppearence.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-/**

- * Interface that manages display constants for custom labels (ex: operations label in a class

- * diagram).

- */

-public interface ICustomAppearence {

-

-	/**

-	 * key for the appearance property of graph nodes.

-	 */

-	// @unused

-	public final static String CUSTOM_APPEARENCE_KEY = "custom_disp";

-

-	// /////////////////////////////////////////////////////////////////////////

-	// Style constants

-	// /////////////////////////////////////////////////////////////////////////

-	/**

-	 * Style constant for visibility display in labels.

-	 */

-	public final static int DISP_VISIBILITY = 1 << 1;

-

-	/**

-	 * Style constant for isDerive display in labels.

-	 */

-	public final static int DISP_DERIVE = 1 << 2;

-

-	/**

-	 * Style constant for name display in labels.

-	 */

-	public final static int DISP_NAME = 1 << 3;

-

-	/**

-	 * Style constant for type display in labels.

-	 */

-	public final static int DISP_TYPE = 1 << 4;

-

-	/**

-	 * Style constant for multiplicity display in labels.

-	 */

-	public final static int DISP_MULTIPLICITY = 1 << 5;

-

-	/**

-	 * Style constant for default value display in labels.

-	 */

-	public final static int DISP_DFLT_VALUE = 1 << 6;

-

-	/**

-	 * Style constant for modifiers display in labels.

-	 */

-	public final static int DISP_MOFIFIERS = 1 << 7;

-

-	/**

-	 * Style constant for parameters display in labels.

-	 * 

-	 * @deprecated

-	 * @see #DISP_PARAMETER_TYPE

-	 */

-	@Deprecated

-	// @unused

-	public final static int DISP_PARAMETERS = 1 << 8;

-

-	/**

-	 * Style constant for return parameters display in labels.

-	 * 

-	 * @deprecated

-	 * @see #DISP_RT_TYPE

-	 */

-	@Deprecated

-	// @unused

-	public final static int DISP_RETURN_PARAMETERS = 1 << 9;

-

-	/** Style constant for carriage return in labels */

-	public final static int DISP_MULTI_LINE = 1 << 10;

-

-	/**

-	 * Style constant for opaque action body display in labels.

-	 */

-	// @unused

-	public final static int DISP_BODY = 1 << 11;

-

-	/** Style constant for parameter direction display in labels */

-	public final int DISP_PARAMETER_DIRECTION = 1 << 11;

-

-	/** Style constant for parameter name display in labels */

-	public final int DISP_PARAMETER_NAME = 1 << 12;

-

-	/** Style constant for parameter type display in labels */

-	public final int DISP_PARAMETER_TYPE = 1 << 8;

-

-	/** Style constant for parameter multiplicity display in labels */

-	public final int DISP_PARAMETER_MULTIPLICITY = 1 << 14;

-

-	/** Style constant for parameter default value display in labels */

-	public final int DISP_PARAMETER_DEFAULT = 1 << 15;

-

-	/** Style constant for parameter modifiers display in labels */

-	public final int DISP_PARAMETER_MODIFIERS = 1 << 16;

-

-	/** Style constant for return parameter type display in labels */

-	public final int DISP_RT_TYPE = 1 << 9;

-

-	/** Style constant for return parameter multiplicity display in labels */

-	public final int DISP_RT_MULTIPLICITY = 1 << 18;

-	

-	/** Style constant for conjugated labels */

-	public final int DISP_CONJUGATED = 1 << 19;

-

-	// /////////////////////////////////////////////////////////////////////////

-	// UML DEFAULT DISPLAY

-	// /////////////////////////////////////////////////////////////////////////

-	/**

-	 * default uml property display in classes edit part.

-	 */

-	public final static int DEFAULT_UML_PROPERTY = DISP_VISIBILITY | DISP_DERIVE | DISP_NAME | DISP_TYPE | DISP_MULTIPLICITY;

-

-	/**

-	 * default uml property display in classes edit part.

-	 */

-	public final static int DEFAULT_UML_ROLE = DISP_VISIBILITY | DISP_DERIVE | DISP_NAME | DISP_TYPE;

-

-	/**

-	 * default uml operation display.

-	 */

-	public final static int DEFAULT_UML_OPERATION = DISP_VISIBILITY | DISP_NAME | DISP_PARAMETER_DIRECTION | DISP_PARAMETER_TYPE | DISP_RT_TYPE | DISP_PARAMETER_NAME;

-

-	/**

-	 * default uml Property in composite diagrams.

-	 */

-	// @unused

-	public final static int DEFAULT_UML_COMPO_PROPERTY = DISP_NAME | DISP_TYPE;

-

-	/**

-	 * default uml Property in class diagrams as association ends.

-	 */

-	// @unused

-	public final static int DEFAULT_UML_RELATIONEND_PROPERTY = DISP_VISIBILITY | DISP_DERIVE | DISP_NAME | DISP_MOFIFIERS | DISP_MULTI_LINE;

-

-	/**

-	 * default uml Port ins composite diagrams.

-	 */

-	public final static int DEFAULT_UML_PORT = DISP_VISIBILITY | DISP_DERIVE | DISP_NAME | DISP_TYPE | DISP_MULTIPLICITY|DISP_CONJUGATED;

-

-	/**

-	 * default uml OpaqueAction in activity diagrams.

-	 */

-	// @unused

-	public final static int DEFAULT_UML_OPAQUE_ACTION = DISP_NAME;

-

-	/**

-	 * default uml Parameter in composite diagrams.

-	 */

-	// @unused

-	public final static int DEFAULT_UML_PARAMETER = DISP_PARAMETER_DIRECTION | DISP_PARAMETER_NAME | DISP_PARAMETER_TYPE;

-

-	/**

-	 * default uml instancespecification .

-	 */

-	public final static int DEFAULT_UML_INSTANCESPECIFICATION = DISP_NAME | DISP_TYPE;

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ImageUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ImageUtil.java
deleted file mode 100644
index af5afbdd6f9..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ImageUtil.java
+++ /dev/null
@@ -1,473 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Added support for Image's name

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.io.ByteArrayInputStream;

-import java.io.File;

-import java.io.FileInputStream;

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.URL;

-import java.util.Iterator;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.common.util.EMap;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-import org.eclipse.uml2.uml.Image;

-import org.eclipse.uml2.uml.Stereotype;

-

-// TODO: Auto-generated Javadoc

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Image</code><BR>

- */

-public class ImageUtil {

-

-	/**

-	 * ID of the EAnnotation where "expression" (used to select stereotype icon) is stored on image.

-	 */

-	public static String IMAGE_PAPYRUS_EA = "image_papyrus";

-

-	/**

-	 * KEY of the EAnnotation where "expression" (used to select stereotype icon) is stored on

-	 * image.

-	 */

-	public static String IMAGE_EXPR_KEY = "image_expr_key";

-

-	/**

-	 * KEY of the EAnnotation where "kind" (kind = icon/shape) is stored on image.

-	 */

-	public static String IMAGE_KIND_KEY = "image_kind_key";

-

-	/**

-	 * KEY of the EAnnotation where the image's name is stored

-	 * 

-	 * @see {@link #getName(Image)}

-	 * @see {@link #setName(Image, String)}

-	 */

-	public static String IMAGE_NAME_KEY = "image_name_key";

-

-	/**

-	 * Set the content of an {@link Image} with a file (containing an image).

-	 * 

-	 * @param image

-	 *        the UML {@link Image} to set

-	 * @param imageFile

-	 *        the icon

-	 */

-	// @unused

-	public static void setContent(Image image, File imageFile) {

-

-		try {

-			String rawImageData = "";

-			if(imageFile != null) {

-				byte[] byteFlow = getBytesFromFile(imageFile);

-

-				rawImageData = "";

-

-				// file reading

-				for(byte element : byteFlow) {

-					rawImageData = rawImageData + element + "%";

-				}

-			} else {

-				rawImageData = null;

-			}

-

-			image.setContent(rawImageData);

-

-		} catch (Exception ex) {

-			Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, ex.getLocalizedMessage(), ex));

-		}

-	}

-

-	/**

-	 * Get the content of an {@link Image} as {@link org.eclipse.swt.graphics.Image}

-	 * 

-	 * @param image

-	 *        the UML {@link Image} to set

-	 * 

-	 * @return {@link org.eclipse.swt.graphics.Image} content

-	 */

-	public static org.eclipse.swt.graphics.Image getContent(Image image) throws Exception {

-

-		if(image == null) {

-			// null parameter

-			return null;

-		}

-

-		if(image.getContent() == null) {

-			// null image

-			return null;

-		}

-

-		// else

-		String rawData = image.getContent();

-		StringTokenizer strToken = new StringTokenizer(rawData, "%");

-		byte[] target = new byte[strToken.countTokens()];

-

-		// decoding image

-		int j = 0;

-		while(strToken.hasMoreTokens()) {

-			target[j] = (new Byte(strToken.nextToken()).byteValue());

-			j++;

-		}

-

-		org.eclipse.swt.graphics.Image decodedImage = new org.eclipse.swt.graphics.Image(null, new ByteArrayInputStream(target));

-

-		return decodedImage;

-	}

-

-	/**

-	 * Get the image specified by the location property of an {@link Image} as {@link org.eclipse.swt.graphics.Image}

-	 * 

-	 * @param image

-	 *        the UML {@link Image} to set

-	 * 

-	 * @return {@link org.eclipse.swt.graphics.Image} image

-	 */

-	public static org.eclipse.swt.graphics.Image getImageFromLocation(Image image) {

-

-		org.eclipse.swt.graphics.Image swtImage = null;

-

-		// Try to instantiate an SWT image from the path stored

-		// in UML Image location property

-		String location = image.getLocation();

-		if((location != null) && !("".equals(location))) {

-

-			URI iconURI = URI.createURI(location);

-			if(iconURI.isRelative()) {

-				String err_msg = "Incorrect implementation of relative location." + location;

-				Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, err_msg, new Exception(err_msg)));

-				URI pluginURI = URI.createPlatformPluginURI(location, true); // <- TODO : fix this to retrieve the related plug-in URI

-				iconURI = iconURI.resolve(pluginURI);

-			}

-

-			try {

-				ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(new URL(iconURI.toString()));

-				swtImage = imageDescriptor.createImage();

-

-			} catch (Exception e) {

-				Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "Could not create image from location : " + location, e));

-			}

-		}

-

-		return swtImage;

-	}

-

-	/**

-	 * Read an image file content.

-	 * 

-	 * @param file

-	 *        the file

-	 * 

-	 * @return a table of bytes of the file content

-	 * 

-	 * @throws IOException

-	 *         Signals that an I/O exception has occurred.

-	 */

-	public static byte[] getBytesFromFile(File file) throws IOException {

-

-		InputStream is = new FileInputStream(file);

-

-		// Get the size of the file

-		long length = file.length();

-

-		// You cannot create an array using a long type.

-		// It needs to be an int type.

-		// Before converting to an int type, check

-		// to ensure that file is not larger than Integer.MAX_VALUE.

-		if(length > Integer.MAX_VALUE) {

-			is.close();

-			throw new IOException("Image too big to encode");

-		}

-

-		// Create the byte array to hold the data

-		byte[] bytes = new byte[(int)length];

-

-		// Read in the bytes

-		int offset = 0;

-		int numRead = 0;

-		while((offset < bytes.length) && ((numRead = is.read(bytes, offset, bytes.length - offset)) >= 0)) {

-			offset += numRead;

-		}

-

-		// Ensure all the bytes have been read in

-		if(offset < bytes.length) {

-			is.close();

-			throw new IOException("Could not completely read file " + file.getName());

-		}

-

-		// Close the input stream and return bytes

-		is.close();

-

-		return bytes;

-	}

-

-	/**

-	 * Associates an expression to an image.

-	 * 

-	 * @param image

-	 *        the image

-	 * @param expression

-	 *        the expression

-	 */

-	public static void setExpression(Image image, String expression) {

-

-		EAnnotation ea_Image = image.getEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-		// Create annotation for icon selection if it does not exist

-		if(ea_Image == null) {

-			ea_Image = image.createEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-		}

-

-		// If expression == "" remove the EAnnotation

-		if("".equals(expression)) {

-			ea_Image.getDetails().removeKey(IMAGE_EXPR_KEY);

-		} else {

-			ea_Image.getDetails().put(ImageUtil.IMAGE_EXPR_KEY, expression);

-		}

-

-		cleanImageAnnotation(ea_Image);

-	}

-

-	/**

-	 * Returns the expression associated to the image.

-	 * 

-	 * @param image

-	 *        the image

-	 * 

-	 * @return the expression associated to the image

-	 */

-	public static String getExpression(org.eclipse.uml2.uml.Image image) {

-		EAnnotation ea_ImageExpr = image.getEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-

-		String expr = null;

-		if((ea_ImageExpr != null) && (ea_ImageExpr.getDetails().containsKey(ImageUtil.IMAGE_EXPR_KEY))) {

-			expr = ea_ImageExpr.getDetails().get(ImageUtil.IMAGE_EXPR_KEY);

-		}

-		return expr;

-	}

-

-	/**

-	 * Associates a name to an Image.

-	 * 

-	 * The UML Image is not a NamedElement : the name is stored as an

-	 * EAnnotation, and is not mandatory. The name should only be used for

-	 * displaying the image's label : this is *not* an identifier.

-	 * 

-	 * @param image

-	 *        The image

-	 * @param name

-	 *        The name

-	 */

-	public static void setName(Image image, String name) {

-		EAnnotation ea_Image = image.getEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-		// Create annotation for icon selection if it does not exist

-		if(ea_Image == null) {

-			ea_Image = image.createEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-		}

-

-		// If expression == "" remove the EAnnotation

-		if("".equals(name)) {

-			ea_Image.getDetails().removeKey(IMAGE_NAME_KEY);

-		} else {

-			ea_Image.getDetails().put(ImageUtil.IMAGE_NAME_KEY, name);

-		}

-

-		cleanImageAnnotation(ea_Image);

-	}

-

-	/**

-	 * Returns the name associated to the image

-	 * 

-	 * The UML Image is not a NamedElement : the name is stored as an

-	 * EAnnotation, and is not mandatory. The name should only be used for

-	 * displaying the image's label : this is *not* an identifier.

-	 * 

-	 * @param image

-	 *        the image

-	 * @return

-	 *         the name associated to the image

-	 */

-	public static String getName(Image image) {

-		EAnnotation ea_Image = image.getEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-

-		String name = null;

-		if((ea_Image != null) && (ea_Image.getDetails().containsKey(IMAGE_NAME_KEY))) {

-			name = ea_Image.getDetails().get(IMAGE_NAME_KEY);

-		}

-		return name;

-	}

-

-	/**

-	 * Removes the EAnnotation from the Image if the annotation doesn't contain any valid key

-	 * 

-	 * @param annotation

-	 */

-	private static void cleanImageAnnotation(EAnnotation annotation) {

-		EMap<String, String> details = annotation.getDetails();

-		if(details.isEmpty()) {

-			//if(!(details.containsKey(IMAGE_NAME_KEY)) && !(details.containsKey(IMAGE_KIND_KEY) && !(details.containsKey(IMAGE_NAME_KEY)))) {

-			annotation.setEModelElement(null);

-		}

-

-	}

-

-	/**

-	 * Associates kind to an image.

-	 * 

-	 * @param image

-	 *        the image

-	 * @param kind

-	 *        of image (icon / shape)

-	 */

-	// @unused

-	public static void setKind(org.eclipse.uml2.uml.Image image, String kind) {

-

-		EAnnotation ea_Image = image.getEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-		// Create annotation for icon selection if it does not exist

-		if(ea_Image == null) {

-			ea_Image = image.createEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-		}

-

-		// If expression == "" remove the EAnnotation

-		if("".equals(kind)) {

-			ea_Image.getDetails().removeKey(IMAGE_KIND_KEY);

-		} else {

-			ea_Image.getDetails().put(ImageUtil.IMAGE_KIND_KEY, kind);

-		}

-

-		cleanImageAnnotation(ea_Image);

-	}

-

-	/**

-	 * Returns the kind of the image (icon or shape for Papyrus).

-	 * 

-	 * @param image

-	 *        the image

-	 * 

-	 * @return kind of image

-	 */

-	public static String getKind(org.eclipse.uml2.uml.Image image) {

-		EAnnotation ea_ImageExpr = image.getEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);

-

-		String kind = null;

-		if((ea_ImageExpr != null) && (ea_ImageExpr.getDetails().containsKey(ImageUtil.IMAGE_KIND_KEY))) {

-			kind = ea_ImageExpr.getDetails().get(ImageUtil.IMAGE_KIND_KEY);

-		}

-		return kind;

-	}

-

-	/**

-	 * Evaluates the "Expression" EAnnotation associated to the image.

-	 * 

-	 * @param element

-	 *        on which the stereotype (owning current image) is applied

-	 * @param image

-	 *        the image

-	 * 

-	 * @return true if the expression is correct

-	 */

-	public static boolean evalExpression(Image image, Element element) {

-		/*

-		 * Expression has the form : propName = Literal

-		 */

-

-		/* Firstly we extract the propertyName and the literal */

-

-		String propName = null;

-		String literal = null;

-		Stereotype st = (Stereotype)image.getOwner();

-

-		// Retrieve Expression

-		String expression = ImageUtil.getExpression(image);

-		if(expression == null) {

-			// No expression to check

-			return false;

-		}

-

-		// Parse and test expression

-		StringTokenizer sToken = new StringTokenizer(expression.replace(" ", ""), "=");

-		if(sToken.countTokens() == 2) {

-			propName = sToken.nextToken();

-			literal = sToken.nextToken();

-

-		} else {

-			// Bad formed expression --> ignore

-			return false;

-		}

-

-		if(element.getValue(st, propName) != null) {

-			/* extract property value from applied stereotype */

-			Object val = element.getValue(st, propName);

-

-			if(val instanceof EnumerationLiteral) {

-				if(((EnumerationLiteral)val).getLabel().equals(literal)) {

-					return true;

-				}

-			}

-		}

-		// In any other case (bad expression, not property found...)

-		return false;

-	}

-

-	/**

-	 * Test expression on every image, stop on first verified expression.

-	 * 

-	 * @param element

-	 *        the element to check

-	 * @param images

-	 *        the list of images to check

-	 * 

-	 * @return first image verifying its expression

-	 */

-	public static Image findImageVerifyingExpression(Element element, EList<Image> images) {

-

-		Image image = null;

-		Iterator<Image> it = images.iterator();

-		while((image == null) && it.hasNext()) {

-			Image current = it.next();

-			if(ImageUtil.evalExpression(current, element)) {

-				image = current;

-			}

-		}

-

-		return image;

-	}

-

-	/**

-	 * Create an Id to store and retrieve image (SWT) In registry.

-	 * 

-	 * @param image

-	 *        the image

-	 * 

-	 * @return the image id

-	 */

-	public static String getImageId(Image image) {

-		String id = "";

-

-		Stereotype owner = (Stereotype)image.getOwner();

-		id += owner.getQualifiedName() + "_img_" + owner.getIcons().indexOf(image);

-

-		return id;

-

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/InstanceSpecificationUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/InstanceSpecificationUtil.java
deleted file mode 100644
index 44b48829ed4..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/InstanceSpecificationUtil.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- */

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Iterator;

-

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.InstanceSpecification;

-

-/**

- *  util class to display name of instancespecification 

- *

- */

-public class InstanceSpecificationUtil {

-	/**

-	 * return the custom label of the operation, given UML2 specification and a custom style.

-	 * 

-	 * @param style

-	 *        the integer representing the style of the label

-	 * 

-	 * @return the string corresponding to the label of the operation

-	 */

-	public static String getCustomLabel(InstanceSpecification instance, int style) {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append(" "); // adds " " first for correct display considerations

-

-		// name

-		if((style & ICustomAppearence.DISP_NAME) != 0) {

-			buffer.append(NamedElementUtil.getName(instance));

-		}

-

-		// classifier

-		if((style & ICustomAppearence.DISP_TYPE) != 0) {

-			if( !getTypesAsString(instance, style).equals("")){

-				buffer.append(": ");

-				buffer.append(getTypesAsString(instance, style));}

-		}

-

-

-		return buffer.toString();

-	}

-	/**

-	 * Returns the list of classifier for an instance specification as a string

-	 * 

-	 * @return a string containing all classifier separated by commas

-	 */

-	private static String getTypesAsString(InstanceSpecification instance, int style) {

-		StringBuffer typeString = new StringBuffer();

-		Iterator<Classifier> classifierIterator = instance.getClassifiers().iterator();

-		boolean firstParameter = true;

-		while(classifierIterator.hasNext()) {

-			Classifier classifier = classifierIterator.next();

-

-			// get the label for this Classifier

-			String classifierName = NamedElementUtil.getName(classifier);

-			if (!classifierName.trim().equals("")) {

-				if (!firstParameter) {

-					typeString.append(", ");

-				}

-				typeString.append(classifierName);

-				firstParameter = false;

-			}

-		}

-		return typeString.toString();

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/MultiplicityElementUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/MultiplicityElementUtil.java
deleted file mode 100644
index 570c7b845a4..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/MultiplicityElementUtil.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *  
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils;
-
-import org.eclipse.uml2.uml.MultiplicityElement;
-
-/**
- * Utility class for <code>org.eclipse.uml2.uml.MultiplicityElement</code><BR>
- */
-public class MultiplicityElementUtil {
-
-	/**
-	 * Return the multiplicity of the element "[x..y]"
-	 * 
-	 * @return the string representing the multiplicity
-	 */
-	public static String getMultiplicityAsString(MultiplicityElement element) {
-		StringBuffer buffer = new StringBuffer();
-		String multiplicityStr = getMultiplicityAsStringWithoutSquareBrackets(element);
-		if(multiplicityStr != null && !"".equals(multiplicityStr)) {
-			buffer.append(" [");
-			buffer.append(multiplicityStr);
-			buffer.append("]");
-		}
-		return buffer.toString();
-	}
-
-	/**
-	 * Returns the String corresponding to the multiplicity without square brackets
-	 * 
-	 * @return the string representing the multiplicity, without square brackets
-	 */
-	public static String getMultiplicityAsStringWithoutSquareBrackets(MultiplicityElement element) {
-		StringBuffer buffer = new StringBuffer();
-		// special case for [1] and [*]
-		int lower = element.getLower();
-		int upper = element.getUpper();
-
-		if(lower == upper) {
-			buffer.append(lower);
-		} else if((lower == 0) && (upper == -1)) {
-			buffer.append("*");
-		} else if(upper == -1) {
-			buffer.append(lower);
-			buffer.append("..*");
-		} else {
-			buffer.append(lower);
-			buffer.append("..");
-			buffer.append(upper);
-		}
-
-		return buffer.toString();
-	}
-
-	/**
-	 * Parses the given String and returns the value of the multiplicity.
-	 * <P>
-	 * a lower bound with value infinite (<code>*</code>) will be set at <code>-1</code>.
-	 * </P>
-	 * 
-	 * @param value
-	 *        the string representing the multiplicity. it can be <code>1</code>, <code>1..2</code> or <code>1..*</code>
-	 * @return a 2-size integer table, with the first element corresponding to the lower bound, the second corresponds to the upper bound
-	 */
-	public static int[] parseMultiplicity(String value) throws NumberFormatException {
-		int lower = 0;
-		int upper = 0;
-		int firstIndex = value.indexOf("..");
-
-		// ".." was not found => this should be an integer, for example a multiplicity ~ [1]
-		if(firstIndex == -1) {
-			// this should be directly an integer or a star
-			if("*".equals(value)) {
-				lower = 0;
-				upper = -1;
-			} else {
-				lower = Integer.parseInt(value);
-				upper = lower;
-			}
-		} else {
-			String lowerValue = value.substring(0, firstIndex);
-			String upperValue = value.substring(firstIndex + "..".length());
-
-			lower = Integer.parseInt(lowerValue);
-			upper = -2;
-			if("*".equals(upperValue)) {
-				upper = -1;
-			} else {
-				upper = Integer.parseInt(upperValue);
-			}
-		}
-		return new int[]{ lower, upper };
-	}
-
-}
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionHelper.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionHelper.java
deleted file mode 100644
index e969c8c717d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionHelper.java
+++ /dev/null
@@ -1,160 +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:

- *  Arnaud Cuccuru (CEA LIST) - Initial API and implementation

- *  Vincent Lorenzo   (CEA LIST)

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.resource.UMLResource;

-

-

-public class NameResolutionHelper {

-

-	protected Namespace scope;

-

-	protected EClass filter;

-

-	protected Map<String, List<NamedElement>> allNames;

-

-	public NameResolutionHelper(Namespace scope, EClass filter) {

-		this.scope = scope;

-		this.filter = filter;

-	}

-

-	public List<NamedElement> getNamedElements(String name) {

-		if(this.allNames == null) {

-			this.allNames = new HashMap<String, List<NamedElement>>();

-			this.computeAllNames();

-		}

-		List<NamedElement> namedElements = this.allNames.get(name);

-		return namedElements != null ? namedElements : new ArrayList<NamedElement>();

-	}

-

-	/**

-	 * TODO

-	 */

-	protected void computeAllNames() {

-

-		// compute names directly available in the scope 

-		computeNames("", scope, true);

-

-		// compute names related to enclosing namepaces of scope		

-		Namespace enclosingNamespace = scope.getNamespace();

-		String prefix = "";

-		while(enclosingNamespace != null) {

-//			prefix += enclosingNamespace.getName() + NamedElementUtil.QUALIFIED_NAME_SEPARATOR;

-			prefix="";

-			computeNames(prefix, enclosingNamespace, false);

-			enclosingNamespace = enclosingNamespace.getNamespace();

-		}

-

-		// Compute names related to the root context model

-		Namespace model = scope.getModel();

-		if(model==null){

-			model  = scope;

-		}

-		if(filter != null) {

-			if(filter.isSuperTypeOf(model.eClass())) {

-				List<NamedElement> l = this.allNames.get(model.getName());

-				if(l == null) { // i.e. no names have already been resolved in enclosed namespaces

-					l = new ArrayList<NamedElement>();

-					l.add(model);

-					this.allNames.put(model.getName(), l);

-				}

-			}

-		} else {

-			List<NamedElement> l = this.allNames.get(model.getName());

-			if(l == null) { // i.e. no names have already been resolved in enclosed namespaces

-				l = new ArrayList<NamedElement>();

-				l.add(model);

-				this.allNames.put(model.getName(), l);

-			}

-		}

-		computeNames(model.getName() + "::", model, false);

-

-		// Build names corresponding to other available UML resources in the workspace 

-		List<Resource> resources = scope.eResource().getResourceSet().getResources();

-		for(Resource resource : resources) {

-			if(resource != scope.eResource() && resource instanceof UMLResource) {

-				UMLResource umlResource = (UMLResource)resource;

-				Model root = null;

-				for(Iterator<EObject> i = umlResource.getAllContents(); i.hasNext() && root == null;) {

-					EObject next = i.next();

-					if(next instanceof Model)

-						root = (Model)next;

-				}

-				if(root != null) {

-					if(filter != null) {

-						if(filter.isSuperTypeOf(root.eClass())) {

-							List<NamedElement> l = this.allNames.get(root.getName());

-							if(l == null) { // i.e. no names have already been resolved in enclosed namespaces

-								l = new ArrayList<NamedElement>();

-								l.add(root);

-								this.allNames.put(root.getName(), l);

-							}

-						}

-					} else {

-						List<NamedElement> l = this.allNames.get(root.getName());

-						if(l == null) { // i.e. no names have already been resolved in enclosed namespaces

-							l = new ArrayList<NamedElement>();

-							l.add(root);

-							this.allNames.put(root.getName(), l);

-						}

-					}

-					computeNames(root.getName() + NamedElementUtil.QUALIFIED_NAME_SEPARATOR, root, false);

-				}

-			}

-		}

-	}

-

-

-	/**

-	 * TODO

-	 */

-	protected void computeNames(String prefix, Namespace scope, boolean ignoreAlreadyFoundNames) {

-		Set<String> preExistingKeys;

-		if(ignoreAlreadyFoundNames)

-			preExistingKeys = new HashSet<String>();

-		else

-			preExistingKeys = this.allNames.keySet();

-		// iterates members of the scope

-		for(NamedElement member : scope.getMembers()) {

-			List<String> memberNames = scope.getNamesOfMember(member);

-			// iterates other names given to the current member in the context of this scope

-			for(String memberName : memberNames) {

-				// Checks if the name must be considered or not

-				if(!preExistingKeys.contains(prefix + memberName)) {

-					List<NamedElement> l = this.getNamedElements(prefix + memberName);

-					l.add(member);

-					this.allNames.put(prefix + memberName, l);

-				}

-				if(member instanceof Namespace) { // Recursive call on the current member

-					computeNames(prefix + memberName + NamedElementUtil.QUALIFIED_NAME_SEPARATOR, (Namespace)member, true);

-				}

-			}

-		}

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionUtils.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionUtils.java
deleted file mode 100644
index b348d6513bd..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NameResolutionUtils.java
+++ /dev/null
@@ -1,386 +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:

- *  Arnaud Cuccuru (CEA LIST) - Initial API and implementation

- *  Vincent Lorenzo   (CEA LIST)

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.resource.UMLResource;

-

-public class NameResolutionUtils {

-

-

-	private NameResolutionUtils() {

-		// to prevent instanciation

-	}

-

-	/**

-	 * From a given (potentially qualified) name and a scope, retrieves a list of NamedElement, filter by the filter metaclass (which can be null).

-	 * If there are more than one element in the returned list, the name is ambiguous

-	 * If the list is empty, the name does not correspond to any available named element in the context of the model resource set

-	 * 

-	 * @param name

-	 *        , the potentially/partially qualified name of the NamedElement to be resolved

-	 * @param scope

-	 *        , the namespace defining the scope for the name resolution

-	 * @param filter

-	 *        , the potential "filter" metaclass (can be null)

-	 * @return the list of NamedElement found by applying the resolution process

-	 */

-	public static final List<NamedElement> getNamedElements(final String name, final Element scope, final EClass filter) {

-		final List<NamedElement> resolvedNamedElements = new ArrayList<NamedElement>();

-		// In practice, a scope can only be a Namespace

-		if(!(scope instanceof Namespace)) {

-			return resolvedNamedElements;

-		}

-		return NameResolutionUtils.getNamedElements(name, (Namespace)scope, filter);

-	}

-

-	/**

-	 * From a given (potentially qualified) name and a scope, retrieves a list of NamedElement, filter by the filter metaclass (which can be null).

-	 * If there are more than one element in the returned list, the name is ambiguous

-	 * If the list is empty, the name does not correspond to any available named element in the context of the model resource set

-	 * 

-	 * @param name

-	 *        , the potentially/partially qualified name of the NamedElement to be resolved

-	 * @param scope

-	 *        , the namespace defining the scope for the name resolution

-	 * @param filter

-	 *        , the potential "filter" metaclass (can be null)

-	 * @return the list of NamedElement found by applying the resolution process

-	 */

-	public static final List<NamedElement> getNamedElements(final String name, final Namespace scope, final EClass filter) {

-		final List<NamedElement> resolvedNamedElements = new ArrayList<NamedElement>();

-

-		// extracts name fragments for the given (potentially qualified) name

-		final List<String> nameFragments = NameResolutionUtils.computeNameFragments(name);

-		// tries to resolve the name

-		resolvedNamedElements.addAll(NameResolutionUtils.getNamedElements(nameFragments, scope, filter));

-

-		// If no named elements have been found, tries to restart the process on the enclosing namespace of the scope, if any

-		if(resolvedNamedElements.isEmpty()) {

-			Namespace enclosingNamespace = scope.getNamespace();

-			while(resolvedNamedElements.isEmpty() && (enclosingNamespace != null)) {

-				resolvedNamedElements.addAll(NameResolutionUtils.getNamedElements(nameFragments, enclosingNamespace, filter));

-				enclosingNamespace = enclosingNamespace.getNamespace();

-			}

-		}

-

-		// If no named elements have been found, tries to evaluate the name using the root context model has a root of the qualified name

-		if(resolvedNamedElements.isEmpty()) {

-			Namespace model = scope.getModel();

-			if(model==null){

-				model = scope;

-			}

-			if(model.getName().equals(nameFragments.get(0))) {

-				if(nameFragments.size() == 1) {

-					if(filter != null) {

-						if(filter.isSuperTypeOf(model.eClass())) {

-							resolvedNamedElements.add(model);

-						}

-					} else {

-						resolvedNamedElements.add(model);

-					}

-				} else {

-					final List<String> remainingNameFragments = nameFragments.subList(1, nameFragments.size());

-					resolvedNamedElements.addAll(NameResolutionUtils.getNamedElements(remainingNameFragments, model, filter));

-				}

-			}

-		}

-

-		// If no named elements have been found, tries to evaluate the name as a fully qualified name

-		// This requires analysis of available UML resources in the context of scope resource set

-		if(resolvedNamedElements.isEmpty()) {

-			final List<Resource> resources = scope.eResource().getResourceSet().getResources();

-			for(final Resource resource : resources) {

-				if((resource != scope.eResource()) && (resource instanceof UMLResource)) {

-					final UMLResource umlResource = (UMLResource)resource;

-					Model root = null;

-					for(final Iterator<EObject> i = umlResource.getAllContents(); i.hasNext() && (root == null);) {

-						final EObject next = i.next();

-						if(next instanceof Model) {

-							root = (Model)next;

-						}

-					}

-					if(root != null) {

-						if(root.getName().equals(nameFragments.get(0))) {

-							if(nameFragments.size() == 1) {

-								if(filter != null) {

-									if(filter.isSuperTypeOf(root.eClass())) {

-										resolvedNamedElements.add(root);

-									}

-								} else {

-									resolvedNamedElements.add(root);

-								}

-							} else {

-								final List<String> remainingNameFragments = nameFragments.subList(1, nameFragments.size());

-								resolvedNamedElements.addAll(NameResolutionUtils.getNamedElements(remainingNameFragments, root, filter));

-							}

-						}

-					}

-				}

-			}

-		}

-

-		return resolvedNamedElements;

-	}

-

-	/**

-	 * From a given list of name fragments representing a (potentially qualified name),

-	 * retrieves a list of NamedElement.

-	 * The basic principle of the algorithm is to try to match the first element of nameFragments with

-	 * members of the scope.

-	 * When a match is found, this method is called a recursively on a sublist of a nameFragments

-	 * (i.e., the first element is omitted) and on the matched member.

-	 * The stop condition for recursivity is that the size of nameFragments is 1.

-	 * 

-	 * @param nameFragments

-	 *        , the potentially/partially qualified name of the NamedElement to be resolved

-	 * @param scope

-	 *        , the namespace defining the scope for the name resolution

-	 * @param clazz

-	 *        , the potential "filter" metaclass (can be null)

-	 * @return the list of NamedElement found by applying the resolution process

-	 */

-	private static final List<NamedElement> getNamedElements(final List<String> nameFragments, final Namespace scope, final EClass clazz) {

-		final List<NamedElement> resolvedNamedElements = new ArrayList<NamedElement>();

-		// Tries to match the first name fragment with members of the scope

-		for(final NamedElement member : scope.getMembers()) {

-			final List<String> memberNames = scope.getNamesOfMember(member);

-			final String firstNameFragment = nameFragments.get(0);

-			// iterates other names given to the current member in the context of this scope

-			for(final String memberName : memberNames) {

-				if(memberName.equals(firstNameFragment)) {

-					// the first fragment matches with this member

-					if(nameFragments.size() == 1) { // Stop condition for recursivity

-						if(clazz != null) {

-							if(clazz.isSuperTypeOf(member.eClass())) {

-								resolvedNamedElements.add(member);

-							}

-						} else {

-							resolvedNamedElements.add(member);

-						}

-					} else {

-						if(member instanceof Namespace) { // Recursive call on the sublist and the matching member

-							final List<String> remainingNameFragments = nameFragments.subList(1, nameFragments.size());

-							resolvedNamedElements.addAll(NameResolutionUtils.getNamedElements(remainingNameFragments, (Namespace)member, clazz));

-						}

-					}

-				}

-			}

-		}

-		return resolvedNamedElements;

-	}

-

-	/**

-	 * Computes a List<String> containing the various "name fragments" of parameter "name".

-	 * The string "name" is simply splitted according to qualifiedNameSeparator ("::").

-	 * 

-	 * @param name

-	 *        The name to be "fragmented"

-	 * @return The list of name fragments

-	 */

-	private static final List<String> computeNameFragments(final String name) {

-		final String[] nameFragmentsArray = name.split(NamedElementUtil.QUALIFIED_NAME_SEPARATOR);

-		final List<String> nameFragments = new ArrayList<String>();

-		for(final String element : nameFragmentsArray) {

-			nameFragments.add(element);

-		}

-		return nameFragments;

-	}

-

-	/**

-	 * Computes the shortest qualified names for a named element, in the context of a scope.

-	 * The shortest qualified names are the shortest name in terms of qualification depth which unambiguously

-	 * resolve to the researched element.

-	 * In the case where the returned list is empty, there is no unambiguous name that could be found,

-	 * including the fully qualified name of the element. This typically means that there are problems in the

-	 * context model in terms of organization of element imports and package imports and named element

-	 * definitions, or conflict in loaded UML resources.

-	 * In the case where the list contains more than one name, all these names are all valid, all have the same

-	 * qualification depth, and can be used indifferently.

-	 * 

-	 * @param element

-	 *        , the named element for which we try to determine the shortest qualified name

-	 * @param scope

-	 *        , the scope in which we try to determine the shortest qualified name for element

-	 * @return the shortest qualified names for element

-	 */

-	public static final List<String> getShortestQualifiedNames(final NamedElement element, final Element scope) {

-		final List<String> shortestNames = new ArrayList<String>();

-		// In practice, a scope can only be a Namespace

-		if(!(scope instanceof Namespace)) {

-			return shortestNames;

-		}

-		return NameResolutionUtils.getShortestQualifiedNames(element, (Namespace)scope);

-	}

-

-	/**

-	 * Computes the shortest qualified names for a named element, in the context of a scope.

-	 * The shortest qualified names are the shortest name in terms of qualification depth which unambiguously

-	 * resolve to the researched element.

-	 * In the case where the returned list is empty, there is no unambiguous name that could be found,

-	 * including the fully qualified name of the element. This typically means that there are problems in the

-	 * context model in terms of organization of element imports and package imports and named element

-	 * definitions, or conflict in loaded UML resources.

-	 * In the case where the list contains more than one name, all these names are all valid, all have the same

-	 * qualification depth, and can be used indifferently.

-	 * 

-	 * @param element

-	 *        , the named element for which we try to determine the shortest qualified name

-	 * @param scope

-	 *        , the scope in which we try to determine the shortest qualified name for element

-	 * @return the shortest qualified names for element

-	 */

-	public static final List<String> getShortestQualifiedNames(final NamedElement element, final Namespace scope) {

-		final List<String> shortestNames = new ArrayList<String>();

-

-		// Tries to compute 

-		shortestNames.addAll(NameResolutionUtils.getShortestQualifiedNamesOmittingFullyQualifiedName(element, scope));

-

-		// if no short name have been found, returns the fully qualified name, if it is itself unambiguous

-		if(shortestNames.isEmpty()) {

-			final String fullyQualifiedNameOfElement = element.getQualifiedName();

-			if((fullyQualifiedNameOfElement != null) && !(fullyQualifiedNameOfElement.length() == 0)) {

-				shortestNames.add(fullyQualifiedNameOfElement);

-				shortestNames.removeAll(NameResolutionUtils.findAmbiguousNames(shortestNames, element, scope));

-			}

-		}

-		return shortestNames;

-	}

-

-	/**

-	 * Computes the shortest qualified names for a named element in the context of a scope, omitting

-	 * fully qualified name of the named element (The fully qualified name is handled as a special case of

-	 * getShortestQualifiedName, in the case where this method was not able to produce a non-ambiguous qualified

-	 * name).

-	 * The basic principle is the following (each step is applied if the previous one did not succeed.

-	 * "Evaluates" means assuring that computed names are not ambiguous):

-	 * 1. if element and scope are the same, directly evaluates the name of the element.

-	 * 2. if element is a member of scope, evaluates member names for this element,

-	 * 3. Iterate over enclosing namespaces of scope, and if element is a member of an enclosing namespace,

-	 * evaluate member names for element in the context of this enclosing namespace

-	 * 4. Recursively call this method using the enclosing namespace of element as the reasearched named element,

-	 * build partially qualified names from the obtained list, and evaluate the computed names

-	 * 

-	 * @param element

-	 *        , the named element for which we try to determine the shortest qualified name

-	 * @param scope

-	 *        , the scope in which we try to determine the shortest qualified name for element

-	 * @return the shortest qualified names for element (omitting the fully qualified name element)

-	 */

-	private static final List<String> getShortestQualifiedNamesOmittingFullyQualifiedName(final NamedElement element, final Namespace scope) {

-		boolean continueResearch = true;

-		final List<String> shortestNames = new ArrayList<String>();

-		// if element and scope are the same, the shortest name is the name of the element

-		if(element == scope) {

-			shortestNames.add(element.getName());

-			shortestNames.removeAll(NameResolutionUtils.findAmbiguousNames(shortestNames, element, scope));

-			if(!shortestNames.isEmpty()) {

-				continueResearch = false;

-			}

-		}

-		// if element is part of the scope members, the shortest names are the names given to this member in the context of this scope

-		if(continueResearch && scope.getMembers().contains(element)) {

-			shortestNames.addAll(scope.getNamesOfMember(element));

-			shortestNames.removeAll(NameResolutionUtils.findAmbiguousNames(shortestNames, element, scope));

-			if(!shortestNames.isEmpty()) {

-				continueResearch = false;

-			}

-		}

-		if(continueResearch) {

-			// tries to find element in the enclosing namespaces of scope

-			Namespace enclosingNamespaceOfScope = scope.getNamespace();

-			while((enclosingNamespaceOfScope != null) && shortestNames.isEmpty()) {

-				if(enclosingNamespaceOfScope.getMembers().contains(element)) {

-					shortestNames.addAll(enclosingNamespaceOfScope.getNamesOfMember(element));

-					shortestNames.removeAll(NameResolutionUtils.findAmbiguousNames(shortestNames, element, scope));

-				}

-				enclosingNamespaceOfScope = enclosingNamespaceOfScope.getNamespace();

-			}

-			if(shortestNames.isEmpty()) {

-				// tries to find the shortest name for the enclosing namespace in the context of scope

-				final Namespace enclosingNamespaceOfElement = element.getNamespace();

-				if(enclosingNamespaceOfElement != null) {

-					final List<String> shortestNamesForEnclosingNamespace = new ArrayList<String>();

-					shortestNamesForEnclosingNamespace.addAll(NameResolutionUtils.getShortestQualifiedNames(enclosingNamespaceOfElement, scope));

-					// creates the list of shortest name from the list of shortest names for the enclosing namespace

-					for(final String shortestNameForEnclosing : shortestNamesForEnclosingNamespace) {

-						final List<String> memberNames = enclosingNamespaceOfElement.getNamesOfMember(element);

-						for(final String memberName : memberNames) {

-							shortestNames.add(shortestNameForEnclosing + NamedElementUtil.QUALIFIED_NAME_SEPARATOR + memberName);

-						}

-					}

-					shortestNames.removeAll(NameResolutionUtils.findAmbiguousNames(shortestNames, element, scope));

-				}

-			}

-		}

-		return shortestNames;

-	}

-

-	/**

-	 * From a list of names, select the names which do not unambiguously resolve to researchedElement,

-	 * in the context of scope

-	 * 

-	 * @param names

-	 *        , the list of names to evaluate

-	 * @param researchedElement

-	 *        , the element that must be resolved from the names

-	 * @param scope

-	 *        , the scope in which evaluation happens

-	 * @return the list of names which are ambiguous

-	 */

-	private static final List<String> findAmbiguousNames(final List<String> names, final NamedElement researchedElement, final Namespace scope) {

-		final List<String> ambiguousNames = new ArrayList<String>();

-		for(final String name : names) {

-			if(NameResolutionUtils.isQualifiedNameAmbiguous(name, researchedElement, scope)) {

-				ambiguousNames.add("" + name);

-			}

-		}

-		return ambiguousNames;

-	}

-

-

-	/**

-	 * Determines if a given name is ambiguous. From a given scope where evaluation of the name happens,

-	 * a name is ambiguous if:

-	 * - The given name resolves to multiple elements,

-	 * - Or the name resolves to one element which is not the researched element.

-	 * This method relies on getNamedElements(String, Element, EClass), using researchedElement.eClass() as a filter.

-	 * 

-	 * @param name

-	 * @param researchedElement

-	 * @param scope

-	 * @return

-	 */

-	private static final boolean isQualifiedNameAmbiguous(final String name, final NamedElement researchedElement, final Namespace scope) {

-		final List<NamedElement> resolvedElements = NameResolutionUtils.getNamedElements(name, scope, researchedElement.eClass());

-		if(resolvedElements.size() > 1) {

-			return true;

-		}

-		if(resolvedElements.get(0) != researchedElement) {

-			return true;

-		}

-		return false;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java
deleted file mode 100644
index 13da0b0c704..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Collection;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

-import org.eclipse.uml2.uml.NamedElement;

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.NamedElement</code><BR>

- */

-public class NamedElementUtil {

-

-	public static final String QUALIFIED_NAME_SEPARATOR = "::";

-

-	private final static String PUBLIC_STRING = "+";

-

-	private final static String PROTECTED_STRING = "#";

-

-	private final static String PRIVATE_STRING = "-";

-

-	private final static String PACKAGE_STRING = "~";

-

-	/**

-	 * A helper method to calculate the max depth of an element

-	 * 

-	 * @param the

-	 *        named element

-	 * @return the maximum depth found in qualified name

-	 */

-	public static int getQualifiedNameMaxDepth(NamedElement namedElement) {

-		int d = 0;

-		String s = namedElement.getQualifiedName();

-		if(s == null) {

-			return 0;

-		}

-		int n = 0;

-		while((n = s.indexOf(QUALIFIED_NAME_SEPARATOR, n)) != -1) {

-			n += 2;

-			d++;

-		}

-		return d;

-	}

-

-	/**

-	 * generate a default name for the eobject in parameter the format is :

-	 * "eclassName"+"max(elementOfTheSameName in the container)" + 1

-	 * 

-	 * @param newElement

-	 * @return

-	 */

-	public static String getDefaultNameWithIncrement(EObject newElement) {

-		if(newElement.eContainer() != null) {

-			return getDefaultNameWithIncrement(newElement, newElement.eContainer().eContents());

-		}

-		return null;

-	}

-

-	/**

-	 * generate a default name for the eobject in parameter the format is :

-	 * "eclassName"+"max(elementOfTheSameName in the container)" + 1 the method checks already

-	 * existing element in contents parameter

-	 * 

-	 * @param newElement

-	 */

-	@SuppressWarnings("rawtypes")

-	public static String getDefaultNameWithIncrement(EObject newElement, Collection contents) {

-		return getDefaultNameWithIncrement("", newElement, contents);

-	}

-

-	@SuppressWarnings("rawtypes")

-	public static String getDefaultNameWithIncrement(String prefix, EObject newElement, Collection contents) {

-		if(prefix == null) {

-			prefix = "";

-		}

-

-		return getDefaultNameWithIncrementFromBase(prefix + newElement.eClass().getName(), contents);

-	}

-

-	@SuppressWarnings("rawtypes")

-	public static String getDefaultNameWithIncrementFromBase(String base, Collection contents) {

-		if(base.equalsIgnoreCase("property")) {

-			base = "Attribute";

-		}

-		int nextNumber = 1;

-

-		for(Object o : contents) {

-			if(o instanceof EObject) {

-				String name = EMFCoreUtil.getName((EObject)o);

-				if(name != null && name.startsWith(base)) {

-					String end = name.substring(base.length());

-					int nextNumberTmp = 1;

-

-					try {

-						nextNumberTmp = Integer.parseInt(end) + 1;

-					} catch (NumberFormatException ex) {

-					}

-

-					if(nextNumberTmp > nextNumber) {

-						nextNumber = nextNumberTmp;

-					}

-				}

-			}

-		}

-

-		return base + nextNumber;

-	}

-

-	/**

-	 * Give the visibility of the {@link NamedElement} as a string, as defined in the UML2 standard.

-	 * 

-	 * @return A String representing the visibility of the {@link NamedElement}. Possible values:

-	 *         <ul>

-	 *         <li>public: <code>"+"</code>

-	 *         <li>private: <code>"-"</code>

-	 *         <li>protected: <code>"#"</code>

-	 *         <li>package: <code>"~"</code>

-	 *         </ul>

-	 */

-	public static String getVisibilityAsSign(NamedElement element) {

-		String vKindValue = "";

-

-		switch(element.getVisibility().getValue()) {

-		case org.eclipse.uml2.uml.VisibilityKind.PUBLIC:

-			vKindValue = PUBLIC_STRING;

-			break;

-		case org.eclipse.uml2.uml.VisibilityKind.PRIVATE:

-			vKindValue = PRIVATE_STRING;

-			break;

-		case org.eclipse.uml2.uml.VisibilityKind.PACKAGE:

-			vKindValue = PACKAGE_STRING;

-			break;

-		case org.eclipse.uml2.uml.VisibilityKind.PROTECTED:

-			vKindValue = PROTECTED_STRING;

-			break;

-		}

-		return vKindValue;

-	}

-

-	/**

-	 * Returns the name of an element, given its qualified name

-	 * 

-	 * @param qualifiedName

-	 *        the qualified name of the element

-	 * @return the name of the element. It shall never be <code>null</code>.

-	 */

-	public static String getNameFromQualifiedName(String qualifiedName) {

-		String name = qualifiedName.substring(qualifiedName.lastIndexOf(NamedElement.SEPARATOR) + NamedElement.SEPARATOR.length());

-		return (name != null) ? name : "";

-	}

-

-	/**

-	 * 

-	 * @param childQualifiedName

-	 *        the qualifiedName of an element

-	 * @return

-	 *         the qualified name of its parent

-	 */

-	public static String getParentQualifiedName(final String childQualifiedName) {

-		final String childName = getNameFromQualifiedName(childQualifiedName);

-		final String parentQualifiedName = childQualifiedName.substring(0, childQualifiedName.length() - (NamedElement.SEPARATOR.length() + childName.length()));

-		return (parentQualifiedName != null) ? parentQualifiedName : "";

-	}

-

-

-	public static String getName(NamedElement element) {

-		if(element.getName() != null) {

-			return element.getName();

-		} else {

-			return (NamedElementUtil.getDefaultNameWithIncrement(element));

-		}

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ObjectFlowUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ObjectFlowUtil.java
deleted file mode 100644
index 03b4d5dc2a1..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ObjectFlowUtil.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi Schnekenburger (CEA LIST) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.uml2.uml.AcceptEventAction;

-import org.eclipse.uml2.uml.Action;

-import org.eclipse.uml2.uml.Activity;

-import org.eclipse.uml2.uml.ActivityEdge;

-import org.eclipse.uml2.uml.ActivityNode;

-import org.eclipse.uml2.uml.ActivityParameterNode;

-import org.eclipse.uml2.uml.DecisionNode;

-import org.eclipse.uml2.uml.FinalNode;

-import org.eclipse.uml2.uml.ForkNode;

-import org.eclipse.uml2.uml.InitialNode;

-import org.eclipse.uml2.uml.InputPin;

-import org.eclipse.uml2.uml.JoinNode;

-import org.eclipse.uml2.uml.MergeNode;

-import org.eclipse.uml2.uml.ObjectFlow;

-import org.eclipse.uml2.uml.OpaqueAction;

-import org.eclipse.uml2.uml.OutputPin;

-import org.eclipse.uml2.uml.StructuredActivityNode;

-import org.eclipse.uml2.uml.UMLPackage;

-

-

-/**

- * Utility class for {@link ObjectFlow}

- */

-public class ObjectFlowUtil {

-	

-	/**

-	 * Return whether we can create a new object flow starting from this action by adding an intermediate output pin at it.

-	 * 

-	 * @param action

-	 *        the action to start from

-	 * @return whether action accept new output pin

-	 */

-	public static boolean canStartNewObjectFlow(Action action) {

-		// CallOperationAction and CallBehaviorAction have pre-defined pins which are all represented.

-		// SendObjectAction have only two input pins which are all represented.

-		// SendSignalAction has only pre-defined input pins which are all represented.

-		return (action instanceof OpaqueAction) || (action instanceof AcceptEventAction);

-	}

-

-	/**

-	 * Return whether we can create a new object flow ending to this action by adding an intermediate input pin at it.

-	 * 

-	 * @param action

-	 *        the action to end to

-	 * @return whether action accept new input pin

-	 */

-	public static boolean canEndNewObjectFlow(Action action) {

-		// CallOperationAction and CallBehaviorAction have pre-defined pins which are all represented.

-		// SendObjectAction have only two input pins which are all represented.

-		// SendSignalAction has only pre-defined input pins which are all represented.

-		// AcceptEventAction has no input pin

-		return action instanceof OpaqueAction;

-	}

-	

-	/**

-	 * Check condition on Object flows

-	 * @param container container of the object flow

-	 * @param linkInstance object flow itself

-	 * @param source 

-	 * @param target

-	 * @return

-	 */

-	public static boolean canExistObjectFlow(Activity container, ObjectFlow linkInstance, ActivityNode source, ActivityNode target) {

-		try {

-			if(source instanceof Action) {

-				// rule validateObjectFlow_validateNoActions

-				// rule workaround by addition of pins in case of Action

-				if(!ObjectFlowUtil.canStartNewObjectFlow((Action)source)) {

-					return false;

-				}

-			}

-			if(source instanceof InputPin) {

-				// rule validateInputPin_validateOutgoingEdgesStructuredOnly

-				if(source.getOwner() instanceof StructuredActivityNode) {

-					if(target != null && !source.getOwner().equals(target.getInStructuredNode())) {

-						return false;

-					}

-				} else {

-					return false;

-				}

-			}

-			if(source instanceof InitialNode) {

-				// rule validateInitialNode_validateControlEdges

-				return false;

-			}

-			if(source instanceof FinalNode) {

-				// rule validateFinalNode_validateNoOutgoingEdges

-				return false;

-			}

-			if(source instanceof JoinNode) {

-				// rule validateJoinNode_validateOneOutgoingEdge

-				if(!source.getOutgoings().isEmpty()) {

-					return false;

-				}

-				/*

-				 * rule validateJoinNode_validateIncomingObjectFlow :

-				 * We do not prevent creation of an outgoing ObjectFlow even if there is no incoming ObjectFlow.

-				 * We let the possibility that the user intends to add an incoming ObjectFlow later.

-				 */

-			}

-			if(source instanceof ForkNode) {

-				// rule validateForkNode_validateEdges on source Fork node

-				ActivityEdge outgoingControlFlow = source.getOutgoing(null, true, UMLPackage.eINSTANCE.getControlFlow());

-				ActivityEdge incomingControlFlow = source.getIncoming(null, true, UMLPackage.eINSTANCE.getControlFlow());

-				if(outgoingControlFlow != null || incomingControlFlow != null) {

-					// there is a ControlFlow which means there must be no ObjectFlow

-					return false;

-				}

-			}

-			if(source instanceof MergeNode) {

-				//rule validateMergeNode_validateOneOutgoingEdge

-				if(!source.getOutgoings().isEmpty()) {

-					return false;

-				}

-				// rule validateMergeNode_validateEdges on source Merge node

-				ActivityEdge outgoingControlFlow = source.getOutgoing(null, true, UMLPackage.eINSTANCE.getControlFlow());

-				ActivityEdge incomingControlFlow = source.getIncoming(null, true, UMLPackage.eINSTANCE.getControlFlow());

-				if(outgoingControlFlow != null || incomingControlFlow != null) {

-					// there is a ControlFlow which means there must be no ObjectFlow

-					return false;

-				}

-			}

-			if(source instanceof DecisionNode) {

-				// rule validateDecisionNode_validateEdges on source Decision node

-				ActivityEdge outgoingControlFlow = source.getOutgoing(null, true, UMLPackage.eINSTANCE.getControlFlow());

-				ActivityEdge incomingControlFlow = source.getIncoming(null, true, UMLPackage.eINSTANCE.getControlFlow());

-				if(outgoingControlFlow != null || incomingControlFlow != null) {

-					// there is a ControlFlow which means there must be no ObjectFlow

-					return false;

-				}

-			}

-			if(source instanceof ActivityParameterNode) {

-				// rule validateActivityParameterNode_validateIncomingOrOutgoing

-				EList<ActivityEdge> incomings = source.getIncomings();

-				if(!incomings.isEmpty()) {

-					return false;

-				}

-			}

-			if(target instanceof Action) {

-				// rule validateObjectFlow_validateNoActions

-				// rule workaround by addition of pins in case of Action

-				if(!ObjectFlowUtil.canEndNewObjectFlow((Action)target)) {

-					return false;

-				}

-			}

-			if(target instanceof OutputPin) {

-				// rule validateOutputPin_validateIncomingEdgesStructuredOnly

-				if(target.getOwner() instanceof StructuredActivityNode) {

-					if(source != null && !target.getOwner().equals(source.getInStructuredNode())) {

-						return false;

-					}

-				} else {

-					return false;

-				}

-			}

-			if(target instanceof InitialNode) {

-				// rule validateInitialNode_validateNoIncomingEdges

-				return false;

-			}

-			if(target instanceof JoinNode) {

-				// rule validateJoinNode_validateIncomingObjectFlow

-				ActivityEdge outgoingControlFlow = target.getOutgoing(null, true, UMLPackage.eINSTANCE.getControlFlow());

-				if(outgoingControlFlow != null) {

-					// the outgoing edge is a ControlFlow which means there must be no incoming ObjectFlow

-					return false;

-				}

-			}

-			if(target instanceof ForkNode) {

-				// rule validateForkNode_validateOneIncomingEdge

-				if(!target.getIncomings().isEmpty()) {

-					return false;

-				}

-				// rule validateForkNode_validateEdges on target Fork node

-				ActivityEdge outgoingControlFlow = target.getOutgoing(null, true, UMLPackage.eINSTANCE.getControlFlow());

-				ActivityEdge incomingControlFlow = target.getIncoming(null, true, UMLPackage.eINSTANCE.getControlFlow());

-				if(outgoingControlFlow != null || incomingControlFlow != null) {

-					// there is a ControlFlow which means there must be no ObjectFlow

-					return false;

-				}

-			}

-			if(target instanceof MergeNode) {

-				// rule validateMergeNode_validateEdges on target Merge node

-				ActivityEdge outgoingControlFlow = target.getOutgoing(null, true, UMLPackage.eINSTANCE.getControlFlow());

-				ActivityEdge incomingControlFlow = target.getIncoming(null, true, UMLPackage.eINSTANCE.getControlFlow());

-				if(outgoingControlFlow != null || incomingControlFlow != null) {

-					// there is a ControlFlow which means there must be no ObjectFlow

-					return false;

-				}

-			}

-			if(target instanceof DecisionNode) {

-				// rule validateDecisionNode_validateIncomingOutgoingEdges

-				if(target.getIncomings().size() >= 2) {

-					// no more than two incoming edges

-					return false;

-				}

-				// rule validateDecisionNode_validateEdges on target Decision node

-				ActivityEdge outgoingControlFlow = target.getOutgoing(null, true, UMLPackage.eINSTANCE.getControlFlow());

-				ActivityEdge incomingControlFlow = target.getIncoming(null, true, UMLPackage.eINSTANCE.getControlFlow());

-				if(outgoingControlFlow != null || incomingControlFlow != null) {

-					/*

-					 * There is a ControlFlow which means there must be no

-					 * ObjectFlow but the decision flow itself.

-					 * We let the user insert up to one ObjectFlow for being

-					 * able to select the decision flow among existing

-					 * input flows.

-					 */

-					if(target.getIncoming(null, true, UMLPackage.eINSTANCE.getObjectFlow()) != null) {

-						// there is already an object flow which is intended to become the decision flow

-						return false;

-					}

-				}

-			}

-			if(target instanceof ActivityParameterNode) {

-				// rule validateActivityParameterNode_validateIncomingOrOutgoing

-				EList<ActivityEdge> outgoings = target.getOutgoings();

-				if(!outgoings.isEmpty()) {

-					return false;

-				}

-			}

-			return true;

-		} catch (Exception e) {

-			Activator.log.error(e);

-			return false;

-		}

-	}

-

-	/**

-	 * Return whether a pin must be inserted to create a new object flow starting from this activity node.

-	 * 

-	 * @param node

-	 *        the activity node to start from

-	 * @return whether a pin must can inserted to create an object flow from this node

-	 */

-	public static boolean insertPinForStartingNewObjectFlow(ActivityNode node) {

-		if(node instanceof Action) {

-			return canStartNewObjectFlow((Action)node);

-		}

-		return false;

-	}

-

-	/**

-	 * Return whether a pin must be inserted to create a new object flow ending to this activity node.

-	 * 

-	 * @param node

-	 *        the activity node to end to

-	 * @return whether a pin must can inserted to create an object flow to this node

-	 */

-	public static boolean insertPinForEndingNewObjectFlow(ActivityNode node) {

-		if(node instanceof Action) {

-			return canEndNewObjectFlow((Action)node);

-		}

-		return false;

-	}

-

-	/**

-	 * Insert the created output pin in the parent action

-	 * 

-	 * @param parentAction

-	 *        action to insert pin in

-	 * @param outputPin

-	 *        output pin to insert

-	 */

-	public static void insertOutputPin(Action parentAction, OutputPin outputPin) {

-		if(parentAction instanceof OpaqueAction) {

-			((OpaqueAction)parentAction).getOutputValues().add(outputPin);

-		} else if(parentAction instanceof AcceptEventAction) {

-			((AcceptEventAction)parentAction).getResults().add(outputPin);

-		}

-	}

-

-	/**

-	 * Insert the created input pin in the parent action

-	 * 

-	 * @param parentAction

-	 *        action to insert pin in

-	 * @param inputPin

-	 *        input pin to insert

-	 */

-	public static void insertInputPin(Action parentAction, InputPin inputPin) {

-		if(parentAction instanceof OpaqueAction) {

-			((OpaqueAction)parentAction).getInputValues().add(inputPin);

-		}

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/OpaqueBehaviorUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/OpaqueBehaviorUtil.java
deleted file mode 100644
index 802d4dae0ce..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/OpaqueBehaviorUtil.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Iterator;

-

-import org.eclipse.uml2.uml.OpaqueBehavior;

-

-/**

- * This class encapsulates an <code>org.eclipse.uml2.uml.OpaqueBehavior</code><BR>

- */

-public class OpaqueBehaviorUtil {

-

-	/**

-	 * Gets the value of the 'Body' attribute for the <code>OpaqueBehavior</code> at the given

-	 * index.

-	 * 

-	 * @param index

-	 * 

-	 * @return the value of 'Body'at the index i

-	 */

-	// @unused

-	public static String getBody(OpaqueBehavior behavior, int index) {

-		return behavior.getBodies().get(index);

-	}

-

-	/**

-	 * Gets the value of the 'Body' attribute for the <code>OpaqueBehavior</code> for a given

-	 * language.

-	 * 

-	 * @param language

-	 *        the language in which the body is written

-	 * @return the value of 'Body' at the index i

-	 */

-	// @unused

-	public static String getBody(OpaqueBehavior behavior, String language) {

-		int index = 0;

-		String tmp = "";

-

-		index = getBodyIndex(behavior, language);

-		if((index > -1) && (index < behavior.getBodies().size())) {

-			tmp = behavior.getBodies().get(index);

-		}

-

-		return tmp;

-	}

-

-	/**

-	 * Returns the index of the body for a given langauge.

-	 * 

-	 * @param language

-	 *        the language of the body to find

-	 * @return the index of the body in the list or -1 if not found

-	 */

-	public static int getBodyIndex(OpaqueBehavior behavior, String language) {

-		int index = 0;

-		boolean isFound = false;

-

-		// test if the language exists

-		Iterator<String> it = behavior.getLanguages().iterator();

-		while(it.hasNext() && !isFound) {

-			String lang = it.next();

-			if(lang.equalsIgnoreCase(language)) {

-				isFound = true;

-			} else {

-				index++;

-			}

-		}

-		// returns -1 if not found

-		if(!isFound) {

-			index = -1;

-		}

-		return index;

-	}

-

-	/**

-	 * Sets the value of the 'Body' attribute for a given language.

-	 * 

-	 * @param value

-	 *        the new value of the 'Body'

-	 * @param language

-	 *        the langauge of the body to set

-	 */

-	// @unused

-	public static void setBody(OpaqueBehavior behavior, String value, String language) {

-		// get the index of the given language

-		int index = getBodyIndex(behavior, language);

-		if(index == -1) {

-			// this language does not exists, adds it to the end of the list

-			behavior.getLanguages().add(language);

-			behavior.getBodies().add(value);

-		} else {

-			// the language was found, change the value of the language

-			behavior.getBodies().set(index, value);

-		}

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/OpaqueExpressionUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/OpaqueExpressionUtil.java
deleted file mode 100644
index 3d6e915282a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/OpaqueExpressionUtil.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-

-/**

- * Util class for {@link OpaqueExpression}

- */

-public class OpaqueExpressionUtil {

-

-	/**

-	 * Returns the body for an OpaqueExpression for the given language

-	 * 

-	 * @param opaqueExpression

-	 *        the opaque expression to edit.

-	 * @param language

-	 *        the language in which the body is written

-	 * @return the body for the given language or the empty string if the language was not found

-	 */

-	public static String getBodyForLanguage(org.eclipse.uml2.uml.OpaqueExpression opaqueExpression, String language) {

-		String body = "";

-		if(language == null) {

-			if(!opaqueExpression.getBodies().isEmpty()) {

-				body = opaqueExpression.getBodies().get(0);

-			}

-		} else {

-			// retrieve the index of the given language in the opaque Expression

-			int index = opaqueExpression.getLanguages().indexOf(language);

-			if(index != -1) {

-				// language found. return the corresponding body in the bodies list.

-				// List should be synchronized, ie having the same size, but be sure...

-				if(index < opaqueExpression.getBodies().size()) {

-					body = opaqueExpression.getBodies().get(index);

-				}

-			}

-		}

-		return body;

-	}

-

-	/**

-	 * sets the body for an OpaqueExpression for the given language.

-	 * <p>

-	 * If the language was already defined, it replaces the corresponding body. If the language was not already defined, it adds it to the list of

-	 * languages and adds the corresponding body.

-	 * <p>

-	 * A utility method, {@link OpaqueExpression#checkAndCorrectLists(org.eclipse.uml2.uml.OpaqueExpression)} is used to correct the language and body

-	 * lists.

-	 * 

-	 * @param opaqueExpression

-	 *        the opaque expression to edit.

-	 * @param language

-	 *        the language in which the body is written

-	 * @param body

-	 *        the body to save

-	 */

-	public static void setBodyForLanguage(org.eclipse.uml2.uml.OpaqueExpression opaqueExpression, String language, String body) {

-		// checks both lists by size

-		checkAndCorrectLists(opaqueExpression);

-		// checks if language exists, if not, creates one

-		if(!opaqueExpression.getLanguages().contains(language)) {

-			opaqueExpression.getLanguages().add(language);

-			opaqueExpression.getBodies().add(body);

-		} else {

-			// retrieve the index of the given language in the opaque Expression

-			int index = opaqueExpression.getLanguages().indexOf(language);

-			// sets the body at the given index in the list of bodies.

-			opaqueExpression.getBodies().set(index, body);

-		}

-	}

-

-	/**

-	 * Checks body and languages list of an opaque expression.

-	 * <p>

-	 * It returns <code>true</code> if both lists have the same size. It returns <code>false</code> if one of the list was bigger than the other one.

-	 * In this latter case, one of the list was corrected, ie enough elements where added in the list

-	 * 

-	 * @param opaqueExpression

-	 *        the opaque expression to check

-	 * @return <code>true</code> if both lists already had the same size, <code>false</code> in

-	 *         other cases.

-	 */

-	public static boolean checkAndCorrectLists(org.eclipse.uml2.uml.OpaqueExpression opaqueExpression) {

-		// both lists, languages and bodies, should have the same size

-		final int bodySize = opaqueExpression.getBodies().size();

-		final int languageSize = opaqueExpression.getLanguages().size();

-		// check both size

-		// if equals, lists are supposed synchronized, it is ok

-		// if less body than languages, add bodies

-		// if more body, add enough languages

-		if(bodySize == languageSize) {

-			return true;

-		} else {

-			final int difference = languageSize - bodySize;

-			if(difference > 0) {

-				// more languages strings than body strings, add enough bodies

-				for(int i = 0; i < difference; i++) {

-					opaqueExpression.getBodies().add("");

-				}

-			} else {

-				// more body strings than language strings, add enough languages

-				for(int i = 0; i < (-difference); i++) {

-					opaqueExpression.getLanguages().add("");

-				}

-			}

-			// lists had to be modified, return false...

-			return false;

-		}

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/OperationUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/OperationUtil.java
deleted file mode 100644
index 7b4adf2b05d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/OperationUtil.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Iterator;

-

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Operation;

-import org.eclipse.uml2.uml.Parameter;

-import org.eclipse.uml2.uml.ParameterDirectionKind;

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Operation</code><BR>

- */

-public class OperationUtil {

-

-	/**

-	 * return the custom label of the operation, given UML2 specification and a custom style.

-	 * 

-	 * @param style

-	 *        the integer representing the style of the label

-	 * 

-	 * @return the string corresponding to the label of the operation

-	 */

-	public static String getCustomLabel(Operation operation, int style) {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append(" "); // adds " " first for correct display considerations

-

-		// visibility

-		if((style & ICustomAppearence.DISP_VISIBILITY) != 0) {

-			buffer.append(NamedElementUtil.getVisibilityAsSign(operation));

-		}

-

-		// name

-		if((style & ICustomAppearence.DISP_NAME) != 0) {

-			buffer.append(" ");

-			buffer.append(operation.getName());

-		}

-

-		// 

-		// parameters : '(' parameter-list ')'

-		buffer.append("(");

-		buffer.append(OperationUtil.getParametersAsString(operation, style));

-		buffer.append(")");

-

-		// return type

-		if((style & ICustomAppearence.DISP_RT_TYPE) != 0) {

-			buffer.append(OperationUtil.getReturnTypeAsString(operation, style));

-		}

-

-		// modifiers

-		if((style & ICustomAppearence.DISP_MOFIFIERS) != 0) {

-			String modifiers = OperationUtil.getModifiersAsString(operation);

-			if(!modifiers.equals("")) {

-				buffer.append("{");

-				buffer.append(modifiers);

-				buffer.append("}");

-			}

-		}

-		return buffer.toString();

-	}

-

-	/**

-	 * Returns return parameter label as a string, string parametrized with a style mask.

-	 * 

-	 * @param style

-	 *        the mask that indicates which element to display

-	 * @return a string containing the return parameter type

-	 */

-	private static String getReturnTypeAsString(Operation operation, int style) {

-		boolean displayType = ((style & ICustomAppearence.DISP_RT_TYPE) != 0);

-		boolean displayMultiplicity = ((style & ICustomAppearence.DISP_RT_MULTIPLICITY) != 0);

-		StringBuffer label = new StringBuffer("");

-

-		// Retrieve the return parameter (assume to be unique if defined)

-		Parameter returnParameter = OperationUtil.getReturnParameter(operation);

-		// Create the string for the return type

-		if(returnParameter == null) {

-			// no-operation: label = ""

-

-		} else if(!displayType && !displayMultiplicity) {

-			// no-operation: label = ""

-

-		} else {

-			label.append(": ");

-			if(displayType) {

-				label.append(TypedElementUtil.getTypeAsString(returnParameter));

-			}

-

-			if(displayMultiplicity) {

-				label.append(MultiplicityElementUtil.getMultiplicityAsString(returnParameter));

-			}

-		}

-		return label.toString();

-	}

-

-	/**

-	 * Returns operation parameters as a string, the label is customized using a bit mask

-	 * 

-	 * @return a string containing all parameters separated by commas

-	 */

-	private static String getParametersAsString(Operation operation, int style) {

-		StringBuffer paramString = new StringBuffer();

-		Iterator<Parameter> paramIterator = operation.getOwnedParameters().iterator();

-		boolean firstParameter = true;

-		while(paramIterator.hasNext()) {

-			Parameter parameter = paramIterator.next();

-			// Do not include return parameters

-			if(!parameter.getDirection().equals(ParameterDirectionKind.RETURN_LITERAL)) {

-

-

-

-				// get the label for this parameter

-				String parameterString = ParameterUtil.getCustomLabel(parameter, style);

-				if (!parameterString.trim().equals("")) {

-					if (!firstParameter) {

-						paramString.append(", ");

-					}

-					paramString.append(parameterString);

-					firstParameter = false;

-				}

-			}

-		}

-		return paramString.toString();

-	}

-

-	/**

-	 * Returns operation modifiers as string, separated with comma.

-	 * 

-	 * @return a string containing the modifiers

-	 */

-	private static String getModifiersAsString(Operation operation) {

-		StringBuffer buffer = new StringBuffer();

-		boolean needsComma = false;

-

-		// Return parameter modifiers

-		Parameter returnParameter = OperationUtil.getReturnParameter(operation);

-		if(returnParameter != null) {

-			// non unique parameter

-			if(!returnParameter.isUnique()) {

-				buffer.append("nonunique");

-				needsComma = true;

-			}

-

-			// return parameter has ordered values

-			if(returnParameter.isOrdered()) {

-				if(needsComma) {

-					buffer.append(", ");

-				}

-				buffer.append("ordered");

-				needsComma = true;

-			}

-		}

-

-		// is the operation a query ?

-		if(operation.isQuery()) {

-			if(needsComma) {

-				buffer.append(", ");

-			}

-			buffer.append("query");

-			needsComma = true;

-		}

-

-		// is the operation redefining another operation ?

-		Iterator<Operation> it = operation.getRedefinedOperations().iterator();

-		while(it.hasNext()) {

-			Operation currentOperation = it.next();

-			if(needsComma) {

-				buffer.append(", ");

-			}

-			buffer.append("redefines ");

-			buffer.append(currentOperation.getName());

-			needsComma = true;

-		}

-

-		// has the operation a constraint ?

-		Iterator<Constraint> it2 = operation.getOwnedRules().iterator();

-		while(it2.hasNext()) {

-			Constraint constraint = it2.next();

-			if(needsComma) {

-				buffer.append(", ");

-			}

-			if(constraint.getSpecification() != null) {

-				buffer.append(constraint.getSpecification().stringValue());

-			}

-			needsComma = true;

-		}

-

-		return buffer.toString();

-	}

-

-	/**

-	 * Gives the return parameter for this operation, or <code>null</code> if none exists.

-	 * 

-	 * @return the return parameter of the operation or <code>null</code>

-	 */

-	private static Parameter getReturnParameter(Operation operation) {

-		// Retrieve the return parameter (assume to be unique if defined)

-		Parameter returnParameter = null;

-

-		Iterator<Parameter> it = operation.getOwnedParameters().iterator();

-		while((returnParameter == null) && (it.hasNext())) {

-			Parameter parameter = it.next();

-			if(parameter.getDirection().equals(ParameterDirectionKind.RETURN_LITERAL)) {

-				returnParameter = parameter;

-			}

-		}

-		return returnParameter;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PackageUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PackageUtil.java
deleted file mode 100644
index 45a9370a0d5..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PackageUtil.java
+++ /dev/null
@@ -1,589 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008, 2009 CEA LIST.
- *
- *    
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation
- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr
- *  
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils;
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.uml2.uml.Collaboration;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.PackageImport;
-import org.eclipse.uml2.uml.PackageableElement;
-import org.eclipse.uml2.uml.Profile;
-import org.eclipse.uml2.uml.ProfileApplication;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * Utility class for <code>org.eclipse.uml2.uml.Package</code><BR>
- */
-public class PackageUtil {
-
-	/**
-	 * Apply a profile and every subprofiles to a package. Also import types defined in profile
-	 * 
-	 * @param profileToApply
-	 *        profile to apply on package
-	 * @param package_
-	 *        on which profiles are applied
-	 * @param withSubProfiles
-	 *        true if subprofiles must be automatically imported
-	 */
-	public static boolean applyProfile(org.eclipse.uml2.uml.Package package_, org.eclipse.uml2.uml.Profile profileToApply, boolean withSubProfiles) {
-
-		// Returns true if the model was modified
-		boolean isChanged = false;
-
-		// if profile is not defined abort treatment
-		if(!profileToApply.isDefined()) {
-			return isChanged;
-		}
-
-		// if same version of profile is applied do not re-apply it
-		ProfileApplication profileApplication = package_.getProfileApplication(profileToApply);
-		if(profileApplication != null) {
-
-			EPackage previous_definition = profileApplication.getAppliedDefinition();
-			EPackage new_definition = profileToApply.getDefinition();
-			if(previous_definition == new_definition) {
-				return isChanged;
-			}
-		}
-
-		// Apply main profile and import contained types
-		package_.applyProfile(profileToApply);
-		importTypes(package_, profileToApply);
-		isChanged = true;
-
-		if(withSubProfiles) {
-			// Manage sub profiles
-			List<Profile> subProfiles = new ArrayList<Profile>();
-			subProfiles = getSubProfiles(profileToApply);
-
-			Iterator<Profile> iter = subProfiles.iterator();
-			while(iter.hasNext()) {
-				Profile subProfile = iter.next();
-				package_.applyProfile(subProfile);
-				importTypes(package_, subProfile);
-			}
-		}
-
-		return isChanged;
-	}
-
-	/**
-	 * Retrieve recursively the subprofiles of package.
-	 * 
-	 * @param profile
-	 * 
-	 * @return an arrayList containing the subprofiles
-	 */
-	public static List<Profile> getSubProfiles(org.eclipse.uml2.uml.Package package_) {
-		List<Profile> subProfiles = new ArrayList<Profile>();
-
-		Iterator<Package> iter = package_.getNestedPackages().iterator();
-		while(iter.hasNext()) {
-
-			Object element = iter.next();
-			if(element instanceof Profile) {
-				Profile currentSubProfile = (Profile)element;
-				subProfiles.add(currentSubProfile);
-				subProfiles.addAll(getSubProfiles(currentSubProfile));
-			} else if(element instanceof org.eclipse.uml2.uml.Package) {
-				org.eclipse.uml2.uml.Package currentSubPackage = (org.eclipse.uml2.uml.Package)element;
-				subProfiles.addAll(getSubProfiles(currentSubPackage));
-			}
-		}
-		return subProfiles;
-	}
-
-	/**
-	 * Returns the top package of the specified element, i.e. the model or profile that is the root element
-	 * 
-	 * @return the top {@link Package} for the specified element
-	 */
-	public static Package getRootPackage(Element element) {
-		return getRootPackage(element.getNearestPackage());
-	}
-
-	/**
-	 * Returns the top package of the specified package, i.e. the model or profile that is the root element
-	 * 
-	 * @return the top {@link Package} for the specified element
-	 */
-	public static Package getRootPackage(Package package_) {
-		Element owner = package_.getOwner();
-
-		//Bug 370412: The package might not be contained in a Package 
-		//(e.g. it can be contained in a Component). Search for the nearest
-		//package, excluding self (Package#getNearestPackage() returns self)
-		while(owner != null && !(owner instanceof Package)) {
-			owner = owner.getOwner();
-		}
-
-		if(owner == null) {
-			return package_;
-		}
-
-		return getRootPackage((Package)owner);
-	}
-
-	/**
-	 * Import public type contained in the profileToApply into pkg.
-	 * 
-	 * @param profileToApply
-	 *        profile that contains type to import
-	 * @param pkg
-	 *        receive the types from profile
-	 */
-	private static void importTypes(Package pkg, Package profileToApply) {
-
-		/** import public types of the profile */
-
-		// get visible members of the profile
-		EList<PackageableElement> visibleMemb = profileToApply.visibleMembers();
-		Iterator<PackageableElement> iterator = visibleMemb.iterator();
-
-		while(iterator.hasNext()) {
-			Element elemt = iterator.next();
-
-			if(elemt instanceof Package) {
-
-				// if the package is a model library the import it
-				// in the package on which the profile is applied
-				if(((Package)elemt).isModelLibrary()) {
-					PackageImport pi = UMLFactory.eINSTANCE.createPackageImport();
-					pi.setImportedPackage((Package)elemt);
-					pkg.getPackageImports().add(pi);
-				}
-			}
-		}
-	}
-
-	/**
-	 * returns the list of the names of imported packages
-	 * 
-	 * @param pkg
-	 *        the package that has element imports
-	 * @return the list of the name of imported packages
-	 */
-	public static List<String> getImportedPackagesNames(Package pkg) {
-		List<String> packageNames = new ArrayList<String>();
-		// iterate through package imports of the given package
-		Iterator<PackageImport> importedIt = pkg.getPackageImports().iterator();
-		while(importedIt.hasNext()) {
-			PackageImport currentImport = importedIt.next();
-			// get name of the imported package and adds it to the result list
-			String currentName = currentImport.getImportedPackage().getName();
-			packageNames.add(currentName);
-		}
-		return packageNames;
-	}
-
-	/**
-	 * Removes the last definition of a profile, and in its nested profiles
-	 * 
-	 * @param thepackage
-	 *        profile to clean
-	 */
-	// @unused
-	public static void removeLastDefinition(Package thepackage) {
-		removeLastDefinition(thepackage, true);
-	}
-
-	/**
-	 * Removes the last definition of a profile
-	 * 
-	 * @param thepackage
-	 *        profile to clean
-	 * @param recursive
-	 *        boolean <code>true</code> if the clean is recursive, i.e. nested profiles must be
-	 *        clean
-	 */
-	public static void removeLastDefinition(Package thepackage, boolean recursive) {
-		// he wants to define
-		if(thepackage instanceof Profile) {
-			EPackage pak = ((Profile)thepackage).getDefinition();
-			((EAnnotation)pak.eContainer()).getContents().remove(pak);
-		}
-		if(recursive) {
-			Iterator<Package> it = thepackage.getNestedPackages().iterator();
-			while(it.hasNext()) {
-				Package p = it.next();
-				removeLastDefinition(p, recursive);
-			}
-		}
-	}
-
-	/**
-	 * Define this package if it is a profile and its sub-profiles
-	 * 
-	 * @param thePackage
-	 *        the package to define (if it is a profile)
-	 */
-	public static void defineProfiles(Package thePackage) {
-		// he wants to define
-		if(thePackage instanceof Profile) {
-			((Profile)thePackage).define();
-		}
-		Iterator<Package> it = thePackage.getNestedPackages().iterator();
-		while(it.hasNext()) {
-			Package p = it.next();
-			defineProfiles(p);
-		}
-	}
-
-	/**
-	 * Retrieve a type accessible in this Package, given its name.
-	 * 
-	 * @param name
-	 *        the name of the type to find, which must not be <code>null</code>
-	 * 
-	 * @return the type found or <code>null</code> if not found.
-	 */
-	public static Type findTypeByName(Package pack, String name) {
-		assert name != null : "Type Name should not be null";
-
-		// update method to find a type by its name
-		// 1. find the direct accessible types (in the package and the imported
-		// elements)
-		// 2. find in the subpackages and their import
-		// 3. find in all resources
-
-		Iterator<Type> it = getAccessibleTypes(pack).iterator();
-		while(it.hasNext()) {
-			Type t = it.next();
-			if(name.equals(t.getName())) {
-				return t;
-			}
-		}
-
-		Resource resource = pack.eResource();
-		ResourceSet resourceSet = null;
-		if(resource != null) {
-			resourceSet = resource.getResourceSet();
-		}
-
-		if(resourceSet != null) {
-			return findTypeByName(resourceSet, name);
-		}
-		return null;
-	}
-
-	/**
-	 * Retrieve a collaboration accessible in this Package, given its name.
-	 * 
-	 * @param name
-	 *        the name of the collaboration to find, which must not be <code>null</code>
-	 * 
-	 * @return the collaboration found or <code>null</code> if not found.
-	 */
-	public static Collaboration findCollaborationByName(Package pack, String name) {
-		assert name != null : "Collaboration Name should not be null";
-
-		// update method to find a type by its name
-		// 1. find the direct accessible types (in the package and the imported
-		// elements)
-		// 2. find in the subpackages and their import
-		// 3. find in all resources
-
-		Iterator<Collaboration> it = getAccessibleCollaborations(pack).iterator();
-		while(it.hasNext()) {
-			Collaboration t = it.next();
-			if(name.equals(t.getName())) {
-				return t;
-			}
-		}
-
-		Resource resource = pack.eResource();
-		ResourceSet resourceSet = null;
-		if(resource != null) {
-			resourceSet = resource.getResourceSet();
-		}
-
-		if(resourceSet != null) {
-			return findCollaborationByName(resourceSet, name);
-		}
-		return null;
-	}
-
-	/**
-	 * Returns a type given its name from a resource set.
-	 * 
-	 * @param resourceSet
-	 *        the resource Set
-	 * @param name
-	 *        the name of the type to find. It must not be <code>null</code>
-	 * @return the found type or <code>null</code> if the type was not found
-	 */
-	private static Type findTypeByName(ResourceSet resourceSet, String name) {
-		TreeIterator<Notifier> iterator = resourceSet.getAllContents();
-
-		while(iterator.hasNext()) {
-			Notifier notifier = iterator.next();
-			if(notifier instanceof Type) {
-				Type type = ((Type)notifier);
-				if(name.equals(type.getName())) {
-					return type;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns a collaboration given its name from a resource set.
-	 * 
-	 * @param resourceSet
-	 *        the resource Set
-	 * @param name
-	 *        the name of the collaboration to find. It must not be <code>null</code>
-	 * @return the found type or <code>null</code> if the collaboration was not found
-	 */
-	private static Collaboration findCollaborationByName(ResourceSet resourceSet, String name) {
-		TreeIterator<Notifier> iterator = resourceSet.getAllContents();
-
-		while(iterator.hasNext()) {
-			Notifier notifier = iterator.next();
-			if(notifier instanceof Collaboration) {
-				Collaboration type = ((Collaboration)notifier);
-				if(name.equals(type.getName())) {
-					return type;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns all accessible types in the model
-	 * 
-	 * @param element
-	 *        the element from which all resources can be accessed
-	 * @return the list of Types accessible in the model
-	 */
-	public static Set<Type> getAllTypes(Element element) {
-		SortedSet<Type> set = new TreeSet<Type>(new TypeNameComparator());
-
-		Resource resource = element.eResource();
-		ResourceSet resourceSet = null;
-		if(resource != null) {
-			resourceSet = resource.getResourceSet();
-		}
-
-		if(resourceSet != null) {
-			TreeIterator<Notifier> iterator = resourceSet.getAllContents();
-
-			while(iterator.hasNext()) {
-				Notifier notifier = iterator.next();
-				if(notifier instanceof Type && ((Type)notifier).getName() != null) {
-					set.add(((Type)notifier));
-				}
-			}
-		}
-		return set;
-	}
-
-	/**
-	 * Returns all accessible Collaboration in the model
-	 * 
-	 * @param element
-	 *        the element from which all resources can be accessed
-	 * @return the list of Collaboration accessible in the model
-	 */
-	public static Set<Collaboration> getAllCollaborations(Element element) {
-		SortedSet<Collaboration> set = new TreeSet<Collaboration>(new TypeNameComparator());
-
-		Resource resource = element.eResource();
-		ResourceSet resourceSet = null;
-		if(resource != null) {
-			resourceSet = resource.getResourceSet();
-		}
-
-		if(resourceSet != null) {
-			TreeIterator<Notifier> iterator = resourceSet.getAllContents();
-
-			while(iterator.hasNext()) {
-				Notifier notifier = iterator.next();
-				if(notifier instanceof Collaboration && ((Collaboration)notifier).getName() != null) {
-					set.add(((Collaboration)notifier));
-				}
-			}
-		}
-		return set;
-	}
-
-	/**
-	 * Get all possible types for an element owned by this package.
-	 * 
-	 * @return a set of all available Types
-	 */
-	public static TreeSet<Type> getAccessibleTypes(Package pack) {
-		TreeSet<Type> set = new TreeSet<Type>(new TypeNameComparator());
-		// umlTypeList is used to detect type listed twice in the proposed list
-		// this may occurs for example with indirect import of UMLPrimitiveTypes
-		// Set<String> umlTypeQNames = new HashSet<String>();
-
-		Iterator<NamedElement> it = pack.getMembers().iterator();
-		// get direct members
-		while(it.hasNext()) {
-			NamedElement element = it.next();
-			if((element instanceof Type) /*
-										 * && (!(element instanceof Relationship))
-										 */) {
-				// Check for redundant type
-				// if (!umlTypeQNames.contains(element.getQualifiedName())) {
-				// /umlTypeQNames.add(element.getQualifiedName());
-				// set.add((Type) element);
-				// }
-				set.add((Type)element);
-			}
-		}
-
-		// Recursive call on parents
-		if((pack.getOwner() != null) && (pack.getOwner() instanceof Package)) {
-
-			Iterator<Type> itParent = PackageUtil.getAccessibleTypes(pack.getNestingPackage()).iterator();
-
-			while(itParent.hasNext()) {
-				set.add(itParent.next());
-				// Type currentType = itParent.next();
-
-				// if (!umlTypeQNames.contains(currentType.getQualifiedName()))
-				// {
-				// umlTypeQNames.add(currentType.getQualifiedName());
-				// set.add(currentType);
-				// }
-			}
-		}
-
-		return set;
-	}
-
-	/**
-	 * Get all possible Collaboration owned by this package.
-	 * 
-	 * @return a set of all available Collaborations
-	 */
-	public static TreeSet<Collaboration> getAccessibleCollaborations(Package pack) {
-		TreeSet<Collaboration> set = new TreeSet<Collaboration>(new TypeNameComparator());
-
-		Iterator<NamedElement> it = pack.getMembers().iterator();
-		// Get direct members
-		while(it.hasNext()) {
-			NamedElement element = it.next();
-			if(element instanceof Collaboration) {
-
-				set.add((Collaboration)element);
-			}
-		}
-
-		// Recursive call on parents
-		if((pack.getOwner() != null) && (pack.getOwner() instanceof Package)) {
-
-			Iterator<Collaboration> itParent = PackageUtil.getAccessibleCollaborations(pack.getNestingPackage()).iterator();
-
-			while(itParent.hasNext()) {
-				set.add(itParent.next());
-			}
-		}
-
-		return set;
-	}
-
-	/**
-	 * 
-	 * 
-	 * @return returns all nested elements of a package (classes, packages, interfaces, data types,
-	 *         properties, operations) Returned elements are of type org.eclipse.uml2.uml.Element
-	 */
-	public static Set<Element> getAllNestedElements(Package thePackage) {
-		Set<org.eclipse.uml2.uml.Element> nestedElements = new HashSet<Element>();
-		Iterator<org.eclipse.uml2.uml.NamedElement> i = thePackage.getOwnedMembers().iterator();
-		org.eclipse.uml2.uml.Element currentElement;
-		while(i.hasNext()) {
-			currentElement = i.next();
-			nestedElements.add(currentElement);
-			// Package
-			if(currentElement instanceof org.eclipse.uml2.uml.Package) {
-				nestedElements.addAll((PackageUtil.getAllNestedElements((Package)currentElement)));
-			}
-			// Class
-			else if(currentElement instanceof org.eclipse.uml2.uml.Class) {
-				nestedElements.addAll(((org.eclipse.uml2.uml.Class)currentElement).getMembers());
-			}
-		}
-		return nestedElements;
-	}
-
-	/**
-	 * Load Package from a specified URI
-	 * 
-	 * @param uri
-	 *        URI of the file to load
-	 * @param set
-	 *        ResourceSet
-	 * @return the root Package
-	 */
-	public static org.eclipse.uml2.uml.Package loadPackage(URI uri, ResourceSet set) {
-
-		org.eclipse.uml2.uml.Package package_ = null;
-		Resource resource = set.getResource(uri, true);
-
-		if(resource != null) {
-			package_ = (org.eclipse.uml2.uml.Package)EcoreUtil.getObjectByType(resource.getContents(), UMLPackage.Literals.PACKAGE);
-		} else {
-			Activator.logException(new FileNotFoundException("Could not retrieve resource from URI : " + uri + "."));
-		}
-
-		return package_;
-
-	}
-
-	/**
-	 * Comparator using type names
-	 */
-	static class TypeNameComparator implements Comparator<Type> {
-
-		/**
-		 * {@inheritDoc}
-		 */
-		public int compare(Type o1, Type o2) {
-			final String o1Name = ((o1.getName() != null) ? o1.getName() : "");
-			final String o2Name = ((o2.getName() != null) ? o2.getName() : "");
-			return o1Name.compareTo(o2Name);
-		}
-
-	}
-}
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ParameterUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ParameterUtil.java
deleted file mode 100644
index ce38cf5ad51..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ParameterUtil.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import org.eclipse.uml2.uml.Parameter;

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Parameter</code><BR>

- */

-public class ParameterUtil {

-

-	/**

-	 * Returns the modifier of the property, separated by a comma, as as single line if <code>multiline</code> is <code>false</code> or as a multiline

-	 * string if <code>multiline</code> is <code>false</code>.

-	 * 

-	 * @param multiLine

-	 *        boolean that indicates if the string should have several lines when set to <code>true</code> or only one line when set to

-	 *        <code>false</code>.

-	 * 

-	 * @return a string giving all modifiers for the property

-	 */

-	public static String getModifiersAsString(Parameter parameter, boolean multiLine) {

-		StringBuffer buffer = new StringBuffer();

-		boolean needsComma = false;

-		String NL = (multiLine) ? "\n" : " ";

-

-		// Return parameter modifiers

-		if(parameter.isOrdered()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "ordered");;

-		}

-		if(parameter.isUnique()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "unique");

-		}

-		if(parameter.isException()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "exception");

-		}

-		if(parameter.isStream()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "stream");

-		}

-

-		if(!buffer.toString().equals("")) {

-			buffer.insert(0, "{");

-			buffer.append("}");

-		}

-

-		return buffer.toString();

-	}

-

-	/**

-	 * Update the modifiers string

-	 * 

-	 * @param buffer

-	 *        the existing bufferString to append

-	 * @param needsComma

-	 *        if it needs coma

-	 * @param NL

-	 *        if it is multiline

-	 * @param message

-	 *        the message top

-	 * @return true because the modifier string is no more empty

-	 */

-	private static boolean updateModifiersString(StringBuffer buffer, boolean needsComma, String NL, String message) {

-		if(needsComma) {

-			buffer.append(",");

-			buffer.append(NL);

-		}

-		buffer.append(message);

-		return true;

-	}

-

-	/**

-	 * return the full label of the Parameter.

-	 * 

-	 * @return the string corresponding to the label of the parameter

-	 */

-	public static String getLabel(Parameter parameter) {

-		StringBuffer buffer = new StringBuffer();

-		// visibility

-		buffer.append(" ");

-		buffer.append(NamedElementUtil.getVisibilityAsSign(parameter));

-

-		// direction

-		buffer.append(" ");

-		buffer.append(parameter.getDirection().getLiteral());

-

-		// name

-		buffer.append(" ");

-		if(parameter.getName() != null) {

-			buffer.append(parameter.getName());

-		}

-

-		// type

-		if(parameter.getType() != null) {

-			buffer.append(": " + parameter.getType().getName());

-		} else {

-			buffer.append(": " + TypeUtil.UNDEFINED_TYPE_NAME);

-		}

-

-		// multiplicity -> do not display [1]

-		String multiplicity = MultiplicityElementUtil.getMultiplicityAsString(parameter);

-		if(!multiplicity.trim().equals("[1]")) {

-			buffer.append(multiplicity);

-		}

-

-		// default value

-		if(parameter.getDefault() != null) {

-			buffer.append(" = ");

-			buffer.append(parameter.getDefault());

-		}

-

-		// property modifiers

-		buffer.append(ParameterUtil.getModifiersAsString(parameter, false));

-

-		return buffer.toString();

-	}

-

-	/**

-	 * return the custom label of the property, given UML2 specification and a custom style.

-	 * 

-	 * @param style

-	 *        the integer representing the style of the label

-	 * 

-	 * @return the string corresponding to the label of the property

-	 */

-	public static String getCustomLabel(Parameter parameter, int style) {

-		StringBuffer buffer = new StringBuffer();

-		// visibility

-		buffer.append(" ");

-		if((style & ICustomAppearence.DISP_VISIBILITY) != 0) {

-			buffer.append(NamedElementUtil.getVisibilityAsSign(parameter));

-		}

-

-		// direction property

-		if((style & ICustomAppearence.DISP_PARAMETER_DIRECTION) != 0) {

-			buffer.append(" ");

-			buffer.append(parameter.getDirection().getLiteral());

-		}

-

-		// name

-		if((style & ICustomAppearence.DISP_PARAMETER_NAME) != 0) {

-			buffer.append(" ");

-			buffer.append(parameter.getName());

-		}

-

-		if((style & ICustomAppearence.DISP_PARAMETER_TYPE) != 0) {

-			// type

-			if(parameter.getType() != null) {

-				buffer.append(": " + parameter.getType().getName());

-			} else {

-				buffer.append(": " + TypeUtil.UNDEFINED_TYPE_NAME);

-			}

-		}

-

-		if((style & ICustomAppearence.DISP_PARAMETER_MULTIPLICITY) != 0) {

-			// multiplicity -> do not display [1]

-			String multiplicity = MultiplicityElementUtil.getMultiplicityAsString(parameter);

-			buffer.append(multiplicity);

-		}

-

-		if((style & ICustomAppearence.DISP_PARAMETER_DEFAULT) != 0) {

-			// default value

-			if(parameter.getDefault() != null) {

-				buffer.append(" = ");

-				buffer.append(parameter.getDefault());

-			}

-		}

-

-		if((style & ICustomAppearence.DISP_MOFIFIERS) != 0) {

-			boolean multiLine = ((style & ICustomAppearence.DISP_MULTI_LINE) != 0);

-			// property modifiers

-			String modifiers = ParameterUtil.getModifiersAsString(parameter, multiLine);

-			if(!modifiers.equals("")) {

-				if(multiLine) {

-					buffer.append("\n");

-				}

-				buffer.append(modifiers);

-			}

-		}

-		return buffer.toString();

-	}

-

-	/**

-	 * Returns the default value as a String

-	 * 

-	 * @param equalSign

-	 *        boolean set to <code>true</code> if the label must have the <code>=</code> sign

-	 *        before the default value

-	 * @return the default value as a String

-	 */

-	private static String getDefaultAsString(Parameter parameter, boolean equalSign) {

-		String defaultString = "";

-		// default value

-		if((parameter.getDefault() != null) && !parameter.getDefault().equals("")) {

-			if(equalSign) {

-				defaultString += "= ";

-			}

-			defaultString += parameter.getDefault();

-		}

-		return "";

-	}

-

-	/**

-	 * Returns <code>true</code> if the given style has the given mask

-	 * 

-	 * @param style

-	 *        the style to check

-	 * @param mask

-	 *        the mask to check

-	 * @return <code>true</code> if the style has the bit mask

-	 */

-	static boolean hasStyle(int style, int mask) {

-		return ((style & mask) != 0);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PortUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PortUtil.java
deleted file mode 100644
index 009248b612c..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PortUtil.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:

- *  Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import org.eclipse.uml2.uml.Port;

-import org.eclipse.uml2.uml.Property;

-

-

-public class PortUtil extends PropertyUtil {

-	/**

-	 * return the custom label of the property, given UML2 specification and a custom style.

-	 * 

-	 * @param style

-	 *        the integer representing the style of the label

-	 * 

-	 * @return the string corresponding to the label of the property

-	 */

-	public static String getCustomLabel(Property property, int style) {

-		StringBuffer buffer = new StringBuffer();

-		// visibility

-

-		buffer.append(" ");

-		if((style & ICustomAppearence.DISP_VISIBILITY) != 0) {

-			buffer.append(NamedElementUtil.getVisibilityAsSign(property));

-		}

-

-		// derived property

-		if((style & ICustomAppearence.DISP_DERIVE) != 0) {

-			if(property.isDerived()) {

-				buffer.append("/");

-			}

-		}

-		// name

-		if((style & ICustomAppearence.DISP_NAME) != 0) {

-			buffer.append(" ");

-			buffer.append(property.getName());

-		}

-

-		if((style & ICustomAppearence.DISP_TYPE) != 0) {

-			if( (style &ICustomAppearence.DISP_CONJUGATED)!=0){

-				if( ((Port)property).isConjugated()){

-					buffer.append(": ~");

-				}

-				else{

-					buffer.append(": ");

-				}

-			}

-			else{

-				buffer.append(": ");

-			}

-			// type

-			if(property.getType() != null) {

-				buffer.append( property.getType().getName());

-			} else {

-				buffer.append( TypeUtil.UNDEFINED_TYPE_NAME);

-			}

-		}

-

-		if((style & ICustomAppearence.DISP_MULTIPLICITY) != 0) {

-			// multiplicity -> do not display [1]

-			String multiplicity = MultiplicityElementUtil.getMultiplicityAsString(property);

-			buffer.append(multiplicity);

-		}

-

-		if((style & ICustomAppearence.DISP_DFLT_VALUE) != 0) {

-			// default value

-			if(property.getDefault() != null) {

-				buffer.append(" = ");

-				buffer.append(property.getDefault());

-			}

-		}

-

-		if((style & ICustomAppearence.DISP_MOFIFIERS) != 0) {

-			boolean multiLine = ((style & ICustomAppearence.DISP_MULTI_LINE) != 0);

-			// property modifiers

-			String modifiers = PropertyUtil.getModifiersAsString(property, multiLine);

-			if(!modifiers.equals("")) {

-				if(multiLine) {

-					buffer.append("\n");

-				}

-

-				if (!buffer.toString().endsWith(" ")){					

-					buffer.append(" ");

-				}

-

-				buffer.append(modifiers);

-			}

-		}

-		return buffer.toString();

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PrimitivesTypesUtils.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PrimitivesTypesUtils.java
deleted file mode 100644
index 8d5270fe756..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PrimitivesTypesUtils.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.tools.utils;

-

-

-public class PrimitivesTypesUtils {

-

-	private PrimitivesTypesUtils() {

-		//to prevent instanciation

-	}

-

-	/** the string used for the uml boolean */

-	public static final String UML_BOOLEAN = "Boolean";//$NON-NLS-1$

-

-	/** the string used for UML integer */

-	public static final String UML_INTEGER = "Integer"; //$NON-NLS-1$

-

-	/** the string used for uml real */

-	public static final String UML_REAL = "Real"; //$NON-NLS-1$

-

-	/** the string used for UML string */

-	public static final String UML_STRING = "String"; //$NON-NLS-1$ 

-

-	/** the string used for uml unlimited natural */

-	public static final String UML_UNLIMITED_NATURAL = "UnlimitedNatural"; //$NON-NLS-1$

-

-	/** the string used for enumeration */

-	public static final String ENUMERATION = "Enumeration"; //$NON-NLS-1$

-

-	/** the string used for enumeration literal */

-	public static final String ENUMERATION_LITERAL = "EnumerationLiteral"; //$NON-NLS-1$

-

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ProfileUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ProfileUtil.java
deleted file mode 100644
index a9cd12f5589..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ProfileUtil.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2013 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms 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

- *  Christian W. Damus (CEA) - Handle dynamic profile applications in CDO

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Collection;

-import java.util.Iterator;

-import java.util.LinkedHashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.uml2.common.util.UML2Util;

-import org.eclipse.uml2.uml.Association;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * A class containing static utility method regarding UML profiles

- * 

- * @author Camille Letavernier

- * 

- */

-public class ProfileUtil {

-

-

-	/**

-	 * Checks if the profile applied has been changed since last application (definition does not match.

-	 * 

-	 * @param _package

-	 *        on which the profile is applied

-	 * @param _profile

-	 *        the applied profile

-	 * @return true if the profile has changed

-	 */

-	public static boolean isDirty(Package _package, Profile _profile) {

-		boolean isDirty = false;

-		if(_profile == null || _profile.eResource() == null) {

-			return false;

-		}

-

-		// Retrieve model resourceSet

-		ResourceSet pkge_resourceSet = _package.eResource().getResourceSet();

-

-		if(pkge_resourceSet != null) {

-

-			// Retrieve profile resource

-			URI prof_URI = _profile.eResource().getURI();

-			Resource modelResource = pkge_resourceSet.getResource(prof_URI, true);

-

-			if(modelResource != null && modelResource.getContents().get(0) instanceof Profile) {

-

-				// ckeck applied profile application definition vs profile definition referenced in file

-				Profile profileInFile = (Profile)(modelResource.getContents().get(0));

-

-				if(_package.getProfileApplication(_profile) != null) {

-					EPackage appliedProfileDefinition = _package.getProfileApplication(_profile).getAppliedDefinition();

-					EPackage fileProfileDefinition = null;

-

-					// Check profiles qualified names to ensure the correct profiles are compared

-					String appliedProfileName = _profile.getQualifiedName();

-					String fileProfileName = profileInFile.getQualifiedName();

-					if(!appliedProfileName.equals(fileProfileName)) {

-

-						// The profile must be a subprofile

-						Iterator<Profile> it = PackageUtil.getSubProfiles(profileInFile).iterator();

-						while(it.hasNext()) {

-							Profile current = it.next();

-							fileProfileName = current.getQualifiedName();

-							if(fileProfileName.equals(appliedProfileName)) {

-								profileInFile = current;

-							}

-						}

-					}

-

-					fileProfileDefinition = profileInFile.getDefinition();

-

-					// don't just test that the EPackage definitions are the

-					// same object because in the CDO context they are not, even

-					// though they are "the same package". Comparing the NSURIs

-					// should suffice

-					if ((appliedProfileDefinition == null)

-						|| (fileProfileDefinition == null)

-						|| !UML2Util.safeEquals(

-							appliedProfileDefinition.getNsURI(),

-							fileProfileDefinition.getNsURI())) {

-						

-						isDirty = true;

-					}

-				}

-

-			}

-		}

-

-

-

-		return isDirty;

-	}

-

-	public static List<Stereotype> findAllSubStereotypes(Stereotype parentStereotype, Package umlPackage, boolean concreteOnly) {

-		Collection<Stereotype> result = new LinkedHashSet<Stereotype>();

-

-		for(Profile profile : umlPackage.getAllAppliedProfiles()) {

-			List<Stereotype> allStereotypes = new LinkedList<Stereotype>();

-			findAllStereotypes(profile, allStereotypes);

-			for(Stereotype stereotype : allStereotypes) {

-				if(concreteOnly && stereotype.isAbstract()) {

-					continue; //Skip abstract stereotypes

-				}

-

-				if(isSubStereotype(parentStereotype, stereotype)) {

-					result.add(stereotype);

-				}

-			}

-

-		}

-

-		return new LinkedList<Stereotype>(result);

-	}

-

-	public static boolean isSubStereotype(Stereotype parentStereotype, Stereotype childStereotype) {

-		if(parentStereotype == childStereotype) {

-			return true;

-		}

-		return childStereotype.getGenerals().contains(parentStereotype); //TODO : This is probably not recursive...

-	}

-

-	/**

-	 * Finds recursively all stereotypes contained in this profile

-	 * 

-	 * @param profile

-	 * 

-	 * @param result

-	 */

-	public static void findAllStereotypes(Profile profile, List<Stereotype> result) {

-		for(Stereotype stereotype : profile.getOwnedStereotypes()) {

-			result.add(stereotype);

-		}

-		for(Package subPackage : profile.getNestedPackages()) {

-			if(subPackage instanceof Profile) {

-				Profile subProfile = (Profile)subPackage;

-				findAllStereotypes(subProfile, result);

-			}

-		}

-	}

-

-	private static EPackage umlMetamodel = UMLPackage.eINSTANCE;

-

-	public static List<EClass> getAllExtendedMetaclasses(Stereotype stereotype, boolean concreteClassesOnly) {

-		List<Class> extendedMetaclasses = stereotype.getAllExtendedMetaclasses();

-		Set<EClass> allMetaclasses = new LinkedHashSet<EClass>();

-		for(Class extendedMetaclass : extendedMetaclasses) {

-			EClass UMLEClass = findEClass(extendedMetaclass);

-			allMetaclasses.addAll(EMFHelper.getSubclassesOf(UMLEClass, concreteClassesOnly));

-		}

-

-		return new LinkedList<EClass>(allMetaclasses);

-	}

-

-	private static EClass findEClass(Class metaclass) {

-		for(EClassifier classifier : umlMetamodel.getEClassifiers()) {

-			if(classifier instanceof EClass) {

-				if(classifier.getName().equals(metaclass.getName())) {

-					return (EClass)classifier;

-				}

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Searchs the association containing a member end matching the given name

-	 * in the given stereotype, and returns it if it is typed by a stereotype

-	 * 

-	 * TODO : This method can probably be used in a single specific case and should probably not be here

-	 * 

-	 * @param stereotype

-	 * @param associationName

-	 * @return

-	 */

-	public static Property findStereotypedProperty(Stereotype stereotype, String associationName) {

-		//associations loop

-		associations: for(Association association : stereotype.getAssociations()) {

-			//memberEnds loop

-			for(Property memberEnd : association.getMemberEnds()) {

-				if(memberEnd.getType() == stereotype) {

-					//oppositeEnds loop

-					for(Property oppositeEnd : association.getMemberEnds()) {

-						if(oppositeEnd != memberEnd && oppositeEnd.getName().equals(associationName) && !association.getOwnedEnds().contains(oppositeEnd)) {

-							if(oppositeEnd.getType() instanceof Stereotype) {

-								return oppositeEnd;

-							}

-							break associations; //break the three loops

-						}

-					}

-				}

-			}

-		}

-

-		//FIXME : Do we really need to browse associations first ?

-

-		//Search for properties which are not associations

-		for(Property property : stereotype.getAllAttributes()) {

-			if(property.getName().equals(associationName)) {

-				if(property.getType() instanceof Stereotype) {

-					return property;

-				}

-			}

-		}

-

-		return null;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PropertyUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PropertyUtil.java
deleted file mode 100644
index 554e42e9feb..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PropertyUtil.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Property;

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Property</code><BR>

- */

-public class PropertyUtil {

-

-	/**

-	 * Get all properties that can be subset by this {@link Property} checks the type and the

-	 * multiplicity.

-	 * 

-	 * @param property

-	 *        property for which the list of subsettable properties are made

-	 * @param noCheck

-	 *        set this parameter to <code>true</code> if multiplicity and type check should be

-	 *        made for the computation

-	 * @return all properties that can be subset

-	 */

-	public static List<Property> getSubsettablesProperties(Property property, boolean noCheck) {

-		List<Property> list = new ArrayList<Property>();

-

-		// subset properties:

-		Iterator<NamedElement> it = property.getClass_().getMembers().iterator();

-		while(it.hasNext()) {

-

-			NamedElement element = it.next();

-			if(element instanceof Property) {

-				boolean isValid = true;

-				Property subsettableProperty = (Property)element;

-

-				// check it is not itself....

-				if(subsettableProperty.equals(property)) {

-					isValid = false;

-				}

-

-				// check types conformity

-				if(!noCheck) {

-					if(property.getType() != null && subsettableProperty.getType() != null) {

-						if(!property.getType().conformsTo(subsettableProperty.getType())) {

-							isValid = false;

-						}

-					} else {

-						isValid = false;

-					}

-

-					// check multiplicity (only upper bound has an OCL rule)

-					if((subsettableProperty.getUpper() != -1) && (property.getUpper() > subsettableProperty.getUpper())) {

-						isValid = false;

-					}

-				}

-

-				if(isValid) {

-					list.add(subsettableProperty);

-				}

-			}

-		}

-		return list;

-	}

-

-	/**

-	 * Find a subsetted property given its name and a context to find it.

-	 * 

-	 * @param name

-	 *        the name of the property

-	 * @return the property found or <code>null</code> if the element was not found.

-	 */

-	// @unused

-	public static Property findSusbsettedPropertyByName(String propertyName, Property property, boolean noCheck) {

-		Iterator<Property> it = PropertyUtil.getSubsettablesProperties(property, true).iterator();

-		while(it.hasNext()) {

-			Property tmpProperty = it.next();

-			String tmpPropertyName = tmpProperty.getName();

-			if(tmpPropertyName != null && propertyName.equals(tmpPropertyName.trim())) {

-				return tmpProperty;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Get all properties that can be redefined by this {@link Property}.

-	 * 

-	 * @return all properties that can be redefined

-	 */

-	public static List<Property> getRedefinableProperties(Property property) {

-		List<Property> list = new ArrayList<Property>();

-

-		// redefine-able properties:

-		Iterator<NamedElement> it = property.getClass_().getInheritedMembers().iterator();

-		while(it.hasNext()) {

-			NamedElement element = it.next();

-			if(element instanceof Property) {

-				list.add((Property)element);

-			}

-		}

-

-		// adds also already redefined members. In fact, when properties are

-		// redefined, they

-		// disappear from the inherited members list

-		Iterator<Property> it2 = property.getRedefinedProperties().iterator();

-		while(it2.hasNext()) {

-			Property element = it2.next();

-			list.add(element);

-		}

-		return list;

-	}

-

-	/**

-	 * Find a redefined property given its name and a context to find it.

-	 * 

-	 * @param name

-	 *        the name of the property

-	 * @return the property found or <code>null</code> if the element was not found.

-	 */

-	public static Property findRedefinedPropertyByName(String propertyName, Property property) {

-		Iterator<Property> it = PropertyUtil.getRedefinableProperties(property).iterator();

-		while(it.hasNext()) {

-			Property tmpProperty = it.next();

-			String tmpPropertyName = tmpProperty.getName();

-			if(tmpPropertyName != null && propertyName.equals(tmpPropertyName.trim())) {

-				return tmpProperty;

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * Get the displayed string for the derived attribute of the property.

-	 * 

-	 * @param property

-	 *        the property

-	 * @return If the property is derived, return "/". Otherwise return an empty String

-	 */

-	public static String getDerived(Property property) {

-		return property.isDerived() ? "/" : "";

-	}

-

-	/**

-	 * return the full label of the property, given UML2 specification.

-	 * 

-	 * @return the string corresponding to the label of the property

-	 */

-	public static String getLabel(Property property) {

-		StringBuffer buffer = new StringBuffer();

-		// visibility

-		buffer.append(" ");

-		buffer.append(NamedElementUtil.getVisibilityAsSign(property));

-

-		// derived property

-		buffer.append(getDerived(property));

-

-		// name

-		buffer.append(" ");

-		buffer.append(getName(property));

-

-		// type

-		if(property.getType() != null) {

-			buffer.append(" : " + property.getType().getName());

-		} else {

-			buffer.append(" : " + TypeUtil.UNDEFINED_TYPE_NAME);

-		}

-

-		// multiplicity -> do not display [1]

-		String multiplicity = MultiplicityElementUtil.getMultiplicityAsString(property);

-		if(!multiplicity.trim().equals("[1]")) {

-			buffer.append(multiplicity);

-		}

-

-		// default value

-		if(property.getDefault() != null) {

-			buffer.append(" = ");

-			buffer.append(property.getDefault());

-		}

-

-		// property modifiers

-		buffer.append(PropertyUtil.getModifiersAsString(property, false));

-

-		return buffer.toString();

-	}

-

-	public static String getName(Property property) {

-		if(property.getName() != null) {

-			return property.getName();

-		} else {

-			return (NamedElementUtil.getDefaultNameWithIncrement(property));

-		}

-	}

-

-	/**

-	 * return the custom label of the property, given UML2 specification and a custom style.

-	 * 

-	 * @param style

-	 *        the integer representing the style of the label

-	 * 

-	 * @return the string corresponding to the label of the property

-	 */

-	public static String getCustomLabel(Property property, int style) {

-		StringBuffer buffer = new StringBuffer();

-		// visibility

-

-		buffer.append(" ");

-		if((style & ICustomAppearence.DISP_VISIBILITY) != 0) {

-			buffer.append(NamedElementUtil.getVisibilityAsSign(property));

-		}

-

-		// derived property

-		if((style & ICustomAppearence.DISP_DERIVE) != 0) {

-			if(property.isDerived()) {

-				buffer.append("/");

-			}

-		}

-		// name

-		if((style & ICustomAppearence.DISP_NAME) != 0) {

-			buffer.append(" ");

-			buffer.append(property.getName());

-		}

-

-		if((style & ICustomAppearence.DISP_TYPE) != 0) {

-			// type

-			if(property.getType() != null) {

-				buffer.append(": " + property.getType().getName());

-			} else {

-				buffer.append(": " + TypeUtil.UNDEFINED_TYPE_NAME);

-			}

-		}

-

-		if((style & ICustomAppearence.DISP_MULTIPLICITY) != 0) {

-			// multiplicity -> do not display [1]

-			String multiplicity = MultiplicityElementUtil.getMultiplicityAsString(property);

-			buffer.append(multiplicity);

-		}

-

-		if((style & ICustomAppearence.DISP_DFLT_VALUE) != 0) {

-			// default value

-			if(property.getDefault() != null) {

-				buffer.append(" = ");

-				buffer.append(property.getDefault());

-			}

-		}

-

-		if((style & ICustomAppearence.DISP_MOFIFIERS) != 0) {

-			boolean multiLine = ((style & ICustomAppearence.DISP_MULTI_LINE) != 0);

-			// property modifiers

-			String modifiers = PropertyUtil.getModifiersAsString(property, multiLine);

-			if(!modifiers.equals("")) {

-				if(multiLine) {

-					buffer.append("\n");

-				}

-				

-				if (!buffer.toString().endsWith(" ")){					

-					buffer.append(" ");

-				}

-				

-				buffer.append(modifiers);

-			}

-		}

-		return buffer.toString();

-	}

-

-	/**

-	 * Returns the modifier of the property, separated by a comma, as as single line if <code>multiline</code> is <code>false</code> or as a multiline

-	 * string if <code>multiline</code> is <code>false</code>.

-	 * 

-	 * @param multiLine

-	 *        boolean that indicates if the string should have several lines when set to <code>true</code> or only one line when set to

-	 *        <code>false</code>.

-	 * 

-	 * @return a string giving all modifiers for the property

-	 */

-	public static String getModifiersAsString(Property property, boolean multiLine) {

-		StringBuffer buffer = new StringBuffer();

-		boolean needsComma = false;

-		String NL = (multiLine) ? "\n" : " ";

-

-		// Return property modifiers

-		if(property.isReadOnly()) {

-			buffer.append("readOnly");

-			needsComma = true;

-		}

-		if(property.isDerivedUnion()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "union");

-		}

-		if(property.isOrdered()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "ordered");;

-		}

-		if(property.isUnique()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "unique");

-		}

-

-		// is the property redefining another property ?

-		for(Property current : property.getRedefinedProperties()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "redefines ");

-			buffer.append(current.getName());

-		}

-

-		// is the property subsetting another property ?

-		for(Property current : property.getSubsettedProperties()) {

-			needsComma = updateModifiersString(buffer, needsComma, NL, "subsets ");

-			buffer.append(current.getName());

-		}

-

-		if(!buffer.toString().equals("")) {

-			buffer.insert(0, "{");

-			buffer.append("}");

-		}

-

-		return buffer.toString();

-	}

-

-	/**

-	 * Update the modifiers string

-	 * 

-	 * @param buffer

-	 *        the existing bufferString to append

-	 * @param needsComma

-	 *        if it needs coma

-	 * @param NL

-	 *        if it is multiline

-	 * @param message

-	 *        the message top

-	 * @return true because the modifier string is no more empty

-	 */

-	private static boolean updateModifiersString(StringBuffer buffer, boolean needsComma, String NL, String message) {

-		if(needsComma) {

-			buffer.append(",");

-			buffer.append(NL);

-		}

-		buffer.append(message);

-		return true;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/SignalUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/SignalUtil.java
deleted file mode 100644
index aff8f747f3d..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/SignalUtil.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Atos Origin - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Signal;

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Signal</code><BR>

- */

-public class SignalUtil {

-

-	/**

-	 * return the custom label of the signal, given UML2 specification and a custom style.

-	 * 

-	 * @param style

-	 *        the integer representing the style of the label

-	 * 

-	 * @return the string corresponding to the label of the signal

-	 */

-	public static String getCustomLabel(Signal signal, int style) {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append(" "); // adds " " first for correct display considerations

-

-		// visibility

-		if((style & ICustomAppearence.DISP_VISIBILITY) != 0) {

-			buffer.append(NamedElementUtil.getVisibilityAsSign(signal));

-		}

-

-		// name

-		if((style & ICustomAppearence.DISP_NAME) != 0) {

-			buffer.append(" ");

-			buffer.append(signal.getName());

-		}

-

-		// 

-		// parameters : '(' parameter-list ')'

-		buffer.append("(");

-		buffer.append(getPropertiesAsString(signal, style));

-		buffer.append(")");

-

-		return buffer.toString();

-	}

-

-	/**

-	 * Returns signal properties as a string, the label is customized using a bit mask

-	 * 

-	 * @return a string containing all properties separated by commas

-	 */

-	private static String getPropertiesAsString(Signal signal, int style) {

-		StringBuffer propertiesString = new StringBuffer();

-		boolean firstProperty = true;

-		for(Property property : signal.getOwnedAttributes()) {

-			// get the label for this property

-			String propertyString = PropertyUtil.getCustomLabel(property, style);

-			if(!propertyString.trim().equals("")) {

-				if(!firstProperty) {

-					propertiesString.append(", ");

-				}

-				propertiesString.append(propertyString);

-				firstProperty = false;

-			}

-		}

-		return propertiesString.toString();

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/StereotypeUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/StereotypeUtil.java
deleted file mode 100644
index 0b8c9b140e3..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/StereotypeUtil.java
+++ /dev/null
@@ -1,686 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2008 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.tools.utils;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
-import org.eclipse.uml2.uml.Association;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.EnumerationLiteral;
-import org.eclipse.uml2.uml.Extension;
-import org.eclipse.uml2.uml.Image;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.util.UMLUtil;
-
-/**
- * Utility class for Stereotypes.
- */
-public class StereotypeUtil {
-
-	protected static final String QUOTE = "\"";
-
-	protected static final String SPACE_SEPARATOR = "#";
-
-	protected static final String EQUAL_SEPARATOR = "=";
-
-	protected static final String PROPERTY_VALUE_SEPARATOR = "|";
-
-	protected static final String SETREOTYPE_WITH_VALUE_SEPARATOR = ";";
-
-	protected static final String ST_LEFT = String.valueOf("\u00AB");
-
-	protected static final String ST_RIGHT = String.valueOf("\u00BB");
-
-	public static final String BASE_PREFIX = "base_"; //$NON-NLS-N$
-
-	/**
-	 * returns the list of all super stereotypes for the specified stereotype
-	 *
-	 * @param stereotype
-	 *        the stereotype for which super-stereotypes are looked for.
-	 * @return the list of all stereotypes from which the specified stereotype inherits
-	 */
-	public static List<Stereotype> getAllSuperStereotypes(Stereotype stereotype) {
-		List<Stereotype> generalStereotypes = new ArrayList<Stereotype>();
-		for(Classifier generalClassifier : stereotype.getGenerals()) {
-			if(generalClassifier instanceof Stereotype) {
-				generalStereotypes.add((Stereotype)generalClassifier);
-				generalStereotypes.addAll(getAllSuperStereotypes((Stereotype)generalClassifier));
-			}
-		}
-		return generalStereotypes;
-	}
-
-	/**
-	 * Parse the stereotype image and select those that have an "icon" kind (EAnnotation).
-	 *
-	 * @param stereotype
-	 *        to parse
-	 *
-	 * @return a EList of {@link Image}
-	 */
-	public static EList<Image> getIcons(Stereotype stereotype) {
-
-		EList<Image> icons = new BasicEList<Image>();
-
-		Iterator<Image> it = stereotype.getIcons().iterator();
-		while(it.hasNext()) {
-			Image image = it.next();
-			if("icon".equals(ImageUtil.getKind(image))) {
-				icons.add(image);
-			}
-		}
-
-		return icons;
-	}
-
-	/**
-	 * Returns the list of names (not qualified) of properties to display.
-	 *
-	 * @param stereotype
-	 * @param stPropList
-	 *
-	 * @return
-	 */
-	private static List<String> getStereoPropertiesToDisplay(org.eclipse.uml2.uml.Stereotype stereotype, List<String> stPropList) {
-		ArrayList<String> result = new ArrayList<String>();
-
-		Iterator<String> propIter = stPropList.iterator();
-		while(propIter.hasNext()) {
-			String currentProp = propIter.next();
-			if(currentProp.substring(0, currentProp.lastIndexOf(".")).equals(stereotype.getQualifiedName())) {
-				result.add(currentProp.substring(currentProp.lastIndexOf(".") + 1, currentProp.length()));
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * return string that contains value of properties of applied stereotype
-	 *
-	 * @param stereotypesPropertiesToDisplay
-	 *        list of properties of stereotype to display grammar=
-	 *        {<B>stereotypequalifiedName</B>'.'<B>propertyName</B>','}*
-	 *
-	 * @return a string withe the following grammar grammar=
-	 *         {'\u00AB'<B>StereotypeName</B>'\u00BB''#'
-	 *         {<B>propertyName</B>'='<B>propertyValue</B>'|'}*';'}*
-	 */
-	public static String getPropertiesValues(String stereotypesPropertiesToDisplay, Element umlElement) {
-		HashSet<org.eclipse.uml2.uml.Stereotype> stereoSet = new HashSet<org.eclipse.uml2.uml.Stereotype>();
-		ArrayList<String> stPropList = new ArrayList<String>();
-
-		String propValues = "";
-
-		// fill our data structure in order to generate the string
-		StringTokenizer propStringTokenizer = new StringTokenizer(stereotypesPropertiesToDisplay, ",");
-		while(propStringTokenizer.hasMoreElements()) {
-			// extract property to display
-			String propertyQN = propStringTokenizer.nextToken();
-			// stereotype
-			String stereotypeQN = propertyQN.substring(0, propertyQN.indexOf("."));
-
-			Stereotype stereotype = umlElement.getAppliedStereotype(stereotypeQN);
-			if(stereotype != null) {
-				stereoSet.add(stereotype);
-			}
-			stPropList.add(propertyQN);
-		}
-
-		// Display each stereotype
-		Iterator<org.eclipse.uml2.uml.Stereotype> stereoIter = stereoSet.iterator();
-		while(stereoIter.hasNext()) {
-			org.eclipse.uml2.uml.Stereotype stereotype = stereoIter.next();
-			// display the stereotype
-			propValues = propValues + ST_LEFT + stereotype.getName() + ST_RIGHT + SPACE_SEPARATOR;
-			// get the set of property to display
-			Iterator<String> stPropIter = getStereoPropertiesToDisplay(stereotype, stPropList).iterator();
-
-			// display each property
-			while(stPropIter.hasNext()) {
-				String stProp = stPropIter.next();
-				// get the property
-				org.eclipse.uml2.uml.Property currentProp = getPropertyByName(stereotype, stProp);
-
-				if(currentProp == null) {
-					return "No value";
-				}
-				propValues += displayPropertyValue(stereotype, currentProp, umlElement, PROPERTY_VALUE_SEPARATOR);
-			}// display each property
-			if(propValues.endsWith(PROPERTY_VALUE_SEPARATOR)) {
-				propValues = propValues.substring(0, propValues.lastIndexOf(PROPERTY_VALUE_SEPARATOR));
-			}
-			propValues = propValues + SETREOTYPE_WITH_VALUE_SEPARATOR;
-		}// end display each property
-
-		return propValues;
-	}
-
-	/**
-	 * Computes the display of a property value.
-	 *
-	 * @param stereotype
-	 *        the stereotype that contains the property to be displayed
-	 * @param property
-	 *        the property to be displayed
-	 * @param umlElement
-	 *        the element that is stereotyped by the specified
-	 * @param separator
-	 *        the separator between each property value, in case several properties are
-	 *        displayed for the same property
-	 * @return a string corresponding to the property value
-	 */
-	public static String displayPropertyValue(Stereotype stereotype, Property property, Element umlElement, String separator) {
-		org.eclipse.uml2.uml.Type propType = property.getType();
-
-		// property type is an enumeration
-		if(propType instanceof org.eclipse.uml2.uml.Enumeration) {
-			return getPropertyValueForEnumerationType(property, stereotype, umlElement, EQUAL_SEPARATOR, separator);
-		}
-
-		// property type is a metaclass
-		else if((propType instanceof org.eclipse.uml2.uml.Class) && (propType.getAppliedStereotypes() != null) && (propType.getAppliedStereotypes().size() > 0) && propType.getAppliedStereotypes().get(0).getName().equals("Metaclass")) {
-			return getPropertyValueForMetaclassType(property, stereotype, umlElement, EQUAL_SEPARATOR, separator,false);
-		}
-		// property type is a stereotype
-		else if(propType instanceof org.eclipse.uml2.uml.Stereotype) {
-			return getPropertyValueForStereotypeType(property, stereotype, umlElement, EQUAL_SEPARATOR, separator,false);
-		}
-		// property is a composite class
-		else if((propType instanceof org.eclipse.uml2.uml.Class) && !(propType instanceof org.eclipse.uml2.uml.Stereotype) && property.isComposite()) {
-			return /* FIXME stProp + */property.getName() + EQUAL_SEPARATOR + property.getName() + separator;
-		}
-
-		// otherwise
-		else {
-			return getPropertyValue(property, stereotype, umlElement, EQUAL_SEPARATOR, separator,false);
-		}
-	}
-
-
-
-	/**
-	 * Computes the display of a property value.
-	 *
-	 * @param stereotype
-	 *        the stereotype that contains the property to be displayed
-	 * @param property
-	 *        the property to be displayed
-	 * @param umlElement
-	 *        the element that is stereotyped by the specified
-	 * @param separator
-	 *        the separator between each property value, in case several properties are
-	 *        displayed for the same property
-	 * @return a string corresponding to the property value
-	 */
-	public static String displayPropertyValueToEdit(Stereotype stereotype, Property property, Element umlElement, String separator) {
-		org.eclipse.uml2.uml.Type propType = property.getType();
-
-		// property type is an enumeration
-		if(propType instanceof org.eclipse.uml2.uml.Enumeration) {
-			return getPropertyValueForEnumerationType(property, stereotype, umlElement, EQUAL_SEPARATOR, separator);
-		}
-
-		// property type is a metaclass
-		else if((propType instanceof org.eclipse.uml2.uml.Class) && (propType.getAppliedStereotypes() != null) && (propType.getAppliedStereotypes().size() > 0) && propType.getAppliedStereotypes().get(0).getName().equals("Metaclass")) {
-			return getPropertyValueForMetaclassType(property, stereotype, umlElement, EQUAL_SEPARATOR, separator,true);
-		}
-		// property type is a stereotype
-		else if(propType instanceof org.eclipse.uml2.uml.Stereotype) {
-			return getPropertyValueForStereotypeType(property, stereotype, umlElement, EQUAL_SEPARATOR, separator,true);
-		}
-		// property is a composite class
-		else if((propType instanceof org.eclipse.uml2.uml.Class) && !(propType instanceof org.eclipse.uml2.uml.Stereotype) && property.isComposite()) {
-			return /* FIXME stProp + */property.getName() + EQUAL_SEPARATOR + property.getName() + separator;
-		}
-		// otherwise
-		else {
-			return getPropertyValue(property, stereotype, umlElement, EQUAL_SEPARATOR, separator, true);
-		}
-	}
-
-	/**
-	 * Retrieves a property of the specified stereotype, given its name
-	 *
-	 * @param stereotype
-	 *        the stereotype owner of the property
-	 * @param propertyName
-	 *        the name of the property to find
-	 */
-	public static Property getPropertyByName(Stereotype stereotype, String propertyName) {
-		Iterator<Property> iterPro = stereotype.getAllAttributes().iterator();
-		// from a string look for the property
-		while(iterPro.hasNext()) {
-			org.eclipse.uml2.uml.Property tmpProperty = iterPro.next();
-			String name = "";
-			if(tmpProperty != null) {
-				name = (tmpProperty.getName() != null) ? tmpProperty.getName() : "";
-			}
-			if(name.equals(propertyName)) {
-				return tmpProperty;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * return string that contains value of properties of applied stereotype
-	 *
-	 * @param stereotypesPropertiesToDisplay
-	 *        list of properties of stereotype to display grammar=
-	 *        {<B>stereotypequalifiedName</B>'.'<B>propertyName</B>','}*
-	 *
-	 * @return a string with the following grammar grammar=
-	 *         {(<B>propertyName</B>'='<B>propertyValue</B>',')*
-	 *         <B>propertyName</B>'='<B>propertyValue</B>'}
-	 */
-	public static String getPropertiesValuesInBrace(String stereotypesPropertiesToDisplay, Element umlElement) {
-		String propertyValues = "";
-
-		HashSet<org.eclipse.uml2.uml.Stereotype> stereoSet = new HashSet<org.eclipse.uml2.uml.Stereotype>();
-		ArrayList<String> stPropList = new ArrayList<String>();
-
-		// fill our data structure in order to generate the string
-		StringTokenizer propStringTokenizer = new StringTokenizer(stereotypesPropertiesToDisplay, ",");
-		while(propStringTokenizer.hasMoreElements()) {
-			// extract property to display
-			String propertyQN = propStringTokenizer.nextToken();
-			// stereotype
-			String stereotypeQN = propertyQN.substring(0, propertyQN.indexOf("."));
-
-			Stereotype stereotype = umlElement.getAppliedStereotype(stereotypeQN);
-			if(stereotype != null) {
-				stereoSet.add(stereotype);
-			}
-
-			stPropList.add(propertyQN);
-		}
-
-		// Display each stereotype
-		Iterator<org.eclipse.uml2.uml.Stereotype> stereoIter = stereoSet.iterator();
-		while(stereoIter.hasNext()) {
-			Stereotype stereotype = stereoIter.next();
-			if(stereotype != null) {
-				propertyValues += displayPropertyValuesForStereotype(stereotype, stPropList, umlElement);
-			}
-		}
-		return propertyValues;
-	}
-
-	public static String displayPropertyValuesForStereotype(Stereotype stereotype, List<String> stPropList, Element umlElement) {
-		StringBuffer buffer = new StringBuffer();
-
-		// add stereotype name. For "In Brace", display nothing
-		buffer.append("");
-		// get the set of property to display
-		Iterator<String> stPropIter = getStereoPropertiesToDisplay(stereotype, stPropList).iterator();
-
-		// display each property
-		while(stPropIter.hasNext()) {
-			String stProp = stPropIter.next();
-			// get the property
-			org.eclipse.uml2.uml.Property currentProp = null;
-			Iterator<Property> iterPro = stereotype.getAllAttributes().iterator();
-			// from a string look for the property
-			while(iterPro.hasNext()) {
-				org.eclipse.uml2.uml.Property tmpProperty = iterPro.next();
-				if(stProp.equals(tmpProperty.getName())) {
-					currentProp = tmpProperty;
-				}
-			}
-
-			if(currentProp == null) {
-				return "No value";
-			}
-			org.eclipse.uml2.uml.Type propType = currentProp.getType();
-
-			// property type is an enumeration
-
-			if(propType instanceof org.eclipse.uml2.uml.Enumeration) {
-				buffer.append(getPropertyValueForEnumerationType(currentProp, stereotype, umlElement, EQUAL_SEPARATOR, ","));
-			}
-
-			// property type is a metaclass
-			else if((propType instanceof org.eclipse.uml2.uml.Class) && (propType.getAppliedStereotypes() != null) && (propType.getAppliedStereotypes().size() > 0) && propType.getAppliedStereotypes().get(0).getName().equals("Metaclass")) {
-				buffer.append(getPropertyValueForMetaclassType(currentProp, stereotype, umlElement, EQUAL_SEPARATOR, ",",false));
-			}
-
-			// property type is a stereotype
-			else if(propType instanceof org.eclipse.uml2.uml.Stereotype) {
-				buffer.append(getPropertyValueForStereotypeType(currentProp, stereotype, umlElement, EQUAL_SEPARATOR, ",",false));
-			}
-
-			// property is a composite class
-			else if((propType instanceof org.eclipse.uml2.uml.Class) && !(propType instanceof org.eclipse.uml2.uml.Stereotype) && currentProp.isComposite()) {
-				buffer.append(stProp + EQUAL_SEPARATOR + currentProp.getName() + ",");
-			}
-
-			// otherwise
-			else {
-				buffer.append(getPropertyValue(currentProp, stereotype, umlElement, EQUAL_SEPARATOR, ",",false));
-			}
-		}// display each property
-
-		String propValues = buffer.toString();
-		if(propValues.endsWith(",")) {
-			propValues = propValues.substring(0, propValues.lastIndexOf(","));
-		}
-
-		return propValues;
-	}
-
-	/**
-	 * return the string that represents the value of property when its type is an Enumeration
-	 *
-	 * @param property
-	 *        the property to display
-	 * @param stereotype
-	 *        the stereotype that contains the property
-	 * @param umlElement
-	 *        the umlelement on which the stereotype is applied
-	 * @param EQUAL_SEPARATOR
-	 *        the separator between property and property value
-	 * @param PROPERTY_VALUE_SEPARATOR
-	 *        the separator to end the exprestion
-	 * @return String withe the following grammar propertyname EQUAL_SEPERATOR propertyValue
-	 *         PROPERTY_VALUE_SEPERATOR
-	 */
-	private static String getPropertyValueForEnumerationType(Property property, Stereotype stereotype, Element umlElement, final String EQUAL_SEPARATOR, final String PROPERTY_VALUE_SEPARATOR) {
-		String out = "";
-		if((property.getUpper() == 1) && (umlElement.getValue(stereotype, property.getName()) != null)) {
-			if((property.getLower() != 0) || umlElement.getValue(stereotype, property.getName()) != null) {
-				if(property.isSetDefault() || umlElement.getValue(stereotype, property.getName()) != null) {
-					Object val = umlElement.getValue(stereotype, property.getName());
-					if (val instanceof EnumerationLiteral) {
-						out = property.getName() + EQUAL_SEPARATOR + ((EnumerationLiteral)val).getLabel() + PROPERTY_VALUE_SEPARATOR;
-					} else {
-						out = property.getName() + EQUAL_SEPARATOR + val + PROPERTY_VALUE_SEPARATOR;
-					}
-				} else {
-					out = property.getName() + PROPERTY_VALUE_SEPARATOR;
-				}
-			} else {
-				out = property.getName() + PROPERTY_VALUE_SEPARATOR;
-			}
-		}
-
-		// multiplicity is greater than one
-		else {
-			out = property.getName() + EQUAL_SEPARATOR + umlElement.getValue(stereotype, property.getName()) + PROPERTY_VALUE_SEPARATOR;
-		}
-		return out;
-	}
-
-	/**
-	 * return the string that represents the value of property when its type is a Metaclass
-	 *
-	 * @param property
-	 *        the property to display
-	 * @param stereotype
-	 *        the stereotype that contains the property
-	 * @param umlElement
-	 *        the umlelement on which the stereotype is applied
-	 * @param EQUAL_SEPARATOR
-	 *        the separator between property and property value
-	 * @param PROPERTY_VALUE_SEPARATOR
-	 *        the separator to end the exprestion
-	 * @return String withe the following grammar propertyname EQUAL_SEPERATOR propertyValue
-	 *         PROPERTY_VALUE_SEPERATOR
-	 */
-	private static String getPropertyValueForMetaclassType(Property property, Stereotype stereotype, Element umlElement, final String EQUAL_SEPARATOR, final String PROPERTY_VALUE_SEPARATOR, boolean withQualifiedName) {
-		String out = "";
-
-		if((property.getUpper() == 1) && (umlElement.getValue(stereotype, property.getName()) != null) && (umlElement.getValue(stereotype, property.getName()) instanceof NamedElement)) {
-			if(withQualifiedName){
-				out = property.getName() + EQUAL_SEPARATOR + ((NamedElement)(umlElement.getValue(stereotype, property.getName()))).getQualifiedName() + PROPERTY_VALUE_SEPARATOR;
-			}
-			else{
-				out = property.getName() + EQUAL_SEPARATOR + ((NamedElement)(umlElement.getValue(stereotype, property.getName()))).getName() + PROPERTY_VALUE_SEPARATOR;
-			}
-		}
-
-		// multiplicity greater than one
-		else if(property.getUpper() != 1) {
-			List values = (List)umlElement.getValue(stereotype, property.getName());
-			ArrayList elementNames = new ArrayList();
-			if(values != null) {
-				for(int count = 0; count < values.size(); count++) {
-					if(values.get(count) instanceof NamedElement) {
-						if(withQualifiedName){
-							elementNames.add(((NamedElement)values.get(count)).getQualifiedName());
-						}
-						else{
-							elementNames.add(((NamedElement)values.get(count)).getName());
-						}
-					}
-				}
-			}
-			out = property.getName() + EQUAL_SEPARATOR + elementNames + PROPERTY_VALUE_SEPARATOR;
-		}
-
-		// multiplicity = 1 and property value null
-		else {
-			out = property.getName() + EQUAL_SEPARATOR + umlElement.getValue(stereotype, property.getName()) + PROPERTY_VALUE_SEPARATOR;
-		}
-		return out;
-	}
-
-	/**
-	 * return the string that represents the value of property when its type is a stereotype
-	 *
-	 * @param property
-	 *        the property to display
-	 * @param stereotype
-	 *        the stereotype that contains the property
-	 * @param umlElement
-	 *        the umlelement on which the stereotype is applied
-	 * @param EQUAL_SEPARATOR
-	 *        the separator between property and property value
-	 * @param PROPERTY_VALUE_SEPARATOR
-	 *        the separator to end the exprestion
-	 * @return String withe the following grammar propertyname EQUAL_SEPERATOR propertyValue
-	 *         PROPERTY_VALUE_SEPERATOR
-	 */
-	private static String getPropertyValueForStereotypeType(Property property, Stereotype stereotype, Element umlElement, final String EQUAL_SEPARATOR, final String PROPERTY_VALUE_SEPARATOR, boolean withQualifiedName) {
-		String out = "";
-		if((property.getUpper() == 1) && (umlElement.getValue(stereotype, property.getName()) != null)) {
-
-			// retrieve the base element from the stereotype application
-			Object value = umlElement.getValue(stereotype, property.getName());
-			Element baseElement = UMLUtil.getBaseElement((EObject)value);
-
-			// display the base element's qualified name
-			if(withQualifiedName){
-				out = property.getName() + EQUAL_SEPARATOR + ((NamedElement)baseElement).getQualifiedName() + PROPERTY_VALUE_SEPARATOR;
-			}
-			else{
-				out = property.getName() + EQUAL_SEPARATOR + ((NamedElement)baseElement).getName() + PROPERTY_VALUE_SEPARATOR;
-			}
-		}
-
-		// multiplicity greater than one
-		else if(property.getUpper() != 1) {
-			// retrieve the base element from the stereotype application
-			List values = (List)umlElement.getValue(stereotype, property.getName());
-			ArrayList baseElements = new ArrayList();
-			if(values != null) {
-				for(int k = 0; k < values.size(); k++) {
-					if(withQualifiedName){
-						baseElements.add(((NamedElement)UMLUtil.getBaseElement((EObject)values.get(k))).getQualifiedName());
-					}
-					else{
-						baseElements.add(((NamedElement)UMLUtil.getBaseElement((EObject)values.get(k))).getName());
-					}
-				}
-			}
-
-			out = property.getName() + EQUAL_SEPARATOR + baseElements + PROPERTY_VALUE_SEPARATOR;
-		}
-
-		// multiplicity = 1 and property value null
-		else {
-			out = property.getName() + EQUAL_SEPARATOR + (umlElement.getValue(stereotype, property.getName())) + PROPERTY_VALUE_SEPARATOR;
-		}
-		return out;
-	}
-
-	/**
-	 * return the string that represents the value of property
-	 *
-	 * @param property
-	 *        the property to display
-	 * @param stereotype
-	 *        the stereotype that contains the property
-	 * @param umlElement
-	 *        the umlelement on which the stereotype is applied
-	 * @param EQUAL_SEPARATOR
-	 *        the separator between property and property value
-	 * @param PROPERTY_VALUE_SEPARATOR
-	 *        the separator to end the exprestion
-	 * @return String withe the following grammar propertyname EQUAL_SEPERATOR propertyValue
-	 *         PROPERTY_VALUE_SEPERATOR
-	 */
-	private static String getPropertyValue(Property property, Stereotype stereotype, Element umlElement, final String EQUAL_SEPARATOR, final String PROPERTY_VALUE_SEPARATOR,boolean withDelimitator) {
-		String out = "";
-		if((property.getLower() != 0) || umlElement.getValue(stereotype, property.getName()) != null) {
-			if(property.isSetDefault() || umlElement.getValue(stereotype, property.getName()) != null) {
-				if(withDelimitator){
-					String value= ""+umlElement.getValue(stereotype, property.getName());
-					out = property.getName() + EQUAL_SEPARATOR + value + PROPERTY_VALUE_SEPARATOR;
-					if(value.contains("[")){
-						out= out.replace("[", "["+QUOTE);
-						out= out.replace("]", QUOTE+"]");
-						out= out.replace(", ", QUOTE+","+QUOTE);
-					}
-					else{
-						out = property.getName() + EQUAL_SEPARATOR +QUOTE +value+QUOTE + PROPERTY_VALUE_SEPARATOR;
-					}
-				}
-				else{
-					if(umlElement.getValue(stereotype, property.getName()) instanceof EObject){
-						ILabelProvider labelProvider=getLabelProvider(property);
-						return out= property.getName() + EQUAL_SEPARATOR + labelProvider.getText(umlElement.getValue(stereotype, property.getName())) + PROPERTY_VALUE_SEPARATOR;
-					}
-					else{
-						out = property.getName() + EQUAL_SEPARATOR + umlElement.getValue(stereotype, property.getName()) + PROPERTY_VALUE_SEPARATOR;}
-				}
-			} else {
-				out = property.getName() + PROPERTY_VALUE_SEPARATOR;
-			}
-		} else {
-			out = property.getName() + PROPERTY_VALUE_SEPARATOR;
-
-		}
-		return out;
-	}
-
-	public static  ILabelProvider getLabelProvider(EObject eObject) {
-		try {
-			return ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, eObject).getLabelProvider();
-		} catch (ServiceException ex) {
-			Activator.log.error(ex);
-			return new LabelProvider();
-		}
-	}
-	/**
-	 * Parse the stereotype image and select those that have an "shape" kind (EAnnotation).
-	 *
-	 * @param stereotype
-	 *        to parse
-	 *
-	 * @return a EList of {@link Image}
-	 */
-	public static EList<Image> getShapes(Stereotype stereotype) {
-
-		EList<Image> shapes = new BasicEList<Image>();
-
-		Iterator<Image> it = stereotype.getIcons().iterator();
-		while(it.hasNext()) {
-			Image image = it.next();
-			if("shape".equals(ImageUtil.getKind(image))) {
-				shapes.add(image);
-			}
-		}
-
-		return shapes;
-	}
-
-	/**
-	 *
-	 * @param stereotype
-	 *        a stereotype
-	 * @return
-	 *         the list of the properties of this stereotype, excluding the properties of the extending metaclasses
-	 */
-	public static final List<Property> getStereotypePropertiesWithoutBaseProperties(final Stereotype stereotype) {
-		final List<Property> properties = new ArrayList<Property>();
-		for(Property property : stereotype.getOwnedAttributes()) {
-			if(isValidStereotypeProperty(property)) {
-				properties.add(property);
-			}
-		}
-		return properties;
-	}
-
-	/**
-	 *
-	 * @param stereotype
-	 *        a stereotype
-	 * @return
-	 *         the list of the properties of this stereotype, excluding the properties of the extending metaclasses
-	 */
-	public static final List<Property> getAllStereotypePropertiesWithoutBaseProperties(final Stereotype stereotype) {
-		final List<Property> properties = new ArrayList<Property>();
-		for(Property property : stereotype.getAllAttributes()) {
-			if(isValidStereotypeProperty(property)) {
-				properties.add(property);
-			}
-		}
-		return properties;
-	}
-	/**
-	 * 
-	 * @param property
-	 *        a property
-	 * @return
-	 *         <code>true</code> if the property is a Metaclass property
-	 */
-	public static final boolean isValidStereotypeProperty(final Property property) {
-		Association association = property.getAssociation();
-		if(association instanceof Extension) {
-			Extension ext = (Extension)association;
-			Class metaClass = ext.getMetaclass();
-			if(property.getName().equals(BASE_PREFIX + metaClass.getName())) { //$NON-NLS-1$
-				return false;
-			}
-		}
-		return true;
-	}
-}
diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/TemplateSignatureUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/TemplateSignatureUtil.java
deleted file mode 100644
index ea0f3c73e47..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/TemplateSignatureUtil.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.uml2.uml.ParameterableElement;

-import org.eclipse.uml2.uml.TemplateParameter;

-import org.eclipse.uml2.uml.TemplateSignature;

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.TemplateSignature</code><BR>

- */

-public class TemplateSignatureUtil {

-

-	public static Set<org.eclipse.uml2.uml.Type> getAccessibleTypes(TemplateSignature signature) {

-		Set<org.eclipse.uml2.uml.Type> list = new HashSet<org.eclipse.uml2.uml.Type>();

-

-		for(Iterator<org.eclipse.uml2.uml.TemplateParameter> i = signature.getParameters().iterator(); i.hasNext();) {

-			TemplateParameter current = i.next();

-			ParameterableElement exposedElement = current.getOwnedParameteredElement();

-			if(exposedElement instanceof org.eclipse.uml2.uml.Type) {

-				list.add((org.eclipse.uml2.uml.Type)exposedElement);

-			}

-		}

-		return list;

-	}

-

-	/**

-	 * Retrieve a type accessible in this Signature, given its name.

-	 * 

-	 * @param name

-	 *        the name of the type to find

-	 * 

-	 * @return the type found or <code>null</code> if not found.

-	 */

-	public static org.eclipse.uml2.uml.Type findTypeByName(TemplateSignature signature, String name) {

-		org.eclipse.uml2.uml.Type type = null;

-		boolean isFound = false;

-		if("".equals(name)) {

-			Activator.getDefault().getLog().log(

-					new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Name parameter should not be an empty string."));

-		} else {

-			Iterator<org.eclipse.uml2.uml.Type> it = TemplateSignatureUtil.getAccessibleTypes(signature).iterator();

-			while(!isFound && it.hasNext()) {

-				org.eclipse.uml2.uml.Type t = it.next();

-				if(t.getName().equals(name)) {

-					isFound = true;

-					type = t;

-				}

-			}

-		}

-

-		return type;

-	}

-

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/TypeUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/TypeUtil.java
deleted file mode 100644
index b7dca412feb..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/TypeUtil.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Iterator;

-

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.Type;

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.Type</code><BR>

- */

-public class TypeUtil {

-

-	public final static String UNDEFINED_TYPE_NAME = "<Undefined>";

-

-	/**

-	 * Get a string that displays the name of the type, and then its namespace.

-	 * <p>

-	 * For example: "String - UMLPrimitiveType"

-	 * 

-	 * @return a string that displays information about the type

-	 */

-	public static String getInfoString(Type type) {

-		StringBuffer buffer = new StringBuffer();

-		buffer.append(type.getName());

-		buffer.append(" - ");

-		String tmp = "";

-		Iterator<Namespace> it = type.allNamespaces().iterator();

-		while(it.hasNext()) {

-			Namespace namespace = it.next();

-			if(it.hasNext()) {

-				tmp = NamedElement.SEPARATOR + namespace.getName() + tmp;

-			} else {

-				tmp = namespace.getName() + tmp;

-			}

-		}

-		buffer.append(tmp);

-		return buffer.toString();

-	}

-

-	/**

-	 * 

-	 * 

-	 * @param type

-	 *        to check

-	 * 

-	 * @return true if type is metaclass, else false

-	 */

-	@Deprecated //use {@link Class#isMetaclass()} Check if a type is a metaclass.

-	public static boolean isMetaclass(Type type) {

-		if(type instanceof Class) {

-			return ((Class)type).isMetaclass();

-		}

-		return false;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/TypedElementUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/TypedElementUtil.java
deleted file mode 100644
index 84f0ea2503a..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/TypedElementUtil.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Yann TANGUY (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import org.eclipse.uml2.uml.TypedElement;

-

-/**

- * Utility class for <code>org.eclipse.uml2.uml.TypedElement</code><BR>

- */

-public class TypedElementUtil {

-

-	public static String getTypeAsString(TypedElement element) {

-		return (element.getType() != null) ? element.getType().getName() : "<Undefined>";

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLStringValueConverter.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLStringValueConverter.java
deleted file mode 100644
index b5260edbc3e..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLStringValueConverter.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://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.tools.utils;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.infra.emf.Activator;

-import org.eclipse.papyrus.infra.emf.utils.EMFStringValueConverter;

-import org.eclipse.papyrus.infra.emf.utils.MultiConvertedValueContainer;

-import org.eclipse.papyrus.infra.emf.utils.ConvertedValueContainer;

-import org.eclipse.papyrus.infra.emf.utils.StringValueConverterStatus;

-import org.eclipse.uml2.uml.DataType;

-import org.eclipse.uml2.uml.Enumeration;

-import org.eclipse.uml2.uml.EnumerationLiteral;

-import org.eclipse.uml2.uml.NamedElement;

-import org.eclipse.uml2.uml.Namespace;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * ULM String converter

- * @author vl222926

- *

- */

-public class UMLStringValueConverter extends EMFStringValueConverter {

-

-	final protected Map<EClass, NameResolutionHelper> nameResolutionHelpers = new HashMap<EClass, NameResolutionHelper>();

-

-	private static final String THE_ENUMERATION_LITERAL_X_CANT_BE_FOUND = "The enumeration literal {0} can't be found";

-

-	private static final String SOME_STRING_CANT_BE_RESOLVED_TO_FIND_X = "Some String can't be resolved to find {0}";

-

-	private static final String NO_X_REPRESENTED_BY_Y_HAVE_BEEN_FOUND = "No {0} represented by {1} have been found";

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param context

-	 *        the context used to resolve the value

-	 * @param multiValueSeparator

-	 *        the string used to seprate values

-	 */

-	public UMLStringValueConverter(final Namespace context, final String multiValueSeparator) {

-		super(context, multiValueSeparator);

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.utils.EMFStringValueConverter#dispose()

-	 * 

-	 */

-	@Override

-	public void dispose() {

-		super.dispose();

-		nameResolutionHelpers.clear();

-	}

-

-	@Override

-	protected int getFeatureUpperBound(Object feature) {

-		if(feature instanceof Property) {

-			return ((Property)feature).getUpper();

-		}

-		return super.getFeatureUpperBound(feature);

-	}

-

-	@Override

-	protected EClassifier getFeatureType(Object feature) {

-		final EClassifier featureType;

-		if(feature instanceof Property) {

-			final Type type = ((Property)feature).getType();

-			if(type instanceof PrimitiveType) {

-				final PrimitiveType pType = (PrimitiveType)type;

-				final String name = pType.getName();

-				if(PrimitivesTypesUtils.UML_BOOLEAN.equals(name)) {

-					featureType = EcorePackage.eINSTANCE.getEBoolean();

-				} else if(PrimitivesTypesUtils.UML_INTEGER.equals(name)) {

-					featureType = EcorePackage.eINSTANCE.getEInt();

-				} else if(PrimitivesTypesUtils.UML_REAL.equals(name)) {

-					featureType = EcorePackage.eINSTANCE.getEDouble();

-				} else if(PrimitivesTypesUtils.UML_STRING.equals(name)) {

-					featureType = EcorePackage.eINSTANCE.getEString();

-				} else if(PrimitivesTypesUtils.UML_UNLIMITED_NATURAL.equals(name)) {

-					featureType = EcorePackage.eINSTANCE.getEInt();

-				} else { //custom PrimitiveType

-					featureType = EcorePackage.eINSTANCE.getEString();

-				}

-			} else if(type instanceof Enumeration) {

-				featureType = UMLPackage.eINSTANCE.getEnumeration();

-			} else if(type instanceof DataType) {//FIXME manage the data type

-				featureType = EcorePackage.eINSTANCE.getEString();

-			} else {

-				featureType = type.eClass();

-			}

-		} else {

-			featureType = super.getFeatureType(feature);

-		}

-		return featureType;

-	}

-

-

-	@Override

-	public ConvertedValueContainer<?> deduceValueFromString(Object feature, String valueAsString) {

-		final EClassifier featureType = getFeatureType(feature);

-		if(feature instanceof Property) {

-			return deduceValueFromString(feature, featureType, valueAsString);

-		}

-		return super.deduceValueFromString(feature, valueAsString);

-	}

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.utils.EMFStringValueConverter#deduceValueFromString(java.lang.Object, org.eclipse.emf.ecore.EClassifier,

-	 *      java.lang.String)

-	 * 

-	 * @param feature

-	 * @param featureType

-	 * @param valueAsString

-	 * @return

-	 */

-	@Override

-	protected ConvertedValueContainer<?> deduceValueFromString(Object feature, EClassifier featureType, String valueAsString) {

-		if(featureType instanceof EClass && feature instanceof Property) {

-			final int upperbound = getFeatureUpperBound(feature);

-			boolean isMany = (upperbound > 1 || upperbound == -1);

-			if(PrimitivesTypesUtils.ENUMERATION.equals(featureType.getName())) {

-				return deduceEnumerationLiteralValue(isMany, valueAsString, (Enumeration)((Property)feature).getType());

-			}

-		}

-		return super.deduceValueFromString(feature, featureType, valueAsString);

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.emf.utils.EMFStringValueConverter#deduceEObjectValue(org.eclipse.emf.ecore.EObject, java.lang.Object,

-	 *      org.eclipse.emf.ecore.EClass, boolean, java.lang.String)

-	 * 

-	 * @param resolutionContext

-	 * @param feature

-	 * @param featureType

-	 * @param isMany

-	 * @param valueAsString

-	 * @return

-	 * @throws StringValueSolverException

-	 */

-	@Override

-	protected ConvertedValueContainer<?> deduceEObjectValue(EObject resolutionContext, Object feature, EClass eClass, boolean isMany, String valueAsString) {

-		if(valueAsString!=null && !valueAsString.isEmpty() && resolutionContext instanceof Namespace) {

-			IStatus iStatus = Status.OK_STATUS;

-			final Collection<String> unresolvedValues = new ArrayList<String>();

-			Namespace namespace = (Namespace)resolutionContext;

-			ConvertedValueContainer<?> returnedValue = null;

-			NameResolutionHelper helper = this.nameResolutionHelpers.get(eClass);

-			if(helper == null) {

-				helper = new NameResolutionHelper(namespace, eClass);

-				this.nameResolutionHelpers.put(eClass, helper);

-			}

-			if(isMany) {

-				final Collection<NamedElement> values = new HashSet<NamedElement>();

-				for(final String str : valueAsString.split(this.multiValueSeparator)) {

-					final List<NamedElement> elements = helper.getNamedElements(str);

-					if(elements.size() == 1) {

-						values.add(elements.get(0));

-					} else {

-						unresolvedValues.add(str);

-					}

-					if(!unresolvedValues.isEmpty()) {

-						iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(SOME_STRING_CANT_BE_RESOLVED_TO_FIND_X, eClass.getName()), unresolvedValues);

-					}

-					returnedValue = new MultiConvertedValueContainer<NamedElement>(values, iStatus);

-				}

-			} else {

-				final List<NamedElement> elements = helper.getNamedElements(valueAsString);

-				if(elements.size() == 1) {

-					//it is OK

-					returnedValue = new ConvertedValueContainer<NamedElement>(elements.get(0), iStatus);

-				} else {

-					unresolvedValues.add(valueAsString);

-					iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(NO_X_REPRESENTED_BY_Y_HAVE_BEEN_FOUND, eClass.getName(), valueAsString), unresolvedValues);

-					returnedValue = new ConvertedValueContainer<Boolean>(null, iStatus);

-				}

-			}

-			return returnedValue;

-		}

-		return super.deduceEObjectValue(resolutionContext, feature, eClass, isMany, valueAsString);

-	}

-

-	/**

-	 * 

-	 * @param isMany

-	 *        <code>true</code> if the feature isMany

-	 * @param valueAsString

-	 *        the value to parse

-	 * @return

-	 *         the result of the parsing

-	 */

-	protected ConvertedValueContainer<?> deduceEnumerationLiteralValue(final boolean isMany, final String valueAsString, final Enumeration enumeration) {

-		ConvertedValueContainer<?> returnedValue = null;

-		IStatus iStatus = Status.OK_STATUS;

-		final Collection<String> unresolvedValues = new ArrayList<String>();

-		if(isMany) {

-			final Collection<EnumerationLiteral> values = new ArrayList<EnumerationLiteral>();

-			for(final String str : valueAsString.split(this.multiValueSeparator)) {

-				final EnumerationLiteral lit = (EnumerationLiteral)enumeration.getMember(str);

-				if(lit != null) {

-					values.add(lit);

-				} else {

-					unresolvedValues.add(str);

-				}

-			}

-			if(!unresolvedValues.isEmpty()) {

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(SOME_STRING_ARE_NOT_VALID_TO_CREATE_X, PrimitivesTypesUtils.ENUMERATION_LITERAL), unresolvedValues);

-			}

-			returnedValue = new MultiConvertedValueContainer<EnumerationLiteral>(values, iStatus);

-		} else {

-			final EnumerationLiteral lit = (EnumerationLiteral)enumeration.getMember(valueAsString);

-			if(lit == null) {

-				unresolvedValues.add(valueAsString);

-				iStatus = new StringValueConverterStatus(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(THE_ENUMERATION_LITERAL_X_CANT_BE_FOUND, valueAsString, PrimitivesTypesUtils.ENUMERATION_LITERAL), unresolvedValues);

-			}

-			returnedValue = new ConvertedValueContainer<EnumerationLiteral>(lit, iStatus);

-		}

-		return returnedValue;

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java
deleted file mode 100644
index 0731ffe2c82..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/UMLUtil.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Collection;

-import java.util.HashSet;

-import java.util.LinkedList;

-import java.util.List;

-import java.util.Set;

-

-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.domain.EditingDomain;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.uml2.uml.Class;

-import org.eclipse.uml2.uml.Classifier;

-import org.eclipse.uml2.uml.ConnectableElement;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Lifeline;

-import org.eclipse.uml2.uml.Message;

-import org.eclipse.uml2.uml.MessageEvent;

-import org.eclipse.uml2.uml.MessageOccurrenceSpecification;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * A Helper class for UML

- * 

- * @author Camille Letavernier

- */

-//TODO/FIXME : Check implementations. Most of them are old and don't always match the 

-//specification for some cases.

-public class UMLUtil {

-

-	/**

-	 * Retrieve the UML semantic element from the given Object.

-	 * This method relies on {@link EMFHelper#getEObject(Object)} to resolve

-	 * an EObject from an Object, then checks if the resulting EObject is a

-	 * UML Element.

-	 * 

-	 * @param source

-	 *        The Object to resolve

-	 * @return

-	 *         The UML semantic element, or null if it couldn't be resolved

-	 */

-	public static Element resolveUMLElement(Object source) {

-		EObject eElement = EMFHelper.getEObject(source);

-

-		if(eElement instanceof Element) {

-			return (Element)eElement;

-		}

-

-		return null;

-	}

-

-	/**

-	 * Tests if a class is a subclass of another class. The classes are described

-	 * by their className, in the UML Metamodel.

-	 * 

-	 * @param className

-	 * @param superclassName

-	 * @return

-	 *         True if the class className is a subclass of the class superclassName

-	 */

-	public static boolean isSubClass(String className, String superclassName) {

-		EClass eClass = (EClass)getUMLMetamodel().getEClassifier(className);

-		EClass superClass = (EClass)getUMLMetamodel().getEClassifier(superclassName);

-		return EMFHelper.isSubclass(eClass, superClass);

-	}

-

-	/**

-	 * Retrieve the EditingDomain for the given source object

-	 * 

-	 * @param source

-	 * @return

-	 *         The source object's editing domain, or null if it couldn't be found

-	 */

-	public static EditingDomain resolveEditingDomain(Object source) {

-		return EMFHelper.resolveEditingDomain(resolveUMLElement(source));

-	}

-

-	/**

-	 * @return the UML EPackage

-	 */

-	public static EPackage getUMLMetamodel() {

-		return UMLPackage.eINSTANCE;

-	}

-

-	/**

-	 * Search the given stereotype (By name) on the given UML Element.

-	 * If the search is not strict, the name may be the qualified name of a

-	 * sub-stereotype of an applied stereotype

-	 * 

-	 * @param umlElement

-	 *        The UML Element on which the stereotype is applied

-	 * @param stereotypeName

-	 *        The qualified name of the stereotype

-	 * @param strict

-	 *        If set to true, only a stereotype matching the exact qualified name

-	 *        will be returned. Otherwise, any subtype of the given stereotype may be

-	 *        returned. Note that if more than one stereotype is a subtype of the

-	 *        given stereotype, the first matching stereotype is returned.

-	 * @return

-	 *         The first matching stereotype, or null if none was found

-	 */

-	public static Stereotype getAppliedStereotype(Element umlElement, String stereotypeName, boolean strict) {

-		if(umlElement == null || stereotypeName == null) {

-			return null;

-		}

-

-		Stereotype stereotype = umlElement.getAppliedStereotype(stereotypeName);

-		if(strict || stereotype != null) {

-			return stereotype;

-		}

-

-		//The parent stereotype is not always applicable...

-		//stereotype = umlElement.getApplicableStereotype(stereotypeName);

-

-		List<Stereotype> subStereotypes = findSubstereotypes(umlElement, stereotypeName);

-

-		for(Stereotype subStereotype : subStereotypes) {

-			if(umlElement.getAppliedStereotypes().contains(subStereotype)) {

-				return subStereotype;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * Finds the Stereotype matching the given name.

-	 * The search is done in the context of the given UML Element

-	 * (i.e. the Profiles applied on the Element's nearest package)

-	 * 

-	 * @param umlElement

-	 * @param stereotypeName

-	 * @return

-	 */

-	public static Stereotype findStereotype(Element umlElement, String stereotypeName) {

-		if(umlElement == null || stereotypeName == null) {

-			return null;

-		}

-

-		Stereotype stereotype = null;

-		org.eclipse.uml2.uml.Package umlPackage = umlElement.getNearestPackage();

-		if(umlPackage == null) {

-			stereotype = umlElement.getApplicableStereotype(stereotypeName);

-		} else {

-			outerLoop: for(Profile profile : umlPackage.getAllAppliedProfiles()) {

-				for(Stereotype ownedStereotype : profile.getOwnedStereotypes()) {

-					if(ownedStereotype.getQualifiedName().equals(stereotypeName)) {

-						stereotype = ownedStereotype;

-						break outerLoop;

-					}

-				}

-			}

-		}

-		return stereotype;

-	}

-

-	/**

-	 * Returns all stereotypes matching the given qualified stereotype name, and their substereotypes

-	 * The search is performed in the context of the given UML Element, i.e. the profiles applied

-	 * on the Element's nearest package

-	 * 

-	 * @param umlElement

-	 * @param stereotypeName

-	 * @return

-	 */

-	public static List<Stereotype> findSubstereotypes(Element umlElement, String stereotypeName) {

-		if(umlElement == null || stereotypeName == null) {

-			return null;

-		}

-

-		Set<Stereotype> stereotypes = new HashSet<Stereotype>();

-		org.eclipse.uml2.uml.Package umlPackage = umlElement.getNearestPackage();

-

-		if(umlPackage == null) {

-			Stereotype stereotype = umlElement.getApplicableStereotype(stereotypeName);

-			if(stereotype != null) {

-				stereotypes.add(stereotype);

-			}

-		} else {

-			for(Profile profile : umlPackage.getAllAppliedProfiles()) {

-				for(Stereotype ownedStereotype : profile.getOwnedStereotypes()) {

-					for(Stereotype superStereotype : getAllSuperStereotypes(ownedStereotype)) {

-						if(stereotypeName.equals(superStereotype.getQualifiedName())) {

-							stereotypes.add(ownedStereotype);

-						}

-					}

-				}

-			}

-		}

-

-		return new LinkedList<Stereotype>(stereotypes);

-	}

-

-	/**

-	 * Returns a collection of all super stereotypes of the given stereotype

-	 * (Including itself)

-	 * 

-	 * @param stereotype

-	 * @return

-	 *         A collection of all super stereotypes

-	 */

-	public static Collection<Stereotype> getAllSuperStereotypes(Stereotype stereotype) {

-		Set<Stereotype> result = new HashSet<Stereotype>();

-		if(stereotype != null) {

-			getAllSuperStereotypes(stereotype, result);

-		}

-		return result;

-	}

-

-	private static void getAllSuperStereotypes(Stereotype stereotype, Set<Stereotype> result) {

-		result.add(stereotype);

-		for(Classifier superClassifier : stereotype.getGenerals()) {

-			if(superClassifier instanceof Stereotype && !result.contains(superClassifier)) {

-				getAllSuperStereotypes((Stereotype)superClassifier, result);

-			}

-		}

-	}

-

-	/**

-	 * Retrieves the UML Class associated to the given Message

-	 * 

-	 * @param message

-	 * @return the UML Class associated to the given Message

-	 */

-	public static org.eclipse.uml2.uml.Class getContextClassForMessage(Message message) {

-		MessageOccurrenceSpecification receiveEvent = (MessageOccurrenceSpecification)message.getReceiveEvent();

-

-		if(receiveEvent == null) {

-			return null;

-		}

-

-		return getContextClassForMessageOccurrence(receiveEvent);

-	}

-

-	/**

-	 * Retrieves the UML Class associated to the given MessageOccurrenceSpecification

-	 * 

-	 * @param messageOccurrence

-	 * @return the UML Class associated to the given MessageOccurrenceSpecification

-	 */

-	public static org.eclipse.uml2.uml.Class getContextClassForMessageOccurrence(MessageOccurrenceSpecification messageOccurrence) {

-		List<Lifeline> lifelines = messageOccurrence.getCovereds();

-		if(lifelines.isEmpty()) {

-			return null; //We can't find the context

-		} else if(lifelines.size() == 1) {

-			Lifeline lifeline = lifelines.get(0);

-			ConnectableElement element = lifeline.getRepresents();

-			if(element == null) {

-				return null;

-			}

-			Type type = element.getType();

-			if(type instanceof org.eclipse.uml2.uml.Class) {

-				org.eclipse.uml2.uml.Class clazz = (org.eclipse.uml2.uml.Class)type;

-				return clazz;

-			} else {

-				return null; //The type is not a Class

-			}

-		} else {

-			return null; //Too many contexts : which one should we choose ?

-		}

-	}

-

-	/**

-	 * Finds the UML Class associated to the given MessageEvent

-	 * 

-	 * @param event

-	 * @return the Class associated to the given MessageEvent

-	 */

-	public static Class getContextClassForMessageEvent(MessageEvent event) {

-		Collection<EStructuralFeature.Setting> settings = EMFHelper.getUsages(event);

-		if(settings.isEmpty()) {

-			return null;

-		}

-

-		if(settings.size() == 1) {

-			EObject referer = settings.iterator().next().getEObject();

-			if(referer instanceof MessageOccurrenceSpecification) {

-				return UMLUtil.getContextClassForMessageOccurrence((MessageOccurrenceSpecification)referer);

-			} else {

-				return null;

-			}

-		}

-

-		MessageOccurrenceSpecification referer = null;

-		EObject newReferer = null;

-

-		for(EStructuralFeature.Setting setting : settings) {

-			newReferer = setting.getEObject();

-			if(!(newReferer instanceof MessageOccurrenceSpecification)) {

-				continue;

-			}

-

-			if(referer == null || referer == newReferer) {

-				referer = (MessageOccurrenceSpecification)newReferer;

-			} else {

-				referer = null;

-				break;

-			}

-		}

-

-		if(referer == null) {

-			return null;

-		}

-

-		return UMLUtil.getContextClassForMessageOccurrence(referer);

-	}

-}

diff --git a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ValueSpecificationUtil.java b/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ValueSpecificationUtil.java
deleted file mode 100644
index e0308513918..00000000000
--- a/sandbox/pasteInNewTable/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ValueSpecificationUtil.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2008 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Remi SCHNEKENBURGER (CEA LIST) Remi.schnekenburger@cea.fr - Initial API and implementation

- *  

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.tools.utils;

-

-import java.util.Collection;

-

-import org.eclipse.uml2.uml.Constraint;

-import org.eclipse.uml2.uml.Duration;

-import org.eclipse.uml2.uml.Expression;

-import org.eclipse.uml2.uml.InstanceValue;

-import org.eclipse.uml2.uml.Interval;

-import org.eclipse.uml2.uml.LiteralBoolean;

-import org.eclipse.uml2.uml.LiteralInteger;

-import org.eclipse.uml2.uml.LiteralNull;

-import org.eclipse.uml2.uml.LiteralString;

-import org.eclipse.uml2.uml.LiteralUnlimitedNatural;

-import org.eclipse.uml2.uml.OpaqueExpression;

-import org.eclipse.uml2.uml.StringExpression;

-import org.eclipse.uml2.uml.TimeExpression;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.ValueSpecification;

-

-/**

- * Utility class for {@link ValueSpecification}

- */

-public class ValueSpecificationUtil {

-

-	/** The * KeyWord to represent an unlimited integer (infinite) */

-	private static final String UNLIMITED_KEYWORD = "*";

-

-	private static final String INTERVAL_FORMAT = "%1s..%2s";

-

-	/**

-	 * Get a string representing of a ValueSpecification

-	 * 

-	 * @param specification

-	 */

-	public static String getSpecificationValue(ValueSpecification specification) {

-		String value = ""; //$NON-NLS-1$

-		if(specification != null && specification.eClass() != null) {

-			switch(specification.eClass().getClassifierID()) {

-			case UMLPackage.LITERAL_STRING:

-				value = ((LiteralString)specification).getValue();

-				break;

-			case UMLPackage.LITERAL_BOOLEAN:

-				value = Boolean.toString(((LiteralBoolean)specification).booleanValue());

-				break;

-			case UMLPackage.LITERAL_INTEGER:

-				value = Integer.toString(((LiteralInteger)specification).getValue());

-				break;

-			case UMLPackage.LITERAL_UNLIMITED_NATURAL:

-				value = Integer.toString(((LiteralUnlimitedNatural)specification).getValue());

-				if("-1".equals(value)) { //$NON-NLS-1$

-					value = UNLIMITED_KEYWORD; //$NON-NLS-1$

-				}

-				break;

-			case UMLPackage.LITERAL_NULL:

-				break;

-			case UMLPackage.OPAQUE_EXPRESSION:

-				OpaqueExpression exp = (OpaqueExpression)specification;

-				value = OpaqueExpressionUtil.getBodyForLanguage(exp, null); //$NON-NLS-1$					

-				break;

-			case UMLPackage.INSTANCE_VALUE:

-				if (((InstanceValue)specification).getInstance() != null) {

-					value = ((InstanceValue)specification).getInstance().getName();

-				}

-				break;

-			case UMLPackage.EXPRESSION:

-				Expression expr = (Expression)specification;

-				if(!expr.getOperands().isEmpty()) {

-					StringBuffer operandsBuff = new StringBuffer(expr.getSymbol());

-					operandsBuff.append("(");

-					int initialLength = operandsBuff.length();

-					for(ValueSpecification operand : expr.getOperands()) {

-						if(operandsBuff.length() > initialLength) {

-							operandsBuff.append(",");

-						}

-						operandsBuff.append(getSpecificationValue(operand));

-					}

-					operandsBuff.append(")");

-					value = operandsBuff.toString();

-				} else {

-					value = expr.getSymbol();

-				}

-				break;

-			case UMLPackage.STRING_EXPRESSION:

-				// TODO

-				break;

-			case UMLPackage.DURATION:

-				Duration durationExpr = (Duration)specification;

-				if(durationExpr.getExpr() != null) {

-					value = getSpecificationValue(durationExpr.getExpr());

-				} else if(durationExpr.getObservations().size() > 0) {

-					value = durationExpr.getObservations().get(0).getName();

-				}

-				break;

-			case UMLPackage.TIME_EXPRESSION:

-				TimeExpression timeExpr = (TimeExpression)specification;

-				if(timeExpr.getExpr() != null) {

-					value = getSpecificationValue(timeExpr.getExpr());

-				} else if(timeExpr.getObservations().size() > 0) {

-					value = timeExpr.getObservations().get(0).getName();

-				}

-				break;

-			case UMLPackage.INTERVAL:

-			case UMLPackage.TIME_INTERVAL:

-			case UMLPackage.DURATION_INTERVAL:

-				Interval interval = (Interval)specification;

-				String min = getSpecificationValue(interval.getMin());

-				String max = getSpecificationValue(interval.getMax());

-				value = String.format(INTERVAL_FORMAT, min, max);

-				break;

-			default:

-			{

-				break;

-			}

-			}

-		}

-		return value;

-	}

-

-

-	/**

-	 * Get a string representing a Constraint

-	 * 

-	 * @param Constraint

-	 */

-	public static String getConstraintnValue(Constraint specification) {

-		String value = ""; //$NON-NLS-1$

-		if(specification != null) {

-			ValueSpecification spe = specification.getSpecification();

-			if(spe != null) {

-				value = getSpecificationValue(spe);

-			}

-		}

-		return value;

-	}

-

-	/**

-	 * Sets the value of a specification, using a string value

-	 * 

-	 * @param specification

-	 *        the value specification to update

-	 * @param value

-	 *        the value to set

-	 */

-	public static void restoreSpecificationValue(ValueSpecification specification, String value) {

-		if(value == null) {

-			return;

-		}

-

-		switch(specification.eClass().getClassifierID()) {

-		case UMLPackage.LITERAL_STRING:

-			restoreLiteralString((LiteralString)specification, value);

-			break;

-		case UMLPackage.LITERAL_BOOLEAN:

-			restoreLiteralBoolean((LiteralBoolean)specification, value);

-			break;

-		case UMLPackage.LITERAL_INTEGER:

-			restoreLiteralInteger((LiteralInteger)specification, value);

-			break;

-		case UMLPackage.LITERAL_UNLIMITED_NATURAL:

-			restoreLiteralUnlimitedNatural((LiteralUnlimitedNatural)specification, value);

-			break;

-		case UMLPackage.LITERAL_NULL:

-			restoreLiteralNull((LiteralNull)specification, value);

-			break;

-		case UMLPackage.OPAQUE_EXPRESSION:

-			OpaqueExpression exp = (OpaqueExpression)specification;

-			if(!exp.getLanguages().isEmpty()) {

-				restoreOpaqueExpression((org.eclipse.uml2.uml.OpaqueExpression)specification, exp.getLanguages().get(0), value);

-			} else {

-				restoreOpaqueExpression((org.eclipse.uml2.uml.OpaqueExpression)specification, value);

-			}

-			break;

-		default:

-		{

-			break;

-		}

-		}

-	}

-

-	/**

-	 * Sets the value of a literal string, using a string value

-	 * 

-	 * @param specification

-	 *        the literal string to update

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreLiteralString(LiteralString specification, String value) {

-		specification.setValue(value);

-	}

-

-	/**

-	 * Sets the value of a literal, using a string value

-	 * 

-	 * @param specification

-	 *        the literal integer to update

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreLiteralInteger(LiteralInteger specification, String value) {

-		int intValue = 0;

-		try {

-			intValue = Integer.decode(value);

-		} catch (NumberFormatException e) {

-			// Do nothing, this was not a number. 0 will be the default value

-		}

-		specification.setValue(intValue);

-	}

-

-	/**

-	 * Sets the value of a literal boolean, using a string value

-	 * 

-	 * @param specification

-	 *        the literal boolean to update

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreLiteralBoolean(LiteralBoolean specification, String value) {

-		if("true".equals(value) || "1".equals(value)) {

-			specification.setValue(true);

-		} else {

-			specification.setValue(false);

-		}

-	}

-

-	/**

-	 * Sets the value of a literal unlimited natural, using a string value

-	 * 

-	 * @param specification

-	 *        the literal unlimited natural to update

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreLiteralUnlimitedNatural(LiteralUnlimitedNatural specification, String value) {

-		int intValue = 0;

-		try {

-			intValue = Integer.decode(value);

-		} catch (NumberFormatException e) {

-			// Do nothing, this was not a number. 0 will be the default value

-		}

-		// Handle the special unlimited value separately

-		if(UNLIMITED_KEYWORD.equals(value)) {

-			intValue = -1;

-		}

-		specification.setValue(intValue);

-	}

-

-	/**

-	 * Sets the value of a literal null, using a string value

-	 * 

-	 * @param specification

-	 *        the literal null to update

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreLiteralNull(LiteralNull specification, String value) {

-		// nothing to set

-	}

-

-	/**

-	 * Sets the value of an opaque expression, using a string value

-	 * 

-	 * @param specification

-	 *        the opaque expression to update

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreOpaqueExpression(org.eclipse.uml2.uml.OpaqueExpression specification, String value) {

-		// save in "UML" language, but should be desactivable

-		OpaqueExpressionUtil.setBodyForLanguage(specification, "UML", value);

-	}

-

-	/**

-	 * Sets the value of an opaque expression, using a string value.

-	 * 

-	 * @param specification

-	 *        the opaque expression to update

-	 * @param language

-	 *        the specified language

-	 * @param value

-	 *        the new value

-	 */

-	public static void restoreOpaqueExpression(org.eclipse.uml2.uml.OpaqueExpression specification, String language, String value) {

-		OpaqueExpressionUtil.setBodyForLanguage(specification, language, value);

-	}

-

-	/**

-	 * Add to the collection the value specification and all its related value specifications, like min and max of an interval for example.

-	 * 

-	 * @param spec

-	 *        the value specification to add

-	 * @param collection

-	 *        the collection

-	 */

-	@SuppressWarnings({ "rawtypes", "unchecked" })

-	public static void addEnclosedValueSpecificationToCollection(ValueSpecification spec, Collection collection) {

-		if(!collection.contains(spec)) {

-			collection.add(spec);

-			if(spec instanceof Interval) {

-				addEnclosedValueSpecificationToCollection(((Interval)spec).getMin(), collection);

-				addEnclosedValueSpecificationToCollection(((Interval)spec).getMax(), collection);

-			} else if(spec instanceof Duration) {

-				addEnclosedValueSpecificationToCollection(((Duration)spec).getExpr(), collection);

-			} else if(spec instanceof TimeExpression) {

-				addEnclosedValueSpecificationToCollection(((TimeExpression)spec).getExpr(), collection);

-			} else if(spec instanceof Expression) {

-				for(ValueSpecification vs : ((Expression)spec).getOperands()) {

-					addEnclosedValueSpecificationToCollection(vs, collection);

-				}

-				if(spec instanceof StringExpression) {

-					for(StringExpression se : ((StringExpression)spec).getSubExpressions()) {

-						addEnclosedValueSpecificationToCollection(se, collection);

-					}

-				}

-			}

-		}

-	}

-

-}