diff options
| author | cbrun | 2017-05-16 15:15:31 +0000 |
|---|---|---|
| committer | Stéphane Bégaudeau | 2017-05-17 08:27:09 +0000 |
| commit | 71f262f006238eb133e11e56590142d299e2f24d (patch) | |
| tree | 98afcfabed5f014e4d7a83ffa0c455daba6c3666 | |
| parent | 9f8a1d68f6a0b0719ca1713c687e25e0f5eeac36 (diff) | |
| download | org.eclipse.sirius-71f262f006238eb133e11e56590142d299e2f24d.tar.gz org.eclipse.sirius-71f262f006238eb133e11e56590142d299e2f24d.tar.xz org.eclipse.sirius-71f262f006238eb133e11e56590142d299e2f24d.zip | |
[510126] Use PropertiesExpressionQueryProvider for Dialogs & Wizards
The previous enablement condition was only looking at the ancestors
hierarchy but now it is possible to have Dialog or Wizard descriptions
directly as part of a Diagram tool for instance.
This commit check the originating EPackage to cover those cases.
Bug: 510126
Change-Id: I0df567f27b228bff71aff87ea4bd10931863bd2c
Signed-off-by: Cedric Brun <cedric.brun@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesExpressionQueryProvider.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesExpressionQueryProvider.java b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesExpressionQueryProvider.java index 0216016943..c0c7f39613 100644 --- a/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesExpressionQueryProvider.java +++ b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/expressions/PropertiesExpressionQueryProvider.java @@ -16,6 +16,7 @@ import org.eclipse.sirius.business.api.dialect.description.IInterpretedExpressio import org.eclipse.sirius.business.api.dialect.description.IInterpretedExpressionQueryProvider; import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.ext.base.Options; +import org.eclipse.sirius.properties.PropertiesPackage; /** * An {@link IInterpretedExpressionQueryProvider} for properties view @@ -26,7 +27,7 @@ import org.eclipse.sirius.ext.base.Options; public class PropertiesExpressionQueryProvider implements IInterpretedExpressionQueryProvider { @Override public Option<IInterpretedExpressionQuery> getExpressionQueryFor(EObject context, EStructuralFeature expressionAttribute) { - if (VSMNavigation.isInsideViewExtensionDescription(context)) { + if (VSMNavigation.isInsideViewExtensionDescription(context) || context.eClass().getEPackage() == PropertiesPackage.eINSTANCE) { IInterpretedExpressionQuery value = new PropertiesInterpretedExpressionQuery(context, expressionAttribute); return Options.newSome(value); } else { |