From 779ea24f461f77d333981e529eb05dbf4291d2f2 Mon Sep 17 00:00:00 2001 From: Vincent Lorenzo Date: Fri, 10 May 2019 13:41:44 +0200 Subject: Bug 547160: [Table] Column referencing a single Reference feature are not editable Change-Id: I620e05cb5d36dda2524af433f88b999009357f40 Signed-off-by: Vincent Lorenzo --- .../nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF | 2 +- plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/pom.xml | 2 +- .../nattable/config/SingleUMLReferenceCellEditorConfiguration.java | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'plugins/uml') diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF index 896ecca5f47..7789e184ced 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)";vis org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy -Bundle-Version: 5.2.200.qualifier +Bundle-Version: 5.2.300.qualifier Bundle-Name: %Bundle-Name Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.uml.nattable.Activator diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/pom.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/pom.xml index 5f56d6e11cf..c6d2e7deef4 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/pom.xml +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/pom.xml @@ -9,6 +9,6 @@ 0.0.1-SNAPSHOT org.eclipse.papyrus.uml.nattable - 5.2.200-SNAPSHOT + 5.2.300-SNAPSHOT eclipse-plugin \ No newline at end of file diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLReferenceCellEditorConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLReferenceCellEditorConfiguration.java index 0b430520522..78b6ccba364 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLReferenceCellEditorConfiguration.java +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/SingleUMLReferenceCellEditorConfiguration.java @@ -11,7 +11,7 @@ * Contributors: * Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Initial API and implementation * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 517374 - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 545575 + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 545575, 547160 *****************************************************************************/ package org.eclipse.papyrus.uml.nattable.config; @@ -91,9 +91,10 @@ public class SingleUMLReferenceCellEditorConfiguration implements ICellAxisConfi @Override public void configureCellEditor(final IConfigRegistry configRegistry, final Object axis, final String configLabel) { CellEditorConfigurationUtils.configureCellPainter(configRegistry, axis, configLabel); + final Object axisElement = AxisUtils.getRepresentedElement(axis); final INattableModelManager modelManager = configRegistry.getConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID); - configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new SingleReferenceValueCellEditor(axis, modelManager.getTableAxisElementProvider()), DisplayMode.EDIT, configLabel); + configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new SingleReferenceValueCellEditor(axisElement, modelManager.getTableAxisElementProvider()), DisplayMode.EDIT, configLabel); configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new SingleUMLReferenceDisplayConverter(), DisplayMode.EDIT, configLabel); } -- cgit v1.2.3