412274: [Table 2] ComboBox for Enumeration doesn't display the correct values

https://bugs.eclipse.org/bugs/show_bug.cgi?id=412274

20 files changed, 387 insertions, 242 deletions

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java b/extraplugins/table/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java
index 9330a162e4d..e9ac239eaff 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFEObjectHeaderLabelProvider.java
@@ -21,8 +21,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.provider.AbstractNattableCellLabelProvider;

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

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

+import org.eclipse.papyrus.infra.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;

 

@@ -43,8 +43,8 @@ public class EMFEObjectHeaderLabelProvider extends AbstractNattableCellLabelProv
 	 */

 	@Override

 	public boolean accept(Object element) {

-		if(element instanceof ILabelProviderContextElement) {

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

+		if(element instanceof ILabelProviderContextElementWrapper) {

+			Object object = ((ILabelProviderContextElementWrapper)element).getObject();

 			if(object instanceof IAxis) {

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

 			}

@@ -62,16 +62,16 @@ public class EMFEObjectHeaderLabelProvider extends AbstractNattableCellLabelProv
 	 */

 	@Override

 	public String getText(Object element) {

-		ILabelProviderContextElement context = (ILabelProviderContextElement)element;

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

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

-			conf = getLabelConfiguration((LabelProviderCellContextElement)element);

+		if(element instanceof LabelProviderCellContextElementWrapper) {

+			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper)element);

 		}

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

 			return "";

@@ -88,15 +88,15 @@ public class EMFEObjectHeaderLabelProvider extends AbstractNattableCellLabelProv
 	 */

 	@Override

 	public Image getImage(Object element) {

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

+		EObject object = (EObject)((ILabelProviderContextElementWrapper)element).getObject();

 		if(object instanceof EObjectAxis) {

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

 		}

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

+		final IConfigRegistry configRegistry = ((ILabelProviderContextElementWrapper)element).getConfigRegistry();

 		final LabelProviderService serv = getLabelProviderService(configRegistry);

 		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElement) {

-			conf = getLabelConfiguration((LabelProviderCellContextElement)element);

+		if(element instanceof LabelProviderCellContextElementWrapper) {

+			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper)element);

 		}

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

 			return null;

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFFeatureHeaderLabelProvider.java b/extraplugins/table/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFFeatureHeaderLabelProvider.java
index 647a7ca8520..b9310752f39 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFFeatureHeaderLabelProvider.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.emf.nattable/src/org/eclipse/papyrus/infra/emf/nattable/provider/EMFFeatureHeaderLabelProvider.java
@@ -23,8 +23,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructura
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.FeatureLabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

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

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

+import org.eclipse.papyrus.infra.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;

 

@@ -46,8 +46,8 @@ public class EMFFeatureHeaderLabelProvider extends EMFEObjectHeaderLabelProvider
 	 */

 	@Override

 	public boolean accept(Object element) {

-		if(element instanceof ILabelProviderContextElement) {

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

+		if(element instanceof ILabelProviderContextElementWrapper) {

+			final Object object = ((ILabelProviderContextElementWrapper)element).getObject();

 			return object instanceof EStructuralFeature || object instanceof EStructuralFeatureAxis;

 		}

 		return false;

@@ -141,20 +141,20 @@ public class EMFFeatureHeaderLabelProvider extends EMFEObjectHeaderLabelProvider
 	 */

 	@Override

 	public String getText(Object element) {

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

+		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)((ILabelProviderContextElement)element).getObject();

+			feature = (EStructuralFeature)((ILabelProviderContextElementWrapper)element).getObject();

 		}

 

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

+		final IConfigRegistry configRegistry = ((ILabelProviderContextElementWrapper)element).getConfigRegistry();

 		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElement) {

-			conf = getLabelConfiguration((LabelProviderCellContextElement)element);

+		if(element instanceof LabelProviderCellContextElementWrapper) {

+			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper)element);

 		}

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

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

@@ -180,19 +180,19 @@ public class EMFFeatureHeaderLabelProvider extends EMFEObjectHeaderLabelProvider
 	@Override

 	public Image getImage(Object element) {

 		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElement) {

-			conf = getLabelConfiguration((LabelProviderCellContextElement)element);

+		if(element instanceof LabelProviderCellContextElementWrapper) {

+			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper)element);

 		}

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

 			return null;

 		}

 

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

+		final Object object = ((ILabelProviderContextElementWrapper)element).getObject();

 		EStructuralFeature feature = null;

 		if(object instanceof EStructuralFeatureAxis) {

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

 		} else if(object instanceof EStructuralFeature) {

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

+			feature = (EStructuralFeature)((ILabelProviderContextElementWrapper)element).getObject();

 		}

 		if(feature instanceof EAttribute) {

 			return EStructuralFeatureImageRegistry.getAttributeIcon();

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java
index cd6f6548a77..7f6e2fdf9fd 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable.views.config/src/org/eclipse/papyrus/infra/nattable/views/config/provider/ModelViewsHeaderLabelProvider.java
@@ -22,8 +22,8 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.F
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

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

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

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

+import org.eclipse.papyrus.infra.nattable.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;

 

@@ -44,8 +44,8 @@ public class ModelViewsHeaderLabelProvider extends EMFFeatureHeaderLabelProvider
 	 */

 	@Override

 	public boolean accept(final Object element) {

-		if(element instanceof ILabelProviderContextElement) {

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

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

@@ -63,8 +63,9 @@ public class ModelViewsHeaderLabelProvider extends EMFFeatureHeaderLabelProvider
 	 */

 	@Override

 	public String getText(final Object element) {

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

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

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

@@ -84,17 +85,17 @@ public class ModelViewsHeaderLabelProvider extends EMFFeatureHeaderLabelProvider
 			type = EcorePackage.eINSTANCE.getEString();

 		}

 		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElement) {

-			conf = getLabelConfiguration((LabelProviderCellContextElement)element);

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

+		if(object instanceof FeatureAxis) {

 			alias = ((FeatureAxis)object).getAlias();

 		}

-		if(alias!=null && !alias.equals("")){ //$NON-NLS-1$

+		if(alias != null && !alias.equals("")) { //$NON-NLS-1$

 			name = alias;

 		}

 		if(conf instanceof FeatureLabelProviderConfiguration) {

@@ -114,13 +115,13 @@ public class ModelViewsHeaderLabelProvider extends EMFFeatureHeaderLabelProvider
 	@Override

 	public Image getImage(final Object element) {

 		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElement) {

-			conf = getLabelConfiguration((LabelProviderCellContextElement)element);

+		if(element instanceof LabelProviderCellContextElementWrapper) {

+			conf = getLabelConfiguration((LabelProviderCellContextElementWrapper)element);

 		}

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

 			return null;

 		}

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

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

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CustomizedCellPainter.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CustomizedCellPainter.java
index fd780498ad9..2ffef59f44a 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CustomizedCellPainter.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/CustomizedCellPainter.java
@@ -24,8 +24,8 @@ import org.eclipse.nebula.widgets.nattable.style.CellStyleUtil;
 import org.eclipse.nebula.widgets.nattable.style.DisplayMode;

 import org.eclipse.nebula.widgets.nattable.style.IStyle;

 import org.eclipse.papyrus.infra.nattable.utils.Constants;

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

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

+import org.eclipse.papyrus.infra.nattable.utils.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;

@@ -63,7 +63,7 @@ public class CustomizedCellPainter extends TextPainter {
 	@Override

 	protected String convertDataType(final ILayerCell cell, final IConfigRegistry configRegistry) {

 		final LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		final ILabelProviderContextElement contextElement = new LabelProviderCellContextElement(cell, configRegistry);

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

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
index aa0f9e322f4..a0945f736fd 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/converter/GenericDisplayConverter.java
@@ -19,8 +19,8 @@ import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
 import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

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

 import org.eclipse.papyrus.infra.nattable.utils.Constants;

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

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

+import org.eclipse.papyrus.infra.nattable.utils.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;

 

@@ -66,10 +66,10 @@ public class GenericDisplayConverter implements IDisplayConverter {
 	 * @param canonicalValue

 	 * @return

 	 */

-	public Object canonicalToDisplayValue(ILayerCell cell, IConfigRegistry configRegistry, Object canonicalValue) {

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

-		ILabelProvider labelProvider = service.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT);

-		final ILabelProviderContextElement contextElement = new LabelProviderCellContextElement(cell, configRegistry);

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

 	}

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java
index 62a47b46891..8ab8cf77e6a 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/painter/CustomImagePainter.java
@@ -19,8 +19,8 @@ import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
 import org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter;

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

 import org.eclipse.papyrus.infra.nattable.utils.Constants;

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

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

+import org.eclipse.papyrus.infra.nattable.utils.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;

@@ -44,7 +44,7 @@ public class CustomImagePainter extends ImagePainter {
 	@Override

 	protected Image getImage(ILayerCell cell, IConfigRegistry configRegistry) {

 		final LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

-		final ILabelProviderContextElement contextElement = new LabelProviderCellContextElement(cell, configRegistry);

+		final ILabelProviderContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper(cell, configRegistry);

 		final ILabelProvider provider = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT, contextElement);

 		return provider.getImage(contextElement);

 	}

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractNattableCellLabelProvider.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractNattableCellLabelProvider.java
index 8d42697d5e5..813f4fea68b 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractNattableCellLabelProvider.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/AbstractNattableCellLabelProvider.java
@@ -22,9 +22,9 @@ import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

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

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

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

+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;

 import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

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

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

@@ -160,11 +160,11 @@ public abstract class AbstractNattableCellLabelProvider implements IFilteredLabe
 	 * @return

 	 *         the configuration to use for this element

 	 */

-	protected ILabelProviderConfiguration getLabelConfiguration(final LabelProviderCellContextElement element) {

+	protected ILabelProviderConfiguration getLabelConfiguration(final LabelProviderCellContextElementWrapper element) {

 		ILabelProviderConfiguration conf = null;

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

+		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.getCell().getConfigLabels();

+		LabelStack labels = element.getConfigLabels();

 		if(labels.hasLabel(GridRegion.COLUMN_HEADER)) {

 			conf = LabelConfigurationManagementUtils.getUsedColumnObjectLabelConfiguration(manager.getTable());

 		} else if(labels.hasLabel(GridRegion.ROW_HEADER)) {

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/GenericCellLabelProvider.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/GenericCellLabelProvider.java
index 6041dc1c87f..fd1fac6b157 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/GenericCellLabelProvider.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/GenericCellLabelProvider.java
@@ -19,8 +19,8 @@ import java.util.Iterator;
 import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

 import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

 import org.eclipse.papyrus.infra.nattable.utils.Constants;

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

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

+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderCellContextElementWrapper;

+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;

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

 

 /**

@@ -37,12 +37,12 @@ public class GenericCellLabelProvider extends AbstractNattableCellLabelProvider
 	 * 

 	 * @param element

 	 * @return

-	 *         <code>true</code> if the element is an instance of {@link ILabelProviderContextElement} and if the cell represents an

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

+		return element instanceof ILabelProviderCellContextElementWrapper;

 	}

 

 	/**

@@ -54,9 +54,9 @@ public class GenericCellLabelProvider extends AbstractNattableCellLabelProvider
 	 */

 	@Override

 	public String getText(Object element) {

-		final ILayerCell cell = ((ILabelProviderCellContextElement)element).getCell();

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

-		Object value = cell.getDataValue();

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

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java
index 07d38e2a9ac..6fef13f8b7e 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/IndexHeaderLabelProvider.java
@@ -13,7 +13,7 @@
  *****************************************************************************/

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

 

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

+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;

 

 /**

  * The label provider used for the index of the header

@@ -32,8 +32,8 @@ public class IndexHeaderLabelProvider extends AbstractNattableCellLabelProvider
 	 */

 	@Override

 	public boolean accept(Object element) {

-		if(element instanceof ILabelProviderContextElement) {

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

+		if(element instanceof ILabelProviderContextElementWrapper) {

+			Object object = ((ILabelProviderContextElementWrapper)element).getObject();

 			return object instanceof String || object instanceof Integer;

 		}

 		return false;

@@ -48,6 +48,6 @@ public class IndexHeaderLabelProvider extends AbstractNattableCellLabelProvider
 	 */

 	@Override

 	public String getText(Object element) {

-		return ((ILabelProviderContextElement)element).getObject().toString();

+		return ((ILabelProviderContextElementWrapper)element).getObject().toString();

 	}

 }

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java
index 350bf3061e7..32ba131f182 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/NattableTopLabelProvider.java
@@ -23,9 +23,9 @@ import org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetMa
 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

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

 import org.eclipse.papyrus.infra.nattable.utils.Constants;

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

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

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

+import org.eclipse.papyrus.infra.nattable.utils.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;

@@ -45,7 +45,7 @@ public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider
 	 * @param configRegistry

 	 * @return

 	 */

-	protected String getColumnHeaderLabel(final ILayerCell cell, final IConfigRegistry configRegistry) {

+	protected String getColumnHeaderLabel(final ILabelProviderCellContextElementWrapper cell, final IConfigRegistry configRegistry) {

 		return getLabel(cell, configRegistry, Constants.HEADER_LABEL_PROVIDER_CONTEXT);

 	}

 

@@ -55,7 +55,7 @@ public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider
 	 * @param configRegistry

 	 * @return

 	 */

-	protected String getRowHeaderLabel(final ILayerCell cell, final IConfigRegistry configRegistry) {

+	protected String getRowHeaderLabel(final ILabelProviderCellContextElementWrapper cell, final IConfigRegistry configRegistry) {

 		return getLabel(cell, configRegistry, Constants.HEADER_LABEL_PROVIDER_CONTEXT);

 	}

 

@@ -68,22 +68,17 @@ public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider
 	 */

 	@Override

 	public String getText(Object element) {

-		final ILayerCell cell = ((ILabelProviderCellContextElement)element).getCell();

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

-		String labelProviderContextId = null;

-		if(element instanceof IAxis) {

-			labelProviderContextId = ((IAxis)element).getManager().getLabelProviderContext();

-			return getLabel(cell, configRegistry, labelProviderContextId);

-		}

-		final LabelStack labels = getLabelStack(cell, configRegistry);

+		final ILabelProviderCellContextElementWrapper contextElement = (ILabelProviderCellContextElementWrapper)element;

+		final IConfigRegistry configRegistry = contextElement.getConfigRegistry();

+		final LabelStack labels = getLabelStack(contextElement, configRegistry);

 		if(labels.hasLabel(GridRegion.COLUMN_HEADER)) {

-			return getColumnHeaderLabel(cell, configRegistry);

+			return getColumnHeaderLabel(contextElement, configRegistry);

 		} else if(labels.hasLabel(GridRegion.ROW_HEADER)) {

-			return getRowHeaderLabel(cell, configRegistry);

+			return getRowHeaderLabel(contextElement, configRegistry);

 		} else if(labels.hasLabel(GridRegion.BODY)) {

-			return getBodyLabel(cell, configRegistry);

+			return getBodyLabel(contextElement, configRegistry);

 		}

-		Object value = cell.getDataValue();

+		Object value = contextElement.getObject();

 		if(value != null) {

 			return value.toString();

 		}

@@ -96,12 +91,12 @@ public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider
 	 * @param configRegistry

 	 * @return

 	 */

-	protected LabelStack getLabelStack(final ILayerCell cell, final IConfigRegistry configRegistry) {

-		LabelStack labels = cell.getConfigLabels();

+	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(cell.getColumnPosition(), cell.getRowPosition());

+			labels = ((AbstractNattableWidgetManager)manager).getGridLayer().getBodyLayer().getConfigLabelsByPosition(contextElement.getColumnPosition(), contextElement.getRowPosition());

 		}

 		return labels;

 	}

@@ -113,24 +108,24 @@ public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider
 	 * @param labelproviderContext

 	 * @return

 	 */

-	protected String getLabel(final ILayerCell cell, final IConfigRegistry configRegistry, final String labelproviderContext) {

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

+		//		Object value = cell.getDataValue();

+		//		final ILabelProviderContextElement contextElement = new LabelProviderCellContextElement(cell, configRegistry);

 		LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

 		ILabelProvider labelProvider = serv.getLabelProvider(labelproviderContext, contextElement);

 		if(labelProvider != null) {

 			txt = labelProvider.getText(contextElement);

 		} else {

-			labelProvider = serv.getLabelProvider(labelproviderContext, value);

+			labelProvider = serv.getLabelProvider(labelproviderContext, contextElement.getObject());

 			if(labelProvider != null) {

-				txt = labelProvider.getText(value);

+				txt = labelProvider.getText(contextElement.getObject());

 			} else {

-				labelProvider = serv.getLabelProvider(value);

+				labelProvider = serv.getLabelProvider(contextElement.getObject());

 				if(labelProvider != null) {

-					txt = labelProvider.getText(value);

+					txt = labelProvider.getText(contextElement.getObject());

 				} else {

-					txt = value.toString();

+					txt = contextElement.getObject().toString();

 				}

 			}

 		}

@@ -139,12 +134,12 @@ public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider
 

 	/**

 	 * 

-	 * @param cell

+	 * @param cellWrapperContextElement

 	 * @param configRegistry

 	 * @return

 	 */

-	protected String getBodyLabel(final ILayerCell cell, final IConfigRegistry configRegistry) {//Body or data grid?

-		return getLabel(cell, configRegistry, Constants.BODY_LABEL_PROVIDER_CONTEXT);

+	protected String getBodyLabel(final ILabelProviderCellContextElementWrapper cellWrapperContextElement, final IConfigRegistry configRegistry) {//Body or data grid?

+		return getLabel(cellWrapperContextElement, configRegistry, Constants.BODY_LABEL_PROVIDER_CONTEXT);

 	}

 

 	/**

@@ -156,7 +151,7 @@ public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider
 	 */

 	@Override

 	public boolean accept(Object element) {

-		return element instanceof ILabelProviderCellContextElement;

+		return element instanceof ILabelProviderCellContextElementWrapper;

 	}

 

 	/**

@@ -168,25 +163,26 @@ public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider
 	 */

 	@Override

 	public Image getImage(Object element) {

-		if(element instanceof ILabelProviderContextElement) {

-			final ILayerCell cell = ((ILabelProviderCellContextElement)element).getCell();

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

-			String labelProviderContextId = null;

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

-			if(object instanceof IAxis) {

-				labelProviderContextId = ((IAxis)object).getManager().getLabelProviderContext();

-				return getImage(cell, configRegistry, labelProviderContextId);

-			}

-			final LabelStack labels = getLabelStack(cell, configRegistry);

-			if(labels.hasLabel(GridRegion.COLUMN_HEADER)) {

-				return getColumnHeaderImage(cell, configRegistry);

-			} else if(labels.hasLabel(GridRegion.ROW_HEADER)) {

-				return getRowHeaderImage(cell, configRegistry);

-			} else if(labels.hasLabel(GridRegion.BODY)) {

-				return getBodyLabelImage(cell, configRegistry);

-			}

+		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 super.getImage(element);

+

+		return null;

 	}

 

 	/**

@@ -195,7 +191,7 @@ public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider
 	 * @param configRegistry

 	 * @return

 	 */

-	private Image getBodyLabelImage(ILayerCell cell, IConfigRegistry configRegistry) {

+	private Image getBodyLabelImage(ILabelProviderCellContextElementWrapper cell, IConfigRegistry configRegistry) {

 		return null;

 	}

 

@@ -208,7 +204,7 @@ public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider
 	 * @return

 	 *         the image to display in the row

 	 */

-	private Image getRowHeaderImage(ILayerCell cell, IConfigRegistry configRegistry) {

+	private Image getRowHeaderImage(ILabelProviderCellContextElementWrapper cell, IConfigRegistry configRegistry) {

 		return getImage(cell, configRegistry, Constants.HEADER_LABEL_PROVIDER_CONTEXT);

 	}

 

@@ -222,15 +218,14 @@ public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider
 	 *        the context to used to find the label provider

 	 * @return

 	 */

-	private Image getImage(ILayerCell cell, IConfigRegistry configRegistry, String labelproviderContext) {

+	private Image getImage(ILabelProviderCellContextElementWrapper contextElement, IConfigRegistry configRegistry, String labelproviderContext) {

 		Image image = null;

-		Object value = cell.getDataValue();

-		final ILabelProviderContextElement contextElement = new LabelProviderCellContextElement(cell, configRegistry);

 		LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

 		ILabelProvider labelProvider = serv.getLabelProvider(labelproviderContext, contextElement);

 		if(labelProvider != null) {

 			image = labelProvider.getImage(contextElement);

 		} else {

+			Object value = contextElement.getObject();

 			labelProvider = serv.getLabelProvider(labelproviderContext, value);

 			if(labelProvider != null) {

 				image = labelProvider.getImage(value);

@@ -253,7 +248,7 @@ public class NattableTopLabelProvider extends AbstractNattableCellLabelProvider
 	 * @return

 	 *         the image to display for the header

 	 */

-	private Image getColumnHeaderImage(ILayerCell cell, IConfigRegistry configRegistry) {

+	private Image getColumnHeaderImage(ILabelProviderCellContextElementWrapper cell, IConfigRegistry configRegistry) {

 		return getImage(cell, configRegistry, Constants.HEADER_LABEL_PROVIDER_CONTEXT);

 	}

 

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
index a851c1d647e..a623bdc7129 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/AxisComparator.java
@@ -87,6 +87,6 @@ public class AxisComparator implements Comparator<IAxis> {
 	 */

 	protected String getText(final LabelProviderService serv, final Object obj) {

 		final ILabelProvider provider = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT);

-		return provider.getText(new LabelProviderContextElement(obj, this.configRegistry));

+		return provider.getText(new LabelProviderContextElementWrapper(obj, this.configRegistry));

 	}

 }

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElement.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElementWrapper.java
index 9bad7e4eab5..ae7cf708c22 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElement.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderCellContextElementWrapper.java
@@ -13,6 +13,7 @@
  *****************************************************************************/

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

 

+import org.eclipse.nebula.widgets.nattable.layer.LabelStack;

 import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

 

 

@@ -22,15 +23,8 @@ import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
  * @author Vincent Lorenzo

  * 

  */

-public interface ILabelProviderCellContextElement extends ILabelProviderContextElement {

-

-	/**

-	 * 

-	 * @return

-	 *         the cell for which we want the label

-	 */

-	public ILayerCell getCell();

-

-

+//FIXME : must implements ILayerCell

+public interface ILabelProviderCellContextElementWrapper extends ILabelProviderContextElementWrapper , ILayerCell{

+		

 

 }

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElement.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElementWrapper.java
index b26f24b308a..d9a90866edd 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElement.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/ILabelProviderContextElementWrapper.java
@@ -22,7 +22,7 @@ import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
  * @author Vincent Lorenzo

  * 

  */

-public interface ILabelProviderContextElement {

+public interface ILabelProviderContextElementWrapper {

 

 	/**

 	 * 

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElement.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElement.java
deleted file mode 100644
index 06c9917d1ff..00000000000
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElement.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2013 CEA LIST.

- *

- *

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

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

- * which accompanies this distribution, and is available at

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

- *

- * Contributors:

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

- *

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

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

-

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

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

-

-/**

- * This object can used as context to find the best label provider and get the text to display.

- * Its allows to have the context of the value to use it in the label provider

- * 

- * @author Vincent Lorenzo

- * 

- */

-public class LabelProviderCellContextElement extends LabelProviderContextElement implements ILabelProviderCellContextElement {

-

-	/**

-	 * the cell

-	 */

-	private ILayerCell cell;

-

-	/**

-	 * *

-	 * Constructor.

-	 * 

-	 * @param cell

-	 *        the cell for which we want the label/icon, ...

-	 * @param registry

-	 *        the registry used by nattable

-	 */

-	public LabelProviderCellContextElement(ILayerCell cell, final IConfigRegistry registry) {

-		super(cell.getDataValue(), registry);

-		this.cell = cell;

-	}

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement#getCell()

-	 * 

-	 * @return

-	 */

-	public ILayerCell getCell() {

-		return this.cell;

-	}

-

-

-	/**

-	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.utils.LabelProviderContextElement#getObject()

-	 * 

-	 * @return

-	 */

-	@Override

-	public Object getObject() {

-		return this.cell.getDataValue();

-	}

-

-}

diff --git a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java
new file mode 100644
index 00000000000..687aa30df76
--- /dev/null
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderCellContextElementWrapper.java
@@ -0,0 +1,221 @@
+/*****************************************************************************

+ * Copyright (c) 2013 CEA LIST.

+ *

+ *

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

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

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.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/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElement.java b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElementWrapper.java
index 511950f9365..6b44ccb6353 100644
--- a/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElement.java
+++ b/extraplugins/table/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/LabelProviderContextElementWrapper.java
@@ -22,10 +22,16 @@ import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
  * @author Vincent Lorenzo

  * 

  */

-public class LabelProviderContextElement implements ILabelProviderContextElement {

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

 

 	/**

@@ -37,7 +43,7 @@ public class LabelProviderContextElement implements ILabelProviderContextElement
 	 * @param registry

 	 *        the registry used by nattable

 	 */

-	public LabelProviderContextElement(final Object object, final IConfigRegistry registry) {

+	public LabelProviderContextElementWrapper(final Object object, final IConfigRegistry registry) {

 		this.object = object;

 		this.registry = registry;

 	}

@@ -45,7 +51,7 @@ public class LabelProviderContextElement implements ILabelProviderContextElement
 

 	/**

 	 * 

-	 * @see org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElement#getConfigRegistry()

+	 * @see org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper#getConfigRegistry()

 	 * 

 	 * @return

 	 */

diff --git a/extraplugins/table/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java b/extraplugins/table/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java
index e6b0e293fa0..1ab8c233723 100644
--- a/extraplugins/table/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java
+++ b/extraplugins/table/org.eclipse.papyrus.sysml.nattable/src/org/eclipse/papyrus/sysml/nattable/provider/SysMLFlowPortDirectionLabelProvider.java
@@ -17,7 +17,7 @@ import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
 import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

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

 import org.eclipse.papyrus.infra.nattable.utils.Constants;

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

+import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;

 import org.eclipse.papyrus.sysml.service.types.matcher.FlowPortNAMatcher;

 import org.eclipse.papyrus.uml.nattable.provider.AbstractUMLNattableCellLabelProvider;

 import org.eclipse.uml2.uml.Port;

@@ -44,9 +44,9 @@ public class SysMLFlowPortDirectionLabelProvider extends AbstractUMLNattableCell
 	 */

 	@Override

 	public boolean accept(final Object element) {

-		if(element instanceof LabelProviderCellContextElement) {

-			final ILayerCell cell = ((LabelProviderCellContextElement)element).getCell();

-			final IConfigRegistry registry = ((LabelProviderCellContextElement)element).getConfigRegistry();

+		if(element instanceof LabelProviderCellContextElementWrapper) {

+			final ILayerCell cell = ((LabelProviderCellContextElementWrapper)element);

+			final IConfigRegistry registry = ((LabelProviderCellContextElementWrapper)element).getConfigRegistry();

 			final Object columnObject = getColumnObject(cell, registry);

 			String str = AxisUtils.getPropertyId(columnObject);

 			if(str == null) {

@@ -62,8 +62,8 @@ public class SysMLFlowPortDirectionLabelProvider extends AbstractUMLNattableCell
 

 	@Override

 	public String getText(Object element) {

-		final ILayerCell cell = ((LabelProviderCellContextElement)element).getCell();

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

+		final ILayerCell cell = ((LabelProviderCellContextElementWrapper)element);

+		final IConfigRegistry configRegistry = ((LabelProviderCellContextElementWrapper)element).getConfigRegistry();

 		final Object rowObject = getRowObject(cell, configRegistry);

 		final Object columObject = getColumnObject(cell, configRegistry);

 		Port port = null;

diff --git a/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyCellLabelProvider.java b/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyCellLabelProvider.java
index 94d2275f989..9b04c5fde1e 100644
--- a/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyCellLabelProvider.java
+++ b/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyCellLabelProvider.java
@@ -16,9 +16,7 @@ package org.eclipse.papyrus.uml.nattable.provider;
 import java.util.List;

 

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

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

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

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

+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderCellContextElementWrapper;

 import org.eclipse.uml2.uml.Property;

 

 

@@ -33,13 +31,14 @@ public class StereotypePropertyCellLabelProvider extends AbstractUMLNattableCell
 	 */

 	@Override

 	public boolean accept(Object element) {

-		if(element instanceof ILabelProviderCellContextElement) {

-			final ILayerCell cell = ((ILabelProviderCellContextElement)element).getCell();

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

+		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(cell, registry);

-			final Object columnObject = getColumnObject(cell, registry);

+			final Object rowObject = getRowObject(cellWrapperContextElement, registry);

+			final Object columnObject = getColumnObject(cellWrapperContextElement, registry);

 

 			final List<Object> objects = getUMLObjects(rowObject, columnObject);

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

diff --git a/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java b/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java
index 110c5403d6a..9affd0bb8a5 100644
--- a/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java
+++ b/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/StereotypePropertyHeaderLabelProvider.java
@@ -26,9 +26,9 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.F
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ILabelProviderConfiguration;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablelabelprovider.ObjectLabelProviderConfiguration;

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

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

+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderContextElementWrapper;

 import org.eclipse.papyrus.infra.nattable.utils.LabelConfigurationManagementUtils;

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

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

@@ -62,8 +62,8 @@ public class StereotypePropertyHeaderLabelProvider extends EMFFeatureHeaderLabel
 	 */

 	@Override

 	public boolean accept(Object element) {

-		if(element instanceof ILabelProviderContextElement) {

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

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

 		}

@@ -80,11 +80,11 @@ public class StereotypePropertyHeaderLabelProvider extends EMFFeatureHeaderLabel
 	@Override

 	public String getText(Object element) {

 		ILabelProviderConfiguration conf = null;

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

+		final IConfigRegistry configRegistry = ((ILabelProviderContextElementWrapper)element).getConfigRegistry();

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

-		if(element instanceof LabelProviderCellContextElement) {

+		if(element instanceof LabelProviderCellContextElementWrapper) {

 			INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-			LabelStack labels = ((LabelProviderCellContextElement)element).getCell().getConfigLabels();

+			LabelStack labels = ((LabelProviderCellContextElementWrapper)element).getConfigLabels();

 			if(labels.hasLabel(GridRegion.COLUMN_HEADER)) {

 				conf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(manager.getTable());

 			} else if(labels.hasLabel(GridRegion.ROW_HEADER)) {

@@ -95,8 +95,8 @@ public class StereotypePropertyHeaderLabelProvider extends EMFFeatureHeaderLabel
 		if(conf instanceof ObjectLabelProviderConfiguration && !((ObjectLabelProviderConfiguration)conf).isDisplayLabel()) {

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

 		}

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

-		if(value instanceof FeatureAxis){

+		final Object value = ((ILabelProviderContextElementWrapper)element).getObject();

+		if(value instanceof FeatureAxis) {

 			alias = ((FeatureAxis)value).getAlias();

 		}

 		final INattableModelManager modelManager = (INattableModelManager)getAxisContentProvider(configRegistry);

@@ -124,13 +124,13 @@ public class StereotypePropertyHeaderLabelProvider extends EMFFeatureHeaderLabel
 	 */

 	@Override

 	public Image getImage(Object element) {

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

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

+		final Object value = ((ILabelProviderContextElementWrapper)element).getObject();

+		final IConfigRegistry configRegistry = ((ILabelProviderContextElementWrapper)element).getConfigRegistry();

 		final INattableModelManager modelManager = (INattableModelManager)getAxisContentProvider(configRegistry);

 		ILabelProviderConfiguration conf = null;

-		if(element instanceof LabelProviderCellContextElement) {

+		if(element instanceof LabelProviderCellContextElementWrapper) {

 			INattableModelManager manager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);

-			LabelStack labels = ((LabelProviderCellContextElement)element).getCell().getConfigLabels();

+			LabelStack labels = ((LabelProviderCellContextElementWrapper)element).getConfigLabels();

 			if(labels.hasLabel(GridRegion.COLUMN_HEADER)) {

 				conf = LabelConfigurationManagementUtils.getUsedColumnFeatureLabelConfiguration(manager.getTable());

 			} else if(labels.hasLabel(GridRegion.ROW_HEADER)) {

diff --git a/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLUnlimitedNaturalLabelProvider.java b/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLUnlimitedNaturalLabelProvider.java
index 4c0d7e0e6d8..eb5fe242f17 100644
--- a/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLUnlimitedNaturalLabelProvider.java
+++ b/extraplugins/table/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/provider/UMLUnlimitedNaturalLabelProvider.java
@@ -17,10 +17,8 @@ import java.util.Collection;
 import java.util.List;

 

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

-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;

 import org.eclipse.papyrus.infra.nattable.utils.Constants;

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

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

+import org.eclipse.papyrus.infra.nattable.utils.ILabelProviderCellContextElementWrapper;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.util.UMLUtil;

 

@@ -41,12 +39,12 @@ public class UMLUnlimitedNaturalLabelProvider extends AbstractUMLNattableCellLab
 	 */

 	@Override

 	public boolean accept(Object element) {

-		if(element instanceof ILabelProviderCellContextElement) {

-			final ILayerCell cell = ((ILabelProviderCellContextElement)element).getCell();

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

+		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 = cell.getDataValue();

+			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

@@ -54,8 +52,8 @@ public class UMLUnlimitedNaturalLabelProvider extends AbstractUMLNattableCellLab
 			}

 

 			//now it is possible that we accepts the element

-			final Object rowObject = getRowObject(cell, registry);

-			final Object columnObject = getColumnObject(cell, registry);

+			final Object rowObject = getRowObject(cellWrapperContext, registry);

+			final Object columnObject = getColumnObject(cellWrapperContext, registry);

 

 			final List<Object> objects = getUMLObjects(rowObject, columnObject);

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