Works for TC with abstract ERef

3 files changed, 92 insertions, 209 deletions

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RootPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RootPropertiesEditionComponent.java
index 4ea8b55ea..be574485e 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RootPropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RootPropertiesEditionComponent.java
@@ -17,7 +17,6 @@ import org.eclipse.emf.common.util.BasicDiagnostic;
 import org.eclipse.emf.common.util.Diagnostic;

 import org.eclipse.emf.common.util.WrappedException;

 import org.eclipse.emf.ecore.EObject;

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

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

 import org.eclipse.emf.ecore.util.EContentAdapter;

 import org.eclipse.emf.eef.eefnr.AbstractSample;

@@ -33,8 +32,10 @@ import org.eclipse.emf.eef.runtime.api.parts.IPropertiesEditionPart;
 import org.eclipse.emf.eef.runtime.api.providers.IPropertiesEditionPartProvider;

 import org.eclipse.emf.eef.runtime.impl.command.StandardEditingCommand;

 import org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent;

+import org.eclipse.emf.eef.runtime.impl.notify.PropertiesEditionEvent;

 import org.eclipse.emf.eef.runtime.impl.notify.PropertiesValidationEditionEvent;

 import org.eclipse.emf.eef.runtime.impl.services.PropertiesEditionPartProviderService;

+import org.eclipse.emf.eef.runtime.ui.widgets.referencestable.ReferencesTableSettings;

 import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.jface.viewers.ViewerFilter;

 import org.eclipse.swt.widgets.Display;

@@ -66,7 +67,12 @@ public class RootPropertiesEditionComponent extends StandardPropertiesEditionCom
 	 * 
 	 */
 	protected RootPropertiesEditionPart basePart;
-
+	
+	/**
+	 * Settings for samples ReferencesTable
+	 */
+	private	ReferencesTableSettings samplesSettings;
+	
 	/**
 	 * Default constructor
 	 * 
@@ -122,9 +128,7 @@ public class RootPropertiesEditionComponent extends StandardPropertiesEditionCom
 	 * 
 	 */
 	protected void runUpdateRunnable(final Notification msg) {
-		if (msg.getFeature() != null && ((EStructuralFeature)msg.getFeature() == EefnrPackage.eINSTANCE.getRoot_Samples())) {
-			basePart.updateSamples(root);
-		}
+
 
 	}
 
@@ -196,7 +200,8 @@ public class RootPropertiesEditionComponent extends StandardPropertiesEditionCom
 			((IPropertiesEditionPart)basePart).setContext(elt, allResource);
 			final Root root = (Root)elt;
 			// init values
-			basePart.initSamples(root, null, EefnrPackage.eINSTANCE.getRoot_Samples());
+			samplesSettings = new ReferencesTableSettings(root, EefnrPackage.eINSTANCE.getRoot_Samples());
+			basePart.initSamples(samplesSettings);
 			// init filters
 			basePart.addFilterToSamples(new ViewerFilter() {
 
@@ -236,7 +241,7 @@ public class RootPropertiesEditionComponent extends StandardPropertiesEditionCom
 			Diagnostic valueDiagnostic = validateValue(event);
 			if (IPropertiesEditionComponent.BATCH_MODE.equals(editing_mode)) {			
 				if (EefnrViewsRepository.Root.samples == event.getAffectedEditor()) {
-					// FIXME INVALID CASE you must override the template 'invokeEObjectUpdater' for the case : samples, Root, Root.
+					updateSamples(event);
 				}
 			}
 			else if (IPropertiesEditionComponent.LIVE_MODE.equals(editing_mode)) {
@@ -244,7 +249,7 @@ public class RootPropertiesEditionComponent extends StandardPropertiesEditionCom
 					
 					public void execute() {
 						if (EefnrViewsRepository.Root.samples == event.getAffectedEditor()) {
-							// FIXME INVALID CASE you must override the template 'invokeEObjectUpdater' for the case : samples, Root, Root.
+							updateSamples(event);
 						}
 					}
 				});			
@@ -259,7 +264,15 @@ public class RootPropertiesEditionComponent extends StandardPropertiesEditionCom
 		}
 	}
 
-	// FIXME INVALID CASE you must override the template 'declareEObjectUpdater' for the case : samples, Root, Root.
+	private void updateSamples(final IPropertiesEditionEvent event) {
+		if (event.getKind() == PropertiesEditionEvent.ADD)  {
+			if (event.getNewValue() instanceof AbstractSample) {
+				samplesSettings.addToReference((EObject) event.getNewValue());
+			}
+		} else if (event.getKind() == PropertiesEditionEvent.REMOVE) {
+				samplesSettings.removeFromReference((EObject) event.getNewValue());
+		}
+	}
 
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java
index 6fe022a97..5dfafcca5 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java
@@ -13,7 +13,6 @@ package org.eclipse.emf.eef.eefnr.parts.forms;
 // Start of user code for imports
 import java.util.ArrayList;

 import java.util.List;

-import java.util.Map;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EReference;

@@ -25,16 +24,18 @@ import org.eclipse.emf.eef.eefnr.providers.EefnrMessages;
 import org.eclipse.emf.eef.runtime.api.component.IPropertiesEditionComponent;

 import org.eclipse.emf.eef.runtime.api.notify.IPropertiesEditionEvent;

 import org.eclipse.emf.eef.runtime.api.parts.IFormPropertiesEditionPart;

-import org.eclipse.emf.eef.runtime.api.policies.IPropertiesEditionPolicy;

-import org.eclipse.emf.eef.runtime.api.providers.IPropertiesEditionPolicyProvider;

 import org.eclipse.emf.eef.runtime.impl.notify.PropertiesEditionEvent;

 import org.eclipse.emf.eef.runtime.impl.parts.CompositePropertiesEditionPart;

 import org.eclipse.emf.eef.runtime.impl.policies.EObjectPropertiesEditionContext;

 import org.eclipse.emf.eef.runtime.impl.policies.EReferencePropertiesEditionContext;

 import org.eclipse.emf.eef.runtime.impl.services.PropertiesEditionPolicyProviderService;

-import org.eclipse.emf.eef.runtime.impl.utils.EMFListEditUtil;

+import org.eclipse.emf.eef.runtime.policies.PropertiesEditingPolicy;

+import org.eclipse.emf.eef.runtime.policies.PropertiesEditingPolicyProvider;

+import org.eclipse.emf.eef.runtime.policies.impl.CreateEditingPolicy;

 import org.eclipse.emf.eef.runtime.ui.widgets.ReferencesTable;

 import org.eclipse.emf.eef.runtime.ui.widgets.ReferencesTable.ReferencesTableListener;

+import org.eclipse.emf.eef.runtime.ui.widgets.referencestable.ReferencesTableContentProvider;

+import org.eclipse.emf.eef.runtime.ui.widgets.referencestable.ReferencesTableSettings;

 import org.eclipse.jface.viewers.ViewerFilter;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.layout.GridLayout;

@@ -53,10 +54,9 @@ import org.eclipse.ui.forms.widgets.Section;
  */
 public class RootPropertiesEditionPartForm extends CompositePropertiesEditionPart implements IFormPropertiesEditionPart, RootPropertiesEditionPart {
 
-	protected EMFListEditUtil samplesEditUtil;
-		protected ReferencesTable<? extends EObject> samples;
-		protected List<ViewerFilter> samplesBusinessFilters = new ArrayList<ViewerFilter>();
-		protected List<ViewerFilter> samplesFilters = new ArrayList<ViewerFilter>();
+	protected ReferencesTable<? extends EObject> samples;
+	protected List<ViewerFilter> samplesBusinessFilters = new ArrayList<ViewerFilter>();
+	protected List<ViewerFilter> samplesFilters = new ArrayList<ViewerFilter>();
 
 
 
@@ -151,54 +151,40 @@ public class RootPropertiesEditionPartForm extends CompositePropertiesEditionPar
 	 * 
 	 */
 	protected void addToSamples() {
-		// Start of user code addToSamples() method body
-				IPropertiesEditionPolicyProvider policyProvider = PropertiesEditionPolicyProviderService.getInstance().getProvider(current);
-				IPropertiesEditionPolicy editionPolicy = policyProvider.getEditionPolicy(current);
-				if (editionPolicy != null) {
-					EObject propertiesEditionObject = editionPolicy.getPropertiesEditionObject(new EReferencePropertiesEditionContext(propertiesEditionComponent, EefnrPackage.eINSTANCE.getRoot_Samples(), resourceSet));
-					if (propertiesEditionObject != null) {
-						samplesEditUtil.addElement(propertiesEditionObject);
-						samples.refresh();
-						propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(RootPropertiesEditionPartForm.this, EefnrViewsRepository.Root.samples, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.ADD, null, propertiesEditionObject));
-					}
-				}
-		
+		EReferencePropertiesEditionContext context = new EReferencePropertiesEditionContext(propertiesEditionComponent, current, EefnrPackage.eINSTANCE.getRoot_Samples(), resourceSet);
+		PropertiesEditingPolicyProvider provider = PropertiesEditionPolicyProviderService.getInstance().getProvider(context);
+		PropertiesEditingPolicy policy = provider.getPolicy(context);
+		if (policy instanceof CreateEditingPolicy) {
+			policy.execute();
+			EObject resultEObject = (EObject) ((CreateEditingPolicy) policy).getResult();
+			if (resultEObject != null) {
+				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(RootPropertiesEditionPartForm.this, EefnrViewsRepository.Root.samples, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.ADD, null, resultEObject));
+				samples.refresh();
+			}
+		}
 		
-		// End of user code
-
 	}
 
 	/**
 	 * 
 	 */
 	protected void removeFromSamples(AbstractSample element) {
-		// Start of user code for the removeFromSamples() method body
-				EObject editedElement = samplesEditUtil.foundCorrespondingEObject(element);
-				samplesEditUtil.removeElement(element);
+				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(RootPropertiesEditionPartForm.this, EefnrViewsRepository.Root.samples, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element));
 				samples.refresh();
-				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(RootPropertiesEditionPartForm.this, EefnrViewsRepository.Root.samples, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, editedElement));
 		
-		// End of user code
 	}
 
 	/**
 	 * 
 	 */
 	protected void editSamples(AbstractSample element) {
-		// Start of user code editSamples() method body
-				EObject editedElement = samplesEditUtil.foundCorrespondingEObject(element);
-				IPropertiesEditionPolicyProvider policyProvider = PropertiesEditionPolicyProviderService.getInstance().getProvider(element);
-				IPropertiesEditionPolicy editionPolicy = policyProvider	.getEditionPolicy(editedElement);
-				if (editionPolicy != null) {
-					EObject propertiesEditionObject = editionPolicy.getPropertiesEditionObject(new EObjectPropertiesEditionContext(null, element,resourceSet));
-					if (propertiesEditionObject != null) {
-						samplesEditUtil.putElementToRefresh(editedElement, propertiesEditionObject);
-						samples.refresh();
-						propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(RootPropertiesEditionPartForm.this, EefnrViewsRepository.Root.samples, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.SET, editedElement, propertiesEditionObject));
-					}
-				}
-		
-		// End of user code
+		EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(null, element,resourceSet);
+		PropertiesEditingPolicyProvider policyProvider = PropertiesEditionPolicyProviderService.getInstance().getProvider(context);
+		PropertiesEditingPolicy editionPolicy = policyProvider.getPolicy(context);
+		if (editionPolicy != null) {
+			editionPolicy.execute();
+			samples.refresh();
+		}
 	}
 
 
@@ -215,69 +201,19 @@ public class RootPropertiesEditionPartForm extends CompositePropertiesEditionPar
 		// End of user code
 	}
 
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.eef.eefnr.parts.RootPropertiesEditionPart#getSamplesToAdd()
-	 * 
-	 */
-	public List getSamplesToAdd() {
-		return samplesEditUtil.getElementsToAdd();
-	}
 
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.eef.eefnr.parts.RootPropertiesEditionPart#getSamplesToRemove()
-	 * 
-	 */
-	public List getSamplesToRemove() {
-		return samplesEditUtil.getElementsToRemove();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.eef.eefnr.parts.RootPropertiesEditionPart#getSamplesToEdit()
-	 * 
-	 */
-	public Map getSamplesToEdit() {
-		return samplesEditUtil.getElementsToRefresh();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.eef.eefnr.parts.RootPropertiesEditionPart#getSamplesToMove()
-	 * 
-	 */
-	public List getSamplesToMove() {
-		return samplesEditUtil.getElementsToMove();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.eef.eefnr.parts.RootPropertiesEditionPart#getSamplesTable()
-	 * 
-	 */
-	public List getSamplesTable() {
-		return samplesEditUtil.getVirtualList();
-	}
 
 	/**
 	 * {@inheritDoc}
 	 * 
 	 * @see org.eclipse.emf.eef.eefnr.parts.RootPropertiesEditionPart#initSamples(EObject current, EReference containingFeature, EReference feature)
 	 */
-	public void initSamples(EObject current, EReference containingFeature, EReference feature) {
+	public void initSamples(ReferencesTableSettings settings) {
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
-		if (containingFeature != null)
-			samplesEditUtil = new EMFListEditUtil(current, containingFeature, feature);
-		else
-			samplesEditUtil = new EMFListEditUtil(current, feature);
-		this.samples.setInput(samplesEditUtil.getVirtualList());
+		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
+		samples.setContentProvider(contentProvider);
+		samples.setInput(settings);
 	}
 
 	/**
@@ -287,11 +223,8 @@ public class RootPropertiesEditionPartForm extends CompositePropertiesEditionPar
 	 * 
 	 */
 	public void updateSamples(EObject newValue) {
-		if(samplesEditUtil != null){
-			samplesEditUtil.reinit(newValue);
-			samples.refresh();
-		}
-	}
+	samples.refresh();
+}
 
 	/**
 	 * {@inheritDoc}
@@ -320,7 +253,7 @@ public class RootPropertiesEditionPartForm extends CompositePropertiesEditionPar
 	 * 
 	 */
 	public boolean isContainedInSamplesTable(EObject element) {
-		return samplesEditUtil.contains(element);
+		return ((ReferencesTableSettings)samples.getInput()).contains(element);
 	}
 
 
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java
index 71b1e3f5b..8c0d6c077 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java
@@ -13,7 +13,6 @@ package org.eclipse.emf.eef.eefnr.parts.impl;
 // Start of user code for imports
 import java.util.ArrayList;

 import java.util.List;

-import java.util.Map;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EReference;

@@ -25,16 +24,18 @@ import org.eclipse.emf.eef.eefnr.providers.EefnrMessages;
 import org.eclipse.emf.eef.runtime.api.component.IPropertiesEditionComponent;

 import org.eclipse.emf.eef.runtime.api.notify.IPropertiesEditionEvent;

 import org.eclipse.emf.eef.runtime.api.parts.ISWTPropertiesEditionPart;

-import org.eclipse.emf.eef.runtime.api.policies.IPropertiesEditionPolicy;

-import org.eclipse.emf.eef.runtime.api.providers.IPropertiesEditionPolicyProvider;

 import org.eclipse.emf.eef.runtime.impl.notify.PropertiesEditionEvent;

 import org.eclipse.emf.eef.runtime.impl.parts.CompositePropertiesEditionPart;

 import org.eclipse.emf.eef.runtime.impl.policies.EObjectPropertiesEditionContext;

 import org.eclipse.emf.eef.runtime.impl.policies.EReferencePropertiesEditionContext;

 import org.eclipse.emf.eef.runtime.impl.services.PropertiesEditionPolicyProviderService;

-import org.eclipse.emf.eef.runtime.impl.utils.EMFListEditUtil;

+import org.eclipse.emf.eef.runtime.policies.PropertiesEditingPolicy;

+import org.eclipse.emf.eef.runtime.policies.PropertiesEditingPolicyProvider;

+import org.eclipse.emf.eef.runtime.policies.impl.CreateEditingPolicy;

 import org.eclipse.emf.eef.runtime.ui.widgets.ReferencesTable;

 import org.eclipse.emf.eef.runtime.ui.widgets.ReferencesTable.ReferencesTableListener;

+import org.eclipse.emf.eef.runtime.ui.widgets.referencestable.ReferencesTableContentProvider;

+import org.eclipse.emf.eef.runtime.ui.widgets.referencestable.ReferencesTableSettings;

 import org.eclipse.jface.viewers.ViewerFilter;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridData;

@@ -52,10 +53,9 @@ import org.eclipse.swt.widgets.Group;
  */
 public class RootPropertiesEditionPartImpl extends CompositePropertiesEditionPart implements ISWTPropertiesEditionPart, RootPropertiesEditionPart {
 
-	protected EMFListEditUtil samplesEditUtil;
-	protected ReferencesTable<? extends EObject> samples;
-	protected List<ViewerFilter> samplesBusinessFilters = new ArrayList<ViewerFilter>();
-	protected List<ViewerFilter> samplesFilters = new ArrayList<ViewerFilter>();
+protected ReferencesTable<? extends EObject> samples;
+protected List<ViewerFilter> samplesBusinessFilters = new ArrayList<ViewerFilter>();
+protected List<ViewerFilter> samplesFilters = new ArrayList<ViewerFilter>();
 
 
 
@@ -112,7 +112,7 @@ public class RootPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		GridLayout propertiesGroupLayout = new GridLayout();
 		propertiesGroupLayout.numColumns = 3;
 		propertiesGroup.setLayout(propertiesGroupLayout);
-		createSamplesAdvancedTableComposition(propertiesGroup);
+createSamplesAdvancedTableComposition(propertiesGroup);
 	}
 
 	/**
@@ -148,50 +148,40 @@ public class RootPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 	 *  
 	 */
 	protected void addToSamples() {
-		// Start of user code addToSamples() method body
-				IPropertiesEditionPolicyProvider policyProvider = PropertiesEditionPolicyProviderService.getInstance().getProvider(current);
-				IPropertiesEditionPolicy editionPolicy = policyProvider.getEditionPolicy(current);
-				if (editionPolicy != null) {
-					EObject propertiesEditionObject = editionPolicy.getPropertiesEditionObject(new EReferencePropertiesEditionContext(propertiesEditionComponent, EefnrPackage.eINSTANCE.getRoot_Samples(), resourceSet));
-					if (propertiesEditionObject != null) {
-						samplesEditUtil.addElement(propertiesEditionObject);
-						samples.refresh();
-						propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(RootPropertiesEditionPartImpl.this, EefnrViewsRepository.Root.samples, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.ADD, null, propertiesEditionObject));
-					}
-				}
+		EReferencePropertiesEditionContext context = new EReferencePropertiesEditionContext(propertiesEditionComponent, current, EefnrPackage.eINSTANCE.getRoot_Samples(), resourceSet);
+		PropertiesEditingPolicyProvider provider = PropertiesEditionPolicyProviderService.getInstance().getProvider(context);
+		PropertiesEditingPolicy policy = provider.getPolicy(context);
+		if (policy instanceof CreateEditingPolicy) {
+			policy.execute();
+			EObject resultEObject = (EObject) ((CreateEditingPolicy) policy).getResult();
+			if (resultEObject != null) {
+				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(RootPropertiesEditionPartImpl.this, EefnrViewsRepository.Root.samples, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.ADD, null, resultEObject));
+				samples.refresh();
+			}
+		}
 		
-		// End of user code
 	}
 
 	/**
 	 *  
 	 */
 	protected void removeFromSamples(AbstractSample element) {
-		// Start of user code removeFromSamples() method body
-				EObject editedElement = samplesEditUtil.foundCorrespondingEObject(element);
-				samplesEditUtil.removeElement(element);
+				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(RootPropertiesEditionPartImpl.this, EefnrViewsRepository.Root.samples, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element));
 				samples.refresh();
-				propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(RootPropertiesEditionPartImpl.this, EefnrViewsRepository.Root.samples, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.REMOVE, null, editedElement));
-		// End of user code
+		
 	}
 
 	/**
 	 *  
 	 */
 	protected void editSamples(AbstractSample element) {
-		// Start of user code editSamples() method body
-				EObject editedElement = samplesEditUtil.foundCorrespondingEObject(element);
-				IPropertiesEditionPolicyProvider policyProvider = PropertiesEditionPolicyProviderService.getInstance().getProvider(element);
-				IPropertiesEditionPolicy editionPolicy = policyProvider	.getEditionPolicy(editedElement);
-				if (editionPolicy != null) {
-					EObject propertiesEditionObject = editionPolicy.getPropertiesEditionObject(new EObjectPropertiesEditionContext(null, element,resourceSet));
-					if (propertiesEditionObject != null) {
-						samplesEditUtil.putElementToRefresh(editedElement, propertiesEditionObject);
-						samples.refresh();
-						propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(RootPropertiesEditionPartImpl.this, EefnrViewsRepository.Root.samples, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, editedElement, propertiesEditionObject));
-					}
-				}
-		// End of user code
+		EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(null, element,resourceSet);
+		PropertiesEditingPolicyProvider policyProvider = PropertiesEditionPolicyProviderService.getInstance().getProvider(context);
+		PropertiesEditingPolicy editionPolicy = policyProvider.getPolicy(context);
+		if (editionPolicy != null) {
+			editionPolicy.execute();
+			samples.refresh();
+		}
 	}
 
 
@@ -208,69 +198,19 @@ public class RootPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 		// End of user code
 	}
 
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.eef.eefnr.parts.RootPropertiesEditionPart#getSamplesToAdd()
-	 * 
-	 */
-	public List getSamplesToAdd() {
-		return samplesEditUtil.getElementsToAdd();
-	}
 
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.eef.eefnr.parts.RootPropertiesEditionPart#getSamplesToRemove()
-	 * 
-	 */
-	public List getSamplesToRemove() {
-		return samplesEditUtil.getElementsToRemove();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.eef.eefnr.parts.RootPropertiesEditionPart#getSamplesToEdit()
-	 * 
-	 */
-	public Map getSamplesToEdit() {
-		return samplesEditUtil.getElementsToRefresh();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.eef.eefnr.parts.RootPropertiesEditionPart#getSamplesToMove()
-	 * 
-	 */
-	public List getSamplesToMove() {
-		return samplesEditUtil.getElementsToMove();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.eef.eefnr.parts.RootPropertiesEditionPart#getSamplesTable()
-	 * 
-	 */
-	public List getSamplesTable() {
-		return samplesEditUtil.getVirtualList();
-	}
 
 	/**
 	 * {@inheritDoc}
 	 * 
 	 * @see org.eclipse.emf.eef.eefnr.parts.RootPropertiesEditionPart#initSamples(EObject current, EReference containingFeature, EReference feature)
 	 */
-	public void initSamples(EObject current, EReference containingFeature, EReference feature) {
+	public void initSamples(ReferencesTableSettings settings) {
 		if (current.eResource() != null && current.eResource().getResourceSet() != null)
 			this.resourceSet = current.eResource().getResourceSet();
-		if (containingFeature != null)
-			samplesEditUtil = new EMFListEditUtil(current, containingFeature, feature);
-		else
-			samplesEditUtil = new EMFListEditUtil(current, feature);
-		this.samples.setInput(samplesEditUtil.getVirtualList());
+		ReferencesTableContentProvider contentProvider = new ReferencesTableContentProvider();
+		samples.setContentProvider(contentProvider);
+		samples.setInput(settings);
 	}
 
 	/**
@@ -280,11 +220,8 @@ public class RootPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 	 * 
 	 */
 	public void updateSamples(EObject newValue) {
-		if(samplesEditUtil != null){
-			samplesEditUtil.reinit(newValue);
-			samples.refresh();
-		}
-	}
+	samples.refresh();
+}
 
 	/**
 	 * {@inheritDoc}
@@ -313,7 +250,7 @@ public class RootPropertiesEditionPartImpl extends CompositePropertiesEditionPar
 	 * 
 	 */
 	public boolean isContainedInSamplesTable(EObject element) {
-		return samplesEditUtil.contains(element);
+		return ((ReferencesTableSettings)samples.getInput()).contains(element);
 	}