A save of my work on the new tables

change the PapyrusTable metamodel : reference to EStructuralFeature -> reference to EReference

8 files changed, 148 insertions, 111 deletions

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/editor/AbstractTableEditor.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/editor/AbstractTableEditor.java
index f25e2b1871a..7126044b88c 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/editor/AbstractTableEditor.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/editor/AbstractTableEditor.java
@@ -1,12 +1,17 @@
 package org.eclipse.papyrus.infra.table.efacet.common.editor;

 

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

 import org.eclipse.emf.transaction.TriggerListener;

 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.table.efacet.common.Activator;

 import org.eclipse.papyrus.infra.table.efacet.common.input.PapyrusTableEditorInput;

 import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable;

+import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrustablePackage;

 import org.eclipse.ui.IEditorInput;

 import org.eclipse.ui.IEditorSite;

 import org.eclipse.ui.PartInitException;

@@ -28,14 +33,13 @@ public abstract class AbstractTableEditor extends NatTableEditor2 {
 	/**

 	 * the part name synchronizer

 	 */

-	//	private final PartNameSynchronizer synchronizer;

+	private final PartNameSynchronizer synchronizer;

 

 

 	public AbstractTableEditor(final ServicesRegistry servicesRegistry, final PapyrusTable rawModel) {

 		this.servicesRegistry = servicesRegistry;

 		this.rawModel = rawModel;

-		//TODO

-		//		this.synchronizer = new PartNameSynchronizer(rawModel);

+		this.synchronizer = new PartNameSynchronizer(rawModel);

 	}

 

 

@@ -51,11 +55,9 @@ public abstract class AbstractTableEditor extends NatTableEditor2 {
 	@Override

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

 		final PapyrusTableEditorInput tableEditorInput = new PapyrusTableEditorInput(this.rawModel, getEditingDomain());

-		//		initHiddenColumn(this.rawModel);

 		setSite(site);

 		setInput(tableEditorInput);

 		setPartName(this.rawModel.getName());

-		//		addListeners();

 		super.init(site, tableEditorInput);

 	}

 

@@ -119,9 +121,9 @@ public abstract class AbstractTableEditor extends NatTableEditor2 {
 		try {

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

 		} catch (final ServiceException e) {

-			e.printStackTrace();

-			return null;

+			Activator.log.error(e);

 		}

+		return null;

 	}

 

 

@@ -167,93 +169,93 @@ public abstract class AbstractTableEditor extends NatTableEditor2 {
 	//

 	//	}

 

-	//	/**

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

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

-	//	 * 

-	//	 * @author vincent lorenzo

-	//	 *         adapted class from UmlGmfDiagramEditor

-	//	 */

-	//	public class PartNameSynchronizer {

-	//

-	//		/** the papyrus table */

-	//		private PapyrusTable papyrusTable;

-	//

-	//		/**

-	//		 * Listener on diagram name change.

-	//		 */

-	//		private final Adapter tableNameListener = new Adapter() {

-	//

-	//			/**

-	//			 * 

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

-	//			 * 

-	//			 * @param notification

-	//			 */

-	//			public void notifyChanged(final Notification notification) {

-	//				if(notification.getFeatureID(PapyrusTable.class) == PapyrustableinstancePackage.PAPYRUS_TABLE_INSTANCE__NAME && notification.getNotifier() == PartNameSynchronizer.this.papyrusTable) {

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

-	//				}

-	//			}

-	//

-	//			/**

-	//			 * 

-	//			 * @see org.eclipse.emf.common.notify.Adapter#getTarget()

-	//			 * 

-	//			 * @return

-	//			 */

-	//			public Notifier getTarget() {

-	//				return null;

-	//			}

-	//

-	//			/**

-	//			 * 

-	//			 * @see org.eclipse.emf.common.notify.Adapter#setTarget(org.eclipse.emf.common.notify.Notifier)

-	//			 * 

-	//			 * @param newTarget

-	//			 */

-	//			public void setTarget(final Notifier newTarget) {

-	//			}

-	//

-	//			/**

-	//			 * 

-	//			 * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object)

-	//			 * 

-	//			 * @param type

-	//			 * @return

-	//			 */

-	//			public boolean isAdapterForType(final Object type) {

-	//				return false;

-	//			}

-	//

-	//		};

-	//

-	//		/**

-	//		 * 

-	//		 * Constructor.

-	//		 * 

-	//		 * @param diagram

-	//		 */

-	//		public PartNameSynchronizer(final PapyrusTable papyrusTable) {

-	//			setTable(papyrusTable);

-	//		}

-	//

-	//		/**

-	//		 * Change the associated diagram.

-	//		 * 

-	//		 * @param papyrusTable

-	//		 */

-	//		public void setTable(final PapyrusTable papyrusTable) {

-	//			// Remove from old diagram, if any

-	//			if(this.papyrusTable != null) {

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

-	//			}

-	//			// Set new table

-	//			this.papyrusTable = papyrusTable;

-	//			// Set editor name

-	//			setPartName(papyrusTable.getName());

-	//			// Listen to name change

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

-	//		}

-	//	}

+	/**

+	 * A class taking in charge the synchronization of the partName and the diagram name.

+	 * When diagram name change, the other is automatically updated.

+	 * 

+	 * @author vincent lorenzo

+	 *         adapted class from UmlGmfDiagramEditor

+	 */

+	public class PartNameSynchronizer {

+

+		/** the papyrus table */

+		private PapyrusTable papyrusTable;

+

+		/**

+		 * Listener on diagram name change.

+		 */

+		private final Adapter tableNameListener = new Adapter() {

+

+			/**

+			 * 

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

+			 * 

+			 * @param notification

+			 */

+			public void notifyChanged(final Notification notification) {

+				if(notification.getFeatureID(PapyrusTable.class) == PapyrustablePackage.PAPYRUS_TABLE__NAME && notification.getNotifier() == PartNameSynchronizer.this.papyrusTable) {

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

+				}

+			}

+

+			/**

+			 * 

+			 * @see org.eclipse.emf.common.notify.Adapter#getTarget()

+			 * 

+			 * @return

+			 */

+			public Notifier getTarget() {

+				return null;

+			}

+

+			/**

+			 * 

+			 * @see org.eclipse.emf.common.notify.Adapter#setTarget(org.eclipse.emf.common.notify.Notifier)

+			 * 

+			 * @param newTarget

+			 */

+			public void setTarget(final Notifier newTarget) {

+			}

+

+			/**

+			 * 

+			 * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object)

+			 * 

+			 * @param type

+			 * @return

+			 */

+			public boolean isAdapterForType(final Object type) {

+				return false;

+			}

+

+		};

+

+		/**

+		 * 

+		 * Constructor.

+		 * 

+		 * @param diagram

+		 */

+		public PartNameSynchronizer(final PapyrusTable papyrusTable) {

+			setTable(papyrusTable);

+		}

+

+		/**

+		 * Change the associated diagram.

+		 * 

+		 * @param papyrusTable

+		 */

+		public void setTable(final PapyrusTable papyrusTable) {

+			// Remove from old diagram, if any

+			if(this.papyrusTable != null) {

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

+			}

+			// Set new table

+			this.papyrusTable = papyrusTable;

+			// Set editor name

+			setPartName(papyrusTable.getName());

+			// Listen to name change

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

+		}

+	}

 }

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/handlers/AbstractCreateTableEditorHandler.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/handlers/AbstractCreateTableEditorHandler.java
index cca568fee2d..61c13559335 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/handlers/AbstractCreateTableEditorHandler.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.common/src/org/eclipse/papyrus/infra/table/efacet/common/handlers/AbstractCreateTableEditorHandler.java
@@ -13,7 +13,10 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.core.runtime.Status;

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

 import org.eclipse.emf.common.notify.AdapterFactory;

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

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

 import org.eclipse.emf.ecore.EObject;

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

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

@@ -115,7 +118,7 @@ public abstract class AbstractCreateTableEditorHandler extends AbstractHandler {
 	public void runAsTransaction() throws ServiceException {

 		//default Value

 		this.name = this.defaultName;

-		final InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), "Create new table", "myLabel", "myName", null);//TODO improve it

+		final InputDialog dialog = new InputDialog(Display.getCurrent().getActiveShell(), "Create new table", "Table Name", this.name, null);//TODO improve it

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

 			//get the name and the description for the table

 			this.name = dialog.getValue();

@@ -222,6 +225,33 @@ public abstract class AbstractCreateTableEditorHandler extends AbstractHandler {
 		/** label provider for EMF objects */

 		final ILabelProvider labelProvider = new AdapterFactoryLabelProvider(factory);

 		System.out.println(labelProvider.getText(papyrusTable));;

+

+		if(papyrusTable.isUsingContextFeature() && papyrusTable.getContextFeature() != null) { //TODO : verify that the context owns the wanted feature

+			getTableContext().eAdapters().add(new Adapter() {

+

+				public void setTarget(final Notifier newTarget) {

+					int i = 0;

+					i++;

+

+				}

+

+				public void notifyChanged(final Notification notification) {

+					int i = 0;

+					i++;

+				}

+

+				public boolean isAdapterForType(final Object type) {

+					// TODO Auto-generated method stub

+					return false;

+				}

+

+				public Notifier getTarget() {

+					// TODO Auto-generated method stub

+					return null;

+				}

+			});

+

+		}

 		return papyrusTable;

 	}

 

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditor.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditor.java
index e69a4e62aed..6a5bb485e81 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditor.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditor.java
@@ -137,6 +137,8 @@ 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.facet.widgets.table.metamodel.v0_2_0.table.provider.TableItemProviderAdapterFactory;

+//import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.provider.TableconfigurationItemProviderAdapterFactory;

 

 

 /**

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditorPlugin.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditorPlugin.java
index a1faac3158e..e7a8fee45b0 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditorPlugin.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditorPlugin.java
@@ -20,6 +20,8 @@ import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.provider.CustomEditP
 import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.provider.Efacet2EditPlugin;

 import org.eclipse.emf.facet.widgets.celleditors.edit.CelleditorsEditPlugin;

 import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.provider.PapyrustableEditPlugin;

+//import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.provider.Tableinstance02EditPlugin;

+//import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.provider.TableConfigurationEditPlugin;

 

 /**

  * This is the central singleton for the Papyrustableconfiguration editor plugin.

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore
index 594b89c2065..1dd62e886e4 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore
@@ -21,7 +21,7 @@
         <details key="documentation" value="This list registers the queries used to fill the PapyrusTable when it is in Queries Mode"/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="listenContextFeature" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="listenContextFeature" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="documentation" value="This field references the feature of the context of the table to listen, when the table in is Feature Mode"/>

       </eAnnotations>

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java
index 9266e1bf96d..9edfdf3e947 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamod
 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EModelElement;

 import org.eclipse.emf.ecore.EObject;

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

 import org.eclipse.emf.ecore.EStructuralFeature;

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

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

@@ -98,12 +99,12 @@ public interface PapyrusTableConfiguration extends EObject, EModelElement {
 	 * This field references the feature of the context of the table to listen, when the table in is Feature Mode

 	 * <!-- end-model-doc -->

 	 * @return the value of the '<em>Listen Context Feature</em>' reference.

-	 * @see #setListenContextFeature(EStructuralFeature)

+	 * @see #setListenContextFeature(EReference)

 	 * @see org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationPackage#getPapyrusTableConfiguration_ListenContextFeature()

 	 * @model

 	 * @generated

 	 */

-	EStructuralFeature getListenContextFeature();

+	EReference getListenContextFeature();

 

 	/**

 	 * Sets the value of the '{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getListenContextFeature <em>Listen Context Feature</em>}' reference.

@@ -113,7 +114,7 @@ public interface PapyrusTableConfiguration extends EObject, EModelElement {
 	 * @see #getListenContextFeature()

 	 * @generated

 	 */

-	void setListenContextFeature(EStructuralFeature value);

+	void setListenContextFeature(EReference value);

 

 	/**

 	 * Returns the value of the '<em><b>Table Configuration</b></em>' containment reference.

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java
index cd0036cb2de..ff1c9a4528b 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java
@@ -20,6 +20,7 @@ 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.EReference;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.ecore.InternalEObject;

 

@@ -92,7 +93,7 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements
 	 * @generated

 	 * @ordered

 	 */

-	protected EStructuralFeature listenContextFeature;

+	protected EReference listenContextFeature;

 

 	/**

 	 * The cached value of the '{@link #getTableConfiguration() <em>Table Configuration</em>}' containment reference.

@@ -161,10 +162,10 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EStructuralFeature getListenContextFeature() {

+	public EReference getListenContextFeature() {

 		if (listenContextFeature != null && listenContextFeature.eIsProxy()) {

 			InternalEObject oldListenContextFeature = (InternalEObject)listenContextFeature;

-			listenContextFeature = (EStructuralFeature)eResolveProxy(oldListenContextFeature);

+			listenContextFeature = (EReference)eResolveProxy(oldListenContextFeature);

 			if (listenContextFeature != oldListenContextFeature) {

 				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_CONTEXT_FEATURE, oldListenContextFeature, listenContextFeature));

@@ -178,7 +179,7 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public EStructuralFeature basicGetListenContextFeature() {

+	public EReference basicGetListenContextFeature() {

 		return listenContextFeature;

 	}

 

@@ -187,8 +188,8 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	public void setListenContextFeature(EStructuralFeature newListenContextFeature) {

-		EStructuralFeature oldListenContextFeature = listenContextFeature;

+	public void setListenContextFeature(EReference newListenContextFeature) {

+		EReference oldListenContextFeature = listenContextFeature;

 		listenContextFeature = newListenContextFeature;

 		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_CONTEXT_FEATURE, oldListenContextFeature, listenContextFeature));

@@ -289,7 +290,7 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements
 				getFillingQueries().addAll((Collection<? extends Query>)newValue);

 				return;

 			case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_CONTEXT_FEATURE:

-				setListenContextFeature((EStructuralFeature)newValue);

+				setListenContextFeature((EReference)newValue);

 				return;

 			case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION:

 				setTableConfiguration((TableConfiguration)newValue);

@@ -313,7 +314,7 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements
 				getFillingQueries().clear();

 				return;

 			case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_CONTEXT_FEATURE:

-				setListenContextFeature((EStructuralFeature)null);

+				setListenContextFeature((EReference)null);

 				return;

 			case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION:

 				setTableConfiguration((TableConfiguration)null);

diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java
index a0401babb60..41689412782 100644
--- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java
+++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java
@@ -214,7 +214,6 @@ public class PapyrustableconfigurationPackageImpl extends EPackageImpl implement
 		// Obtain other dependent packages

 		PapyrustablePackage thePapyrustablePackage = (PapyrustablePackage)EPackage.Registry.INSTANCE.getEPackage(PapyrustablePackage.eNS_URI);

 		ExtensiblePackage theExtensiblePackage = (ExtensiblePackage)EPackage.Registry.INSTANCE.getEPackage(ExtensiblePackage.eNS_URI);

-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

 		TableconfigurationPackage theTableconfigurationPackage = (TableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(TableconfigurationPackage.eNS_URI);

 

 		// Create type parameters

@@ -228,7 +227,7 @@ public class PapyrustableconfigurationPackageImpl extends EPackageImpl implement
 		initEClass(papyrusTableConfigurationEClass, PapyrusTableConfiguration.class, "PapyrusTableConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEAttribute(getPapyrusTableConfiguration_FillingMode(), thePapyrustablePackage.getFillingMode(), "fillingMode", null, 0, 1, PapyrusTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$

 		initEReference(getPapyrusTableConfiguration_FillingQueries(), theExtensiblePackage.getQuery(), null, "fillingQueries", null, 0, -1, PapyrusTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getPapyrusTableConfiguration_ListenContextFeature(), theEcorePackage.getEStructuralFeature(), null, "listenContextFeature", null, 0, 1, PapyrusTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+		initEReference(getPapyrusTableConfiguration_ListenContextFeature(), ecorePackage.getEReference(), null, "listenContextFeature", null, 0, 1, PapyrusTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 		initEReference(getPapyrusTableConfiguration_TableConfiguration(), theTableconfigurationPackage.getTableConfiguration(), null, "tableConfiguration", null, 0, 1, PapyrusTableConfiguration.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