Bug 488293: [Table] Width of slider composite is not persisted

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

Manage the persistence of the slider width.
+ Change the slider size in JUnit tests fails.

Change-Id: I28f40758c3bbb50b71b4332a77866b655aeb1bf8
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@all4tec.net>

25 files changed, 313 insertions, 146 deletions

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java
index 47e1e5ba1a7..7d964e31b2e 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/TreeNattableModelManager.java
@@ -24,6 +24,12 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.emf.transaction.ResourceSetListener;
 import org.eclipse.emf.transaction.RollbackException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.viewers.ISelectionProvider;
@@ -41,6 +47,7 @@ import org.eclipse.nebula.widgets.nattable.util.ClientAreaAdapter;
 import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
 import org.eclipse.nebula.widgets.nattable.viewport.SliderScroller;
 import org.eclipse.nebula.widgets.nattable.viewport.ViewportLayer;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.emf.gmf.util.GMFUnsafe;
 import org.eclipse.papyrus.infra.nattable.Activator;
 import org.eclipse.papyrus.infra.nattable.clientarea.ClientAreaResizeDragMode;
@@ -64,21 +71,31 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IAxis;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ITreeItemAxis;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AbstractHeaderAxisConfiguration;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.AxisManagerRepresentation;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.TreeFillingConfiguration;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisprovider.AbstractAxisProvider;
 import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.DisplayStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.IntValueStyle;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestyleFactory;
+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablestyle.NattablestylePackage;
 import org.eclipse.papyrus.infra.nattable.selection.ISelectionExtractor;
 import org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor;
 import org.eclipse.papyrus.infra.nattable.tree.CollapseAndExpandActionsEnum;
 import org.eclipse.papyrus.infra.nattable.tree.DatumExpansionModel;
 import org.eclipse.papyrus.infra.nattable.tree.DatumTreeFormat;
 import org.eclipse.papyrus.infra.nattable.utils.CollapseExpandActionHelper;
+import org.eclipse.papyrus.infra.nattable.utils.DefaultSizeUtils;
 import org.eclipse.papyrus.infra.nattable.utils.FillingConfigurationUtils;
+import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
+import org.eclipse.papyrus.infra.nattable.utils.NamedStyleConstants;
 import org.eclipse.papyrus.infra.nattable.utils.StyleUtils;
+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;
 import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
 import org.eclipse.papyrus.infra.ui.util.EclipseCommandUtils;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Point;
@@ -118,9 +135,9 @@ public class TreeNattableModelManager extends NattableModelManager implements IT
 
 	protected DatumExpansionModel expansionModel;
 
-  	/**
-        * the height of the scrollbar
-        */
+	/**
+	 * the height of the scrollbar
+	 */
 	private static final int scrollbarHeight = 17;
 
 
@@ -238,70 +255,69 @@ public class TreeNattableModelManager extends NattableModelManager implements IT
 	@Override
 	public NatTable createNattable(Composite parent, int style, IWorkbenchPartSite site) {
 		// Wrap NatTable in composite so we can slap on the external horizontal
-        // sliders
-        Composite composite = new Composite(parent, SWT.NONE);
-        GridLayout gridLayout = new GridLayout(1, false);
-        gridLayout.marginHeight = 0;
-        gridLayout.marginWidth = 0;
-        gridLayout.horizontalSpacing = 0;
-        gridLayout.verticalSpacing = 0;
-        composite.setLayout(gridLayout);
-
-        NatTable nattable = super.createNattable(composite, style, site);
-        GridData gridData = new GridData();
-        gridData.horizontalAlignment = GridData.FILL;
-        gridData.verticalAlignment = GridData.FILL;
-        gridData.grabExcessHorizontalSpace = true;
-        gridData.grabExcessVerticalSpace = true;
-        natTable.setLayoutData(gridData);
-
-        // MULTI-VIEWPORT-CONFIGURATION
-        createSplitSliders(composite, getRowHeaderLayerStack().getViewportLayer(), getBodyLayerStack().getViewportLayer());
-
-        // as the CompositeLayer is setting a IClientAreaProvider for the
-        // composition we need to set a special ClientAreaAdapter after the
-        // creation of the CompositeLayer to support split viewports
-        int leftWidth = RowHeaderLayerStack.DEFAULT_ROW_HEIGHT;
-        ClientAreaAdapter leftClientAreaAdapter =
-                new ClientAreaAdapter(getRowHeaderLayerStack().getViewportLayer().getClientAreaProvider());
-        leftClientAreaAdapter.setWidth(leftWidth);
-        getRowHeaderLayerStack().getViewportLayer().setClientAreaProvider(leftClientAreaAdapter);
-
-        getRowHeaderLayerStack().getViewportLayer().setVerticalScrollbarEnabled(false);
-
-        // use a cell layer painter that is configured for left clipping
-        // this ensures that the rendering works correctly for split
-        // viewports
-        getBodyLayerStack().getSelectionLayer().setLayerPainter(new SelectionLayerPainter(true, false));
-
-        filterColumnHeaderComposite.setLayerPainter(new CellLayerPainter(true, false));
-
-        // add an IOverlayPainter to render the split viewport border
-        natTable.addOverlayPainter(new IOverlayPainter() {
-
-            @Override
-            public void paintOverlay(GC gc, ILayer layer) {
-                Color beforeColor = gc.getForeground();
-                gc.setForeground(GUIHelper.COLOR_GRAY);
-                int viewportBorderX = getRowHeaderLayerStack().getWidth() - 1;
-                gc.drawLine(viewportBorderX, 0, viewportBorderX, layer.getHeight() - 1);
-                gc.setForeground(beforeColor);
-            }
-        });
-
-        // Mouse move - Show resize cursor
-        natTable.getUiBindingRegistry().registerFirstMouseMoveBinding(
-                new ClientAreaResizeMatcher(getRowHeaderLayerStack()),
-                new VerticalResizeCursorAction());
-
-        natTable.getUiBindingRegistry().registerFirstMouseDragMode(
-                new ClientAreaResizeMatcher(getRowHeaderLayerStack()),
-                new ClientAreaResizeDragMode(
-                		getRowHeaderLayerStack().getIndexRowHeaderLayer(),
-                		getRowHeaderLayerStack().getTreeLayer(),
-                		leftClientAreaAdapter,
-                		getRowHeaderLayerStack().getViewportLayer(),
-                		getBodyLayerStack().getViewportLayer()));
+		// sliders
+		Composite composite = new Composite(parent, SWT.NONE);
+		GridLayout gridLayout = new GridLayout(1, false);
+		gridLayout.marginHeight = 0;
+		gridLayout.marginWidth = 0;
+		gridLayout.horizontalSpacing = 0;
+		gridLayout.verticalSpacing = 0;
+		composite.setLayout(gridLayout);
+
+		NatTable nattable = super.createNattable(composite, style, site);
+		GridData gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.verticalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		gridData.grabExcessVerticalSpace = true;
+		natTable.setLayoutData(gridData);
+
+		// MULTI-VIEWPORT-CONFIGURATION
+		createSplitSliders(composite, getRowHeaderLayerStack().getViewportLayer(), getBodyLayerStack().getViewportLayer());
+
+		// as the CompositeLayer is setting a IClientAreaProvider for the
+		// composition we need to set a special ClientAreaAdapter after the
+		// creation of the CompositeLayer to support split viewports
+		int leftWidth = getWidthSliderComposite();
+		ClientAreaAdapter leftClientAreaAdapter = new ClientAreaAdapter(getRowHeaderLayerStack().getViewportLayer().getClientAreaProvider());
+		leftClientAreaAdapter.setWidth(leftWidth);
+		getRowHeaderLayerStack().getViewportLayer().setClientAreaProvider(leftClientAreaAdapter);
+
+		getRowHeaderLayerStack().getViewportLayer().setVerticalScrollbarEnabled(false);
+
+		// use a cell layer painter that is configured for left clipping
+		// this ensures that the rendering works correctly for split
+		// viewports
+		getBodyLayerStack().getSelectionLayer().setLayerPainter(new SelectionLayerPainter(true, false));
+
+		filterColumnHeaderComposite.setLayerPainter(new CellLayerPainter(true, false));
+
+		// add an IOverlayPainter to render the split viewport border
+		natTable.addOverlayPainter(new IOverlayPainter() {
+
+			@Override
+			public void paintOverlay(GC gc, ILayer layer) {
+				Color beforeColor = gc.getForeground();
+				gc.setForeground(GUIHelper.COLOR_GRAY);
+				int viewportBorderX = getRowHeaderLayerStack().getWidth() - 1;
+				gc.drawLine(viewportBorderX, 0, viewportBorderX, layer.getHeight() - 1);
+				gc.setForeground(beforeColor);
+			}
+		});
+
+		// Mouse move - Show resize cursor
+		natTable.getUiBindingRegistry().registerFirstMouseMoveBinding(
+				new ClientAreaResizeMatcher(getRowHeaderLayerStack()),
+				new VerticalResizeCursorAction());
+
+		natTable.getUiBindingRegistry().registerFirstMouseDragMode(
+				new ClientAreaResizeMatcher(getRowHeaderLayerStack()),
+				new ClientAreaResizeDragMode(
+						getRowHeaderLayerStack().getIndexRowHeaderLayer(),
+						getRowHeaderLayerStack().getTreeLayer(),
+						leftClientAreaAdapter,
+						getRowHeaderLayerStack().getViewportLayer(),
+						getBodyLayerStack().getViewportLayer()));
 
 		// update the hidden categories
 
@@ -322,59 +338,179 @@ public class TreeNattableModelManager extends NattableModelManager implements IT
 
 		return nattable;
 	}
+	
+	/**
+	 * Get the width of the slider composite.
+	 * 
+	 * @return The int value corresponding to the needed row header width.
+	 */
+	protected int getWidthSliderComposite(){
+		int result = 0;
+		
+		final IntValueStyle valueRowHeader = (IntValueStyle) getTable().getNamedStyle(NattablestylePackage.eINSTANCE.getIntValueStyle(), NamedStyleConstants.ROW_HEADER_WIDTH);
+		if (null != valueRowHeader) {
+			result = valueRowHeader.getIntValue();
+		} else {
+			result = calculateBestWidthSliderComposite();
+		}
+		
+		return result;
+	}
+
+	/**
+	 * This allows to calculate the initial width of the row header.
+	 * 
+	 * @return The int value corresponding to the needed row header width.
+	 */
+	protected int calculateBestWidthSliderComposite() {
+
+		// If non namedStyle exists for the slider composite, the initial width of the table must be an addition of:
+		// - The size of the two first columns
+		// - The alf size of the 3rd column
+
+		int result = 0;
+
+		final AbstractHeaderAxisConfiguration rowHeader = HeaderAxisConfigurationManagementUtils.getRowAbstractHeaderAxisConfigurationUsedInTable(getTable());
+
+		// Get the size of the two first columns
+		final IntValueStyle valueFirstRow = (IntValueStyle) rowHeader.getNamedStyle(NattablestylePackage.eINSTANCE.getIntValueStyle(), NamedStyleConstants.ROW_LABEL_WIDTH);
+		if (null != valueFirstRow) {
+			result += valueFirstRow.getIntValue();
+		} else {
+			result += DefaultSizeUtils.getDefaultRowHeaderWidth();
+		}
+		final IntValueStyle valueSecondRow = (IntValueStyle) rowHeader.getNamedStyle(NattablestylePackage.eINSTANCE.getIntValueStyle(), NamedStyleConstants.ROW_LABEL_POSITION_PREFIX_WIDTH + "2" + NamedStyleConstants.ROW_LABEL_POSITION_SUFFIX_WIDTH); //$NON-NLS-1$
+		if (null != valueSecondRow) {
+			result += valueSecondRow.getIntValue();
+		} else {
+			result += DefaultSizeUtils.getDefaultRowHeaderWidth();
+		}
+
+		// Get the alf size of the 3rd column
+		final IntValueStyle valueThirdRow = (IntValueStyle) rowHeader.getNamedStyle(NattablestylePackage.eINSTANCE.getIntValueStyle(), NamedStyleConstants.ROW_LABEL_POSITION_PREFIX_WIDTH + "3" + NamedStyleConstants.ROW_LABEL_POSITION_SUFFIX_WIDTH); //$NON-NLS-1$
+		if (null != valueThirdRow) {
+			if (1 == valueThirdRow.getIntValue() % 2) {
+				result += (valueThirdRow.getIntValue() / 2) + 1;
+			} else {
+				result += valueThirdRow.getIntValue() / 2;
+			}
+		} else {
+			if (1 == DefaultSizeUtils.getDefaultRowHeaderWidth() % 2) {
+				result += (DefaultSizeUtils.getDefaultRowHeaderWidth() / 2) + 1;
+			} else {
+				result += DefaultSizeUtils.getDefaultRowHeaderWidth() / 2;
+			}
+		}
+
+		return result;
+	}
 
 	private void createSplitSliders(Composite natTableParent, final ViewportLayer left, final ViewportLayer right) {
-        Composite sliderComposite = new Composite(natTableParent, SWT.NONE);
-        GridData gridData = new GridData();
-        gridData.horizontalAlignment = GridData.FILL;
-        gridData.grabExcessHorizontalSpace = true;
-        gridData.grabExcessVerticalSpace = false;
-        gridData.heightHint = scrollbarHeight;
-        sliderComposite.setLayoutData(gridData);
-
-        GridLayout gridLayout = new GridLayout(2, false);
-        gridLayout.marginHeight = 0;
-        gridLayout.marginWidth = 0;
-        gridLayout.horizontalSpacing = 0;
-        gridLayout.verticalSpacing = 0;
-        sliderComposite.setLayout(gridLayout);
-
-        // Slider Left
-        // Need a composite here to set preferred size because Slider can't be
-        // subclassed.
-        Composite sliderLeftComposite = new Composite(sliderComposite, SWT.NONE) {
-            @Override
-            public Point computeSize(int wHint, int hHint, boolean changed) {
-                int width = ((ClientAreaAdapter) left.getClientAreaProvider()).getWidth()
-                		+ getRowHeaderLayerStack().getIndexRowHeaderLayer().getWidth();
-                return new Point(width, scrollbarHeight);
-            }
-        };
-        sliderLeftComposite.setLayout(new FillLayout());
-        gridData = new GridData();
-        gridData.horizontalAlignment = GridData.BEGINNING;
-        gridData.verticalAlignment = GridData.BEGINNING;
-        sliderLeftComposite.setLayoutData(gridData);
-
-        Slider sliderLeft = new Slider(sliderLeftComposite, SWT.HORIZONTAL);
-        gridData = new GridData();
-        gridData.horizontalAlignment = GridData.FILL;
-        gridData.verticalAlignment = GridData.FILL;
-        sliderLeft.setLayoutData(gridData);
-
-        left.setHorizontalScroller(new SliderScroller(sliderLeft));
-
-        // Slider Right
-        Slider sliderRight = new Slider(sliderComposite, SWT.HORIZONTAL);
-        gridData = new GridData();
-        gridData.horizontalAlignment = GridData.FILL;
-        gridData.verticalAlignment = GridData.BEGINNING;
-        gridData.grabExcessHorizontalSpace = true;
-        gridData.grabExcessVerticalSpace = false;
-        sliderRight.setLayoutData(gridData);
-
-        right.setHorizontalScroller(new SliderScroller(sliderRight));
-    }
+		Composite sliderComposite = new Composite(natTableParent, SWT.NONE);
+		GridData gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.grabExcessHorizontalSpace = true;
+		gridData.grabExcessVerticalSpace = false;
+		gridData.heightHint = scrollbarHeight;
+		sliderComposite.setLayoutData(gridData);
+
+		GridLayout gridLayout = new GridLayout(2, false);
+		gridLayout.marginHeight = 0;
+		gridLayout.marginWidth = 0;
+		gridLayout.horizontalSpacing = 0;
+		gridLayout.verticalSpacing = 0;
+		sliderComposite.setLayout(gridLayout);
+
+		// Slider Left
+		// Need a composite here to set preferred size because Slider can't be
+		// subclassed.
+		Composite sliderLeftComposite = new Composite(sliderComposite, SWT.NONE) {
+			@Override
+			public Point computeSize(int wHint, int hHint, boolean changed) {
+				int width = ((ClientAreaAdapter) left.getClientAreaProvider()).getWidth()
+						+ getRowHeaderLayerStack().getIndexRowHeaderLayer().getWidth();
+				return new Point(width, scrollbarHeight);
+			}
+		};
+		sliderLeftComposite.setLayout(new FillLayout());
+		gridData = new GridData();
+		gridData.horizontalAlignment = GridData.BEGINNING;
+		gridData.verticalAlignment = GridData.BEGINNING;
+		sliderLeftComposite.setLayoutData(gridData);
+
+		addControlListener(sliderLeftComposite);
+
+		Slider sliderLeft = new Slider(sliderLeftComposite, SWT.HORIZONTAL);
+		gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.verticalAlignment = GridData.FILL;
+		sliderLeft.setLayoutData(gridData);
+
+		left.setHorizontalScroller(new SliderScroller(sliderLeft));
+
+		// Slider Right
+		Slider sliderRight = new Slider(sliderComposite, SWT.HORIZONTAL);
+		gridData = new GridData();
+		gridData.horizontalAlignment = GridData.FILL;
+		gridData.verticalAlignment = GridData.BEGINNING;
+		gridData.grabExcessHorizontalSpace = true;
+		gridData.grabExcessVerticalSpace = false;
+		sliderRight.setLayoutData(gridData);
+
+		right.setHorizontalScroller(new SliderScroller(sliderRight));
+	}
+
+	/**
+	 * This allows to create the control listener when the slider composite is resized.
+	 * 
+	 * @param leftSliderComposite
+	 *            the slider composite.
+	 */
+	protected void addControlListener(final Composite leftSliderComposite) {
+		leftSliderComposite.addControlListener(new ControlAdapter() {
+
+			@Override
+			public void controlResized(final ControlEvent e) {
+				super.controlResized(e);
+
+				final CompositeCommand resizeRowHeaderCommand = new CompositeCommand("Resize Slider composite"); //$NON-NLS-1$
+				TransactionalEditingDomain tableDomain = TableEditingDomainUtils.getTableEditingDomain(getTable());
+				if (null == tableDomain) {
+					return;
+				}
+
+				final int newHeaderWidth = getRowHeaderLayerStack().getViewportLayer().getClientAreaWidth();
+				final int initialSize = calculateBestWidthSliderComposite();
+
+				// check that the modified value is not the initial one
+				if (newHeaderWidth != initialSize) {
+					IntValueStyle valueIndex = (IntValueStyle) getTable().getNamedStyle(NattablestylePackage.eINSTANCE.getIntValueStyle(), NamedStyleConstants.ROW_HEADER_WIDTH);
+					if (null != valueIndex && valueIndex.getIntValue() != newHeaderWidth) {
+						SetRequest resizeRowHeader = new SetRequest(tableDomain, valueIndex, NattablestylePackage.eINSTANCE.getIntValueStyle_IntValue(), newHeaderWidth);
+						resizeRowHeaderCommand.add(new SetValueCommand(resizeRowHeader));
+					} else if (null == valueIndex && newHeaderWidth != DefaultSizeUtils.getDefaultRowHeaderWidth()) {
+						valueIndex = NattablestyleFactory.eINSTANCE.createIntValueStyle();
+						valueIndex.setIntValue(newHeaderWidth);
+						valueIndex.setName(NamedStyleConstants.ROW_HEADER_WIDTH);
+
+						SetRequest initRowHeaderSizeRequest = new SetRequest(tableDomain, getTable(), NattablestylePackage.eINSTANCE.getStyledElement_Styles(), valueIndex);
+						resizeRowHeaderCommand.add(new SetValueCommand(initRowHeaderSizeRequest));
+					}
+
+					if (resizeRowHeaderCommand.canExecute() && !resizeRowHeaderCommand.isEmpty()) {
+						tableDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(resizeRowHeaderCommand));
+					}
+				} else {
+					// Remove the named style if existing and with the initial width
+					final IntValueStyle valueIndex = (IntValueStyle) getTable().getNamedStyle(NattablestylePackage.eINSTANCE.getIntValueStyle(), NamedStyleConstants.ROW_HEADER_WIDTH);
+					if (null != valueIndex) {
+						DestroyElementRequest destroyRowHeaderWidthRequest = new DestroyElementRequest(tableDomain, valueIndex, false);
+						new GMFtoEMFCommandWrapper(new DestroyElementCommand(destroyRowHeaderWidthRequest)).execute();
+					}
+				}
+			}
+		});
+	}
 
 	/**
 	 * @see org.eclipse.papyrus.infra.nattable.manager.table.AbstractNattableWidgetManager#addClickSortConfiguration(org.eclipse.nebula.widgets.nattable.NatTable)
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NamedStyleConstants.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NamedStyleConstants.java
index bb241b7c91f..46786a3338d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NamedStyleConstants.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/NamedStyleConstants.java
@@ -43,6 +43,11 @@ public class NamedStyleConstants {
 	 */
 	public static final String ROW_LABEL_POSITION_SUFFIX_WIDTH = "LabelWidth"; //$NON-NLS-1$
 	
+	/**
+	 * The named style id for the slider composite width.
+	 */
+	public static final String ROW_HEADER_WIDTH = "rowHeaderWidth"; //$NON-NLS-1$
+	
 
 	public static final String COLUMN_INDEX_HEIGHT = "columnIndexHeight"; //$NON-NLS-1$
 
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/import/ImportCellsAll_V1_V3_V1_MultiColumns_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/import/ImportCellsAll_V1_V3_V1_MultiColumns_Test.notation
index c625c26b562..ba142763468 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/import/ImportCellsAll_V1_V3_V1_MultiColumns_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/import/ImportCellsAll_V1_V3_V1_MultiColumns_Test.notation
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable0" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable0" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_48tqsNr1EeWnMJzg3kyZng" name="rowHeaderWidth" intValue="882"/>
   <context xmi:type="uml:Model" href="ImportCellsAll_V1_V3_V1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
   <owner xmi:type="uml:Model" href="ImportCellsAll_V1_V3_V1_MultiColumns_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_AttachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_AttachedMode_Test.notation
index bd4e5f86e5b..8fdedaa62d1 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_AttachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_AttachedMode_Test.notation
@@ -3,6 +3,7 @@
   <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
     <intListValue>1</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_CV658NrvEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="533"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_Empty_H1_V1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_Empty_H1_V1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
@@ -39,10 +40,10 @@
       </axisUsedAsAxisProvider>
       <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="__7v3wHvFEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Operation">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="__7v3wHvFEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Operation">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="__7we0HvFEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="__7we0HvFEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Parameter">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
     </ownedAxisConfigurations>
     <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_AttachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_AttachedMode_Test.notation
index 54aa970c2f4..29f33d49ed5 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_AttachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_AttachedMode_Test.notation
@@ -3,6 +3,7 @@
   <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_KJpacHxbEeSxVJAGQ_SozA" name="hiddenCategoriesByDepth">
     <intListValue>1</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_QCpIoNrvEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="582"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_Empty_H3_V1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_Empty_H3_V1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
@@ -51,16 +52,16 @@
       </axisUsedAsAxisProvider>
       <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_3W0-cHvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Property">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_3W0-cHvHEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Property">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_3W0-cXvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Operation">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_3W0-cXvHEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Operation">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_3W0-cnvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Class">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_3W0-cnvHEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Class">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_3W0-c3vHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_3W0-c3vHEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Parameter">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
     </ownedAxisConfigurations>
     <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_Uchc4Hu1EeSOIP1uah0_EA _0T6Ok3ucEeSTu_GUJ96b9g _Uchc4nu1EeSOIP1uah0_EA _0T6OlXucEeSTu_GUJ96b9g">
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_AttachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_AttachedMode_Test.notation
index 49879c980bc..29025327a3e 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_AttachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_AttachedMode_Test.notation
@@ -3,6 +3,7 @@
   <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
     <intListValue>2</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_VfX3ENrvEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="582"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_Empty_V3_H1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_Empty_V3_H1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
@@ -51,16 +52,16 @@
       </axisUsedAsAxisProvider>
       <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_zqX60HvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Property">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_zqX60HvHEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Property">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_zqX60XvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Operation">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_zqX60XvHEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Operation">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_zqX60nvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Class">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_zqX60nvHEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Class">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_zqX603vHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_zqX603vHEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Parameter">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
     </ownedAxisConfigurations>
     <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_GOQnYHu1EeSOIP1uah0_EA _0T6Ok3ucEeSTu_GUJ96b9g _GOQnYnu1EeSOIP1uah0_EA _0T6OlXucEeSTu_GUJ96b9g">
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_AttachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_AttachedMode_Test.notation
index 9c4a1c50e61..6d8d1b3a718 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_AttachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_AttachedMode_Test.notation
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_ZkhukNrvEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="732"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_Empty_V3_V1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_Empty_V3_V1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
@@ -48,16 +49,16 @@
       </axisUsedAsAxisProvider>
       <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_ujT6YHvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Property">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_ujT6YHvHEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Property">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_ujT6YXvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Operation">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_ujT6YXvHEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Operation">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_ujT6YnvHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Class">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_ujT6YnvHEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Class">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_ujT6Y3vHEeSOIP1uah0_EA" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_ujT6Y3vHEeSOIP1uah0_EA" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Parameter">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
     </ownedAxisConfigurations>
     <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_Uchc4Hu1EeSOIP1uah0_EA _0T6Ok3ucEeSTu_GUJ96b9g _Uchc4nu1EeSOIP1uah0_EA _0T6OlXucEeSTu_GUJ96b9g">
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_AttachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_AttachedMode_Test.notation
index f0bceafeb98..9d237ebb636 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_AttachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_AttachedMode_Test.notation
@@ -4,6 +4,7 @@
     <intListValue>0</intListValue>
     <intListValue>1</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_e-mxoNrvEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="600"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_H1_H1_V1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_H1_H1_V1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
@@ -46,13 +47,13 @@
       </axisUsedAsAxisProvider>
       <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Class">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Operation">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Parameter">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
     </ownedAxisConfigurations>
     <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_AttachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_AttachedMode_Test.notation
index ec8feb48f80..3f443859e9d 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_AttachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_AttachedMode_Test.notation
@@ -4,6 +4,7 @@
     <intListValue>0</intListValue>
     <intListValue>2</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_kSBzENrvEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="600"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_H1_V3_H1_MultiColumns_AttachedMode_Test.uml#_3fyn4HrwEeSFP8xW-pegcg"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_H1_V3_H1_MultiColumns_AttachedMode_Test.uml#_3fyn4HrwEeSFP8xW-pegcg"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_AttachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_AttachedMode_Test.notation
index a191dc62b79..f1b40c4362d 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_AttachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_AttachedMode_Test.notation
@@ -3,6 +3,7 @@
   <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_M2GlgHruEeSFP8xW-pegcg" name="hiddenCategoriesByDepth">
     <intListValue>0</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_o640kNrvEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="750"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_H1_V3_V1_MultiColumns_AttachedMode_Test.uml#_GFLrUHruEeSFP8xW-pegcg"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_H1_V3_V1_MultiColumns_AttachedMode_Test.uml#_GFLrUHruEeSFP8xW-pegcg"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_AttachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_AttachedMode_Test.notation
index fdb8b12b29e..572cd2adb25 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_AttachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_AttachedMode_Test.notation
@@ -4,6 +4,7 @@
     <intListValue>1</intListValue>
     <intListValue>2</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_srpwcNrvEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="582"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_V1_H1_H1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_V1_H1_H1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
@@ -46,17 +47,20 @@
       </axisUsedAsAxisProvider>
       <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Class">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Operation">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Parameter">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
     </ownedAxisConfigurations>
     <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
       <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
     </axisManagerConfigurations>
   </localRowHeaderAxisConfiguration>
+  <localColumnHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_sxc2cNrvEeWQ0ugY78OgLw">
+    <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_sxddgNrvEeWQ0ugY78OgLw" name="columnLabelHeight" intValue="21"/>
+  </localColumnHeaderAxisConfiguration>
 </nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_AttachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_AttachedMode_Test.notation
index 31e8cd842ad..4ad3b7ff5b5 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_AttachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_AttachedMode_Test.notation
@@ -3,6 +3,7 @@
   <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
     <intListValue>1</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_wXVYANrvEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="732"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_V1_H1_V1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_V1_H1_V1_MultiColumns_AttachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
@@ -45,13 +46,13 @@
       </axisUsedAsAxisProvider>
       <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Class">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMHufEeSTu_GUJ96b9g" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Class">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Operation">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaEMnufEeSTu_GUJ96b9g" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Operation">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
     </ownedAxisConfigurations>
-    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" xmi:id="_BOaENHufEeSTu_GUJ96b9g" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+    <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_BOaENHufEeSTu_GUJ96b9g" detachedMode="false" pastedElementId="org.eclipse.papyrus.uml.Parameter">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
     </ownedAxisConfigurations>
     <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_0T6OkHucEeSTu_GUJ96b9g" localSpecificConfigurations="_0T6OkXucEeSTu_GUJ96b9g _0T6Ok3ucEeSTu_GUJ96b9g _0T6OlXucEeSTu_GUJ96b9g">
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_AttachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_AttachedMode_Test.notation
index 5108ba4fa67..e6f06f411f2 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_AttachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_AttachedMode_Test.notation
@@ -3,6 +3,7 @@
   <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_lPbmEHyJEeSxVJAGQ_SozA" name="hiddenCategoriesByDepth">
     <intListValue>2</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_0ViS8NrvEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="732"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_V1_V3_H1_MultiColumns_AttachedMode_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_V1_V3_H1_MultiColumns_AttachedMode_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_AttachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_AttachedMode_Test.notation
index c9dcfe89b64..122260edbc4 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_AttachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/attachedMode/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_AttachedMode_Test.notation
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable0" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable0" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_3i7cANrvEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="882"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_V1_V3_V1_MultiColumns_AttachedMode_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_V1_V3_V1_MultiColumns_AttachedMode_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_DetachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_DetachedMode_Test.notation
index 56e603b17e1..56c9cfc157c 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_DetachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_H1_V1_MultiColumns_DetachedMode_Test.notation
@@ -3,6 +3,7 @@
   <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
     <intListValue>1</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_aowWQNrwEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="582"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_Empty_H1_V1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_Empty_H1_V1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_DetachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_DetachedMode_Test.notation
index e6b128adbf4..e746998c6ef 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_DetachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_H3_V1_MultiColumns_DetachedMode_Test.notation
@@ -3,6 +3,7 @@
   <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_KJpacHxbEeSxVJAGQ_SozA" name="hiddenCategoriesByDepth">
     <intListValue>1</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_dawj0NrwEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="582"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_Empty_H3_V1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_Empty_H3_V1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_DetachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_DetachedMode_Test.notation
index 90d0943dc0b..1738b4176da 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_DetachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_V3_H1_MultiColumns_DetachedMode_Test.notation
@@ -3,6 +3,7 @@
   <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
     <intListValue>2</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_gRUhQNrwEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="582"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_Empty_V3_H1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_Empty_V3_H1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_DetachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_DetachedMode_Test.notation
index b9515f2bbab..cdd8c62c68e 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_DetachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_Empty_V3_V1_MultiColumns_DetachedMode_Test.notation
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_zDRtIHucEeSTu_GUJ96b9g" name="ClassTreeTable0" currentRowAxisProvider="_zDRtI3ucEeSTu_GUJ96b9g" currentColumnAxisProvider="_zDRtIXucEeSTu_GUJ96b9g">
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_ig_d0NrwEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="732"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_Empty_V3_V1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_Empty_V3_V1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_DetachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_DetachedMode_Test.notation
index cb38fb1e805..4c099570e8f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_DetachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_H1_H1_V1_MultiColumns_DetachedMode_Test.notation
@@ -4,6 +4,7 @@
     <intListValue>0</intListValue>
     <intListValue>1</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_lcXCwNrwEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="600"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_H1_H1_V1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_H1_H1_V1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_DetachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_DetachedMode_Test.notation
index 54a5a199c15..45953b03571 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_DetachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_H1_V3_H1_MultiColumns_DetachedMode_Test.notation
@@ -4,6 +4,7 @@
     <intListValue>0</intListValue>
     <intListValue>2</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_nMXn0NrwEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="600"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_H1_V3_H1_MultiColumns_DetachedMode_Test.uml#_3fyn4HrwEeSFP8xW-pegcg"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_H1_V3_H1_MultiColumns_DetachedMode_Test.uml#_3fyn4HrwEeSFP8xW-pegcg"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_DetachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_DetachedMode_Test.notation
index 14cd49475ac..37b1330c1ef 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_DetachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_H1_V3_V1_MultiColumns_DetachedMode_Test.notation
@@ -3,6 +3,7 @@
   <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_M2GlgHruEeSFP8xW-pegcg" name="hiddenCategoriesByDepth">
     <intListValue>0</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_pYEDUNrwEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="750"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_H1_V3_V1_MultiColumns_DetachedMode_Test.uml#_GFLrUHruEeSFP8xW-pegcg"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_H1_V3_V1_MultiColumns_DetachedMode_Test.uml#_GFLrUHruEeSFP8xW-pegcg"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_DetachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_DetachedMode_Test.notation
index d07f4eb8238..d404f3b29b8 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_DetachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_H1_H1_MultiColumns_DetachedMode_Test.notation
@@ -4,6 +4,7 @@
     <intListValue>1</intListValue>
     <intListValue>2</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_rICzMNrwEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="582"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_V1_H1_H1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_V1_H1_H1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_DetachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_DetachedMode_Test.notation
index 40456c34e8e..def15ad247c 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_DetachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_H1_V1_MultiColumns_DetachedMode_Test.notation
@@ -3,6 +3,7 @@
   <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_6gzOoHucEeSTu_GUJ96b9g" name="hiddenCategoriesByDepth">
     <intListValue>1</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_skm30NrwEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="732"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_V1_H1_V1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_V1_H1_V1_MultiColumns_DetachedMode_Test.uml#_yDlxwHucEeSTu_GUJ96b9g"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_DetachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_DetachedMode_Test.notation
index f6b402c5832..363d586e1c5 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_DetachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_V3_H1_MultiColumns_DetachedMode_Test.notation
@@ -3,6 +3,7 @@
   <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_lPbmEHyJEeSxVJAGQ_SozA" name="hiddenCategoriesByDepth">
     <intListValue>2</intListValue>
   </styles>
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_uF4dUNrwEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="732"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_V1_V3_H1_MultiColumns_DetachedMode_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_V1_V3_H1_MultiColumns_DetachedMode_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_DetachedMode_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_DetachedMode_Test.notation
index 94e98884403..1ae0e8280a9 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_DetachedMode_Test.notation
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_tests/detachedMode/multi_columns/PasteWithCategories_V1_V3_V1_MultiColumns_DetachedMode_Test.notation
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable0" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle http://www.eclipse.org/papyrus/nattable/model#//nattablestyle" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable0" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+  <styles xmi:type="nattablestyle:IntValueStyle" xmi:id="_vGlsYNrwEeWQ0ugY78OgLw" name="rowHeaderWidth" intValue="882"/>
   <context xmi:type="uml:Model" href="PasteWithCategories_V1_V3_V1_MultiColumns_DetachedMode_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
   <owner xmi:type="uml:Model" href="PasteWithCategories_V1_V3_V1_MultiColumns_DetachedMode_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
   <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>