Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoracuccuru2011-07-27 12:54:55 -0400
committeracuccuru2011-07-27 12:54:55 -0400
commit15f0de02a93b27de9d4fbf863af86fcc791274f8 (patch)
tree9053ddbd0fa32102e12d7420330e163ba2d32d1a /extraplugins/alf
parentc4ea9f576ac0ee83157a534a6cdd810192033ad8 (diff)
downloadorg.eclipse.papyrus-15f0de02a93b27de9d4fbf863af86fcc791274f8.tar.gz
org.eclipse.papyrus-15f0de02a93b27de9d4fbf863af86fcc791274f8.tar.xz
org.eclipse.papyrus-15f0de02a93b27de9d4fbf863af86fcc791274f8.zip
Bug correction
Diffstat (limited to 'extraplugins/alf')
-rw-r--r--extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationEditorScopingTool.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationEditorScopingTool.java b/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationEditorScopingTool.java
index fd2d14938f2..c1fbc5322bd 100644
--- a/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationEditorScopingTool.java
+++ b/extraplugins/alf/org.eclipse.papyrus.operation.editor.xtext/src/org/eclipse/papyrus/operation/editor/xtext/scoping/OperationEditorScopingTool.java
@@ -327,8 +327,12 @@ public class OperationEditorScopingTool extends AbstractScopingTool{
while (cddOperationDefinitionOrStub != null && !(cddOperationDefinitionOrStub instanceof OperationDefinitionOrStub)) {
cddOperationDefinitionOrStub = cddOperationDefinitionOrStub.eContainer() ;
}
- OperationDeclaration declaration = ((OperationDefinitionOrStub)cddOperationDefinitionOrStub).getDeclaration();
- nestedList.add(declaration) ;
+ if (cddOperationDefinitionOrStub != null) {
+ OperationDeclaration declaration = ((OperationDefinitionOrStub)cddOperationDefinitionOrStub).getDeclaration();
+ nestedList.add(declaration) ;
+ }
+ else
+ nestedList.add(contextOperation) ;
}
nestedScopes.add(nestedList) ;
// then builds other scoping levels based on context classifier inheritance hierarchy

Back to the top