Bug 466443, bug 466446: Corrected InternalElementReference::activeClass

to handle a classifier behavior subunit.

Change-Id: Ic22033efdd8d91e7e355d3cfb37d1385de1ea82f
Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/InternalElementReference.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/InternalElementReference.java
index 4895aadb8a5..b0eaa268a12 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/InternalElementReference.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/InternalElementReference.java
@@ -646,7 +646,7 @@ public interface InternalElementReference extends ElementReference {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @model annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n        if not self.isActivity() then null\n        else\n          let namespace = self.element.oclAsType(ActivityDefinition).namespaceReference() in\n            if namespace = null or \n              not self.equals(namespace.classifierBehavior()) then null\n            else namespace\n            endif\n        endif'"
+	 * @model annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot body='\n        if not self.isActivity() then null\n        else\n        \tlet stub = self.stub() in\n        \tlet this = if stub = null then self else stub endif in\n          let namespace = this.namespace() in\n            if namespace = null or \n              not this.equals(namespace.classifierBehavior()) then null\n            else namespace\n            endif\n        endif'"
 	 * @generated
 	 */
 	ElementReference activeClass();
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/alf.ecore b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/alf.ecore
index 8135a78546c..7ddba3a2ee4 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/alf.ecore
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/syntax-gen/org/eclipse/papyrus/uml/alf/impl/alf.ecore
@@ -826,7 +826,7 @@
     </eOperations>

     <eOperations name="activeClass" eType="#//ElementReference">

       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">

-        <details key="body" value="&#xA;        if not self.isActivity() then null&#xA;        else&#xA;          let namespace = self.element.oclAsType(ActivityDefinition).namespaceReference() in&#xA;            if namespace = null or &#xA;              not self.equals(namespace.classifierBehavior()) then null&#xA;            else namespace&#xA;            endif&#xA;        endif"/>

+        <details key="body" value="&#xA;        if not self.isActivity() then null&#xA;        else&#xA;        &#x9;let stub = self.stub() in&#xA;        &#x9;let this = if stub = null then self else stub endif in&#xA;          let namespace = this.namespace() in&#xA;            if namespace = null or &#xA;              not this.equals(namespace.classifierBehavior()) then null&#xA;            else namespace&#xA;            endif&#xA;        endif"/>

       </eAnnotations>

     </eOperations>

     <eOperations name="conformsTo" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">