diff options
| author | Pierre-Charles David | 2016-04-29 13:43:29 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2016-05-03 12:38:13 +0000 |
| commit | 843ed9a65ea8fee31b4b22baf1587379bb576033 (patch) | |
| tree | c8ba5b8b4f995e777f66cb6ecf17f0c8df74a1b8 | |
| parent | ceb5c8d985303fea6a7631a61130355554812c9b (diff) | |
| download | org.eclipse.sirius-843ed9a65ea8fee31b4b22baf1587379bb576033.tar.gz org.eclipse.sirius-843ed9a65ea8fee31b4b22baf1587379bb576033.tar.xz org.eclipse.sirius-843ed9a65ea8fee31b4b22baf1587379bb576033.zip | |
[482528] Fix NPE when using completion inside properties view descrition
The NPE could be triggered by invoking completion in an interpreted
expression of a model operation inside the context of a "View Extension
Description", as the existing code was not aware that it is a possible
root element inside a VSM's Group.
Bug: 482528
Change-Id: I0bb755fc3b8d7214f8a4fe59d0728e7afdc285a9
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ToolInterpretedExpressionTargetSwitch.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ToolInterpretedExpressionTargetSwitch.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ToolInterpretedExpressionTargetSwitch.java index 1bc7c77a6c..f28b5e998d 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ToolInterpretedExpressionTargetSwitch.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ToolInterpretedExpressionTargetSwitch.java @@ -22,6 +22,7 @@ import org.eclipse.sirius.business.api.dialect.description.IInterpretedExpressio import org.eclipse.sirius.business.api.dialect.description.IInterpretedExpressionTargetSwitch; import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.ext.base.Options; +import org.eclipse.sirius.viewpoint.description.Extension; import org.eclipse.sirius.viewpoint.description.PasteTargetDescription; import org.eclipse.sirius.viewpoint.description.RepresentationDescription; import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping; @@ -179,7 +180,7 @@ public class ToolInterpretedExpressionTargetSwitch extends ToolSwitch<Option<Col } private boolean isChangingContextElement(EObject element) { - boolean descCanChange = element instanceof RepresentationDescription || element instanceof RepresentationElementMapping; + boolean descCanChange = element instanceof RepresentationDescription || element instanceof RepresentationElementMapping || element instanceof Extension; boolean operationCanChange = element instanceof CreateInstance || element instanceof ChangeContext || element instanceof For; boolean toolCanChange = element instanceof AbstractToolDescription; boolean validationRulecanChange = element instanceof ValidationRule; |