diff options
Diffstat (limited to 'plugins/uml/properties')
5 files changed, 30 insertions, 4 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF index 4538870c738..262016e8e51 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Require-Bundle: org.eclipse.papyrus.uml.properties;bundle-version="[2.0.0,3.0.0)", +Require-Bundle: org.eclipse.papyrus.uml.properties;bundle-version="[2.1.0,3.0.0)", org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF index db26f338ea6..68ef2d6e969 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF @@ -31,7 +31,7 @@ Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[2.0.0,3.0.0)";v org.eclipse.papyrus.uml.ui;bundle-version="[1.2.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.uml.properties.constraints" -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.1.0.qualifier Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-Activator: org.eclipse.papyrus.uml.properties.Activator diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml index 6be821c61e6..ce96e327cf8 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml @@ -7,6 +7,6 @@ <version>0.0.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.papyrus.uml.properties</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java index ea261e38433..1ea642efaa7 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java @@ -1072,7 +1072,7 @@ public class NattablePropertyEditor extends AbstractPropertyEditor { // Get the model element if (0 < contexts.size()) { final ModelElement modelElement = dataSource.getModelElement(propertyPath); - EObject sourceElement = EMFHelper.getEObject(contexts.get(0)); + EObject sourceElement = getEObjectAsTableContext(EMFHelper.getEObject(contexts.get(0))); EStructuralFeature feature = null; if (modelElement instanceof CompositeModelElement) { if (!((CompositeModelElement) modelElement).getSubElements().isEmpty()) { @@ -1097,6 +1097,22 @@ public class NattablePropertyEditor extends AbstractPropertyEditor { } /** + * This allows to get the table context as EObject (and avoid View). + * + * @param element + * The initial source element. + * @return The source element defining Table context. + * @since 2.1 + */ + protected EObject getEObjectAsTableContext(final EObject element) { + EObject result = element; + if (result instanceof View) { + result = ((View) result).getElement(); + } + return result; + } + + /** * * @param domain * the editing domain to use diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeDisplayNattablePropertyEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeDisplayNattablePropertyEditor.java index c0d51e833a8..40ef541ca15 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeDisplayNattablePropertyEditor.java +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeDisplayNattablePropertyEditor.java @@ -88,4 +88,14 @@ public class StereotypeDisplayNattablePropertyEditor extends TreeNattablePropert } return natTable; } + + /** + * {@inheritDoc} + * + * @see org.eclipse.papyrus.uml.properties.widgets.NattablePropertyEditor#getEObjectAsTableContext(org.eclipse.emf.ecore.EObject) + */ + @Override + protected EObject getEObjectAsTableContext(EObject element) { + return element; + } } |