[580356] Add Rule.ownedContext

13 files changed, 165 insertions, 2 deletions

diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbasePackage.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbasePackage.java
index a6a3c565c..08e6b454b 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbasePackage.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbasePackage.java
@@ -369,6 +369,17 @@ public interface QVTbasePackage extends EPackage {
 	EReference getRule_Transformation();
 
 	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOwnedContext <em>Owned Context</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Owned Context</em>'.
+	 * @see org.eclipse.qvtd.pivot.qvtbase.Rule#getOwnedContext()
+	 * @see #getRule()
+	 * @generated
+	 */
+	EReference getRule_OwnedContext();
+
+	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverridden <em>Overridden</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1033,6 +1044,14 @@ public interface QVTbasePackage extends EPackage {
 		EReference RULE__TRANSFORMATION = eINSTANCE.getRule_Transformation();
 
 		/**
+		 * The meta object literal for the '<em><b>Owned Context</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference RULE__OWNED_CONTEXT = eINSTANCE.getRule_OwnedContext();
+
+		/**
 		 * The meta object literal for the '<em><b>Overridden</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbaseTables.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbaseTables.java
index afd4ab169..caca2529f 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbaseTables.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbaseTables.java
@@ -92,6 +92,7 @@ public class QVTbaseTables extends AbstractTables
 	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_OclElement = QVTbaseTables.PACKid_$metamodel$.getClassId("OclElement", 0);
 	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_Package = QVTbaseTables.PACKid_$metamodel$.getClassId("Package", 0);
 	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_Parameter = QVTbaseTables.PACKid_$metamodel$.getClassId("Parameter", 0);
+	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_ParameterVariable = QVTbaseTables.PACKid_$metamodel$.getClassId("ParameterVariable", 0);
 	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_Pattern = QVTbaseTables.PACKid_http_c_s_s_www_eclipse_org_s_qvt_s_2015_s_QVTbase.getClassId("Pattern", 0);
 	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_Predicate = QVTbaseTables.PACKid_http_c_s_s_www_eclipse_org_s_qvt_s_2015_s_QVTbase.getClassId("Predicate", 0);
 	public static final /*@NonInvalid*/ @NonNull ClassId CLSSid_Rule = QVTbaseTables.PACKid_http_c_s_s_www_eclipse_org_s_qvt_s_2015_s_QVTbase.getClassId("Rule", 0);
@@ -413,7 +414,8 @@ public class QVTbaseTables extends AbstractTables
 		public static final @NonNull ExecutorProperty _Rule__isAbstract = new EcoreExecutorProperty(QVTbasePackage.Literals.RULE__IS_ABSTRACT, Types._Rule, 1);
 		public static final @NonNull ExecutorProperty _Rule__overridden = new EcoreExecutorProperty(QVTbasePackage.Literals.RULE__OVERRIDDEN, Types._Rule, 2);
 		public static final @NonNull ExecutorProperty _Rule__overrides = new EcoreExecutorProperty(QVTbasePackage.Literals.RULE__OVERRIDES, Types._Rule, 3);
-		public static final @NonNull ExecutorProperty _Rule__transformation = new EcoreExecutorProperty(QVTbasePackage.Literals.RULE__TRANSFORMATION, Types._Rule, 4);
+		public static final @NonNull ExecutorProperty _Rule__ownedContext = new EcoreExecutorProperty(QVTbasePackage.Literals.RULE__OWNED_CONTEXT, Types._Rule, 4);
+		public static final @NonNull ExecutorProperty _Rule__transformation = new EcoreExecutorProperty(QVTbasePackage.Literals.RULE__TRANSFORMATION, Types._Rule, 5);
 
 		public static final @NonNull ExecutorProperty _SimpleTargetElement__iterates = new EcoreExecutorProperty(QVTbasePackage.Literals.SIMPLE_TARGET_ELEMENT__ITERATES, Types._SimpleTargetElement, 0);
 		public static final @NonNull ExecutorProperty _SimpleTargetElement__kind = new EcoreExecutorProperty(QVTbasePackage.Literals.SIMPLE_TARGET_ELEMENT__KIND, Types._SimpleTargetElement, 1);
@@ -1556,6 +1558,7 @@ public class QVTbaseTables extends AbstractTables
 			QVTbaseTables.Properties._Rule__overrides,
 			PivotTables.Properties._Element__ownedAnnotations,
 			PivotTables.Properties._Element__ownedComments,
+			QVTbaseTables.Properties._Rule__ownedContext,
 			PivotTables.Properties._Element__ownedExtensions,
 			QVTbaseTables.Properties._Rule__transformation
 		};
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/Rule.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/Rule.java
index 9daec914d..12b1373d4 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/Rule.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/Rule.java
@@ -14,6 +14,7 @@ import java.util.Map;
 import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.ocl.pivot.NamedElement;
+import org.eclipse.ocl.pivot.ParameterVariable;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,6 +30,7 @@ import org.eclipse.ocl.pivot.NamedElement;
  *   <li>{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverridden <em>Overridden</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverrides <em>Overrides</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getTransformation <em>Transformation</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOwnedContext <em>Owned Context</em>}</li>
  * </ul>
  *
  * @see org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage#getRule()
@@ -128,6 +130,32 @@ public interface Rule extends NamedElement {
 	void setTransformation(Transformation value);
 
 	/**
+	 * Returns the value of the '<em><b>Owned Context</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Owned Context</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Owned Context</em>' containment reference.
+	 * @see #setOwnedContext(ParameterVariable)
+	 * @see org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage#getRule_OwnedContext()
+	 * @model containment="true"
+	 * @generated
+	 */
+	ParameterVariable getOwnedContext();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOwnedContext <em>Owned Context</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owned Context</em>' containment reference.
+	 * @see #getOwnedContext()
+	 * @generated
+	 */
+	void setOwnedContext(ParameterVariable value);
+
+	/**
 	 * Returns the value of the '<em><b>Overridden</b></em>' reference.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.qvtd.pivot.qvtbase.Rule#getOverrides <em>Overrides</em>}'.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbasePackageImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbasePackageImpl.java
index 593e4ad04..bf9275da6 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbasePackageImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbasePackageImpl.java
@@ -517,6 +517,16 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage {
 	 * @generated
 	 */
 	@Override
+	public EReference getRule_OwnedContext() {
+		return (EReference)ruleEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EReference getRule_Overridden() {
 		return (EReference)ruleEClass.getEStructuralFeatures().get(2);
 	}
@@ -957,6 +967,7 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage {
 		createEReference(ruleEClass, NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 2);
 		createEReference(ruleEClass, NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 3);
 		createEReference(ruleEClass, NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4);
+		createEReference(ruleEClass, NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5);
 		createEOperation(ruleEClass, NamedElementImpl.NAMED_ELEMENT_OPERATION_COUNT + 0);
 		createEOperation(ruleEClass, NamedElementImpl.NAMED_ELEMENT_OPERATION_COUNT + 1);
 		createEOperation(ruleEClass, NamedElementImpl.NAMED_ELEMENT_OPERATION_COUNT + 2);
@@ -1128,6 +1139,7 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage {
 		initEReference(getRule_Overridden(), this.getRule(), this.getRule_Overrides(), "overridden", null, 0, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getRule_Overrides(), this.getRule(), this.getRule_Overridden(), "overrides", null, 0, -1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getRule_Transformation(), this.getTransformation(), this.getTransformation_Rule(), "transformation", null, 0, 1, Rule.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getRule_OwnedContext(), thePivotPackage.getParameterVariable(), null, "ownedContext", null, 0, 1, Rule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		op = initEOperation(getRule__ValidateDomainNameIsUnique__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validateDomainNameIsUnique", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/RuleImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/RuleImpl.java
index 26917a6a1..9c745c044 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/RuleImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/RuleImpl.java
@@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.ParameterVariable;
 import org.eclipse.ocl.pivot.StandardLibrary;
 import org.eclipse.ocl.pivot.evaluation.Executor;
 import org.eclipse.ocl.pivot.ids.IdResolver;
@@ -74,6 +75,7 @@ import org.eclipse.qvtd.pivot.qvtbase.Transformation;
  *   <li>{@link org.eclipse.qvtd.pivot.qvtbase.impl.RuleImpl#getOverridden <em>Overridden</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtbase.impl.RuleImpl#getOverrides <em>Overrides</em>}</li>
  *   <li>{@link org.eclipse.qvtd.pivot.qvtbase.impl.RuleImpl#getTransformation <em>Transformation</em>}</li>
+ *   <li>{@link org.eclipse.qvtd.pivot.qvtbase.impl.RuleImpl#getOwnedContext <em>Owned Context</em>}</li>
  * </ul>
  *
  * @generated
@@ -86,7 +88,7 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule {
 	 * @generated
 	 * @ordered
 	 */
-	public static final int RULE_FEATURE_COUNT = NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5;
+	public static final int RULE_FEATURE_COUNT = NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 6;
 
 	/**
 	 * The number of operations of the '<em>Rule</em>' class.
@@ -148,6 +150,16 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule {
 	protected EList<Rule> overrides;
 
 	/**
+	 * The cached value of the '{@link #getOwnedContext() <em>Owned Context</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwnedContext()
+	 * @generated
+	 * @ordered
+	 */
+	protected ParameterVariable ownedContext;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -264,6 +276,51 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule {
 	 * @generated
 	 */
 	@Override
+	public ParameterVariable getOwnedContext() {
+		return ownedContext;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOwnedContext(ParameterVariable newOwnedContext, NotificationChain msgs) {
+		ParameterVariable oldOwnedContext = ownedContext;
+		ownedContext = newOwnedContext;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5, oldOwnedContext, newOwnedContext);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setOwnedContext(ParameterVariable newOwnedContext) {
+		if (newOwnedContext != ownedContext) {
+			NotificationChain msgs = null;
+			if (ownedContext != null)
+				msgs = ((InternalEObject)ownedContext).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - (NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5), null, msgs);
+			if (newOwnedContext != null)
+				msgs = ((InternalEObject)newOwnedContext).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - (NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5), null, msgs);
+			msgs = basicSetOwnedContext(newOwnedContext, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5, newOwnedContext, newOwnedContext));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public Rule getOverridden() {
 		if (overridden != null && overridden.eIsProxy()) {
 			InternalEObject oldOverridden = (InternalEObject)overridden;
@@ -860,6 +917,8 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule {
 				return ((InternalEList<?>)getOverrides()).basicRemove(otherEnd, msgs);
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				return basicSetTransformation(null, msgs);
+			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
+				return basicSetOwnedContext(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -897,6 +956,8 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule {
 				return getOverrides();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				return getTransformation();
+			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
+				return getOwnedContext();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -927,6 +988,9 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule {
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				setTransformation((Transformation)newValue);
 				return;
+			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
+				setOwnedContext((ParameterVariable)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -954,6 +1018,9 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule {
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				setTransformation((Transformation)null);
 				return;
+			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
+				setOwnedContext((ParameterVariable)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -976,6 +1043,8 @@ public abstract class RuleImpl extends NamedElementImpl implements Rule {
 				return overrides != null && !overrides.isEmpty();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				return getTransformation() != null;
+			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
+				return ownedContext != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/model/QVTbaseMetamodel.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/model/QVTbaseMetamodel.java
index 98fcf0b7b..c72a655ce 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/model/QVTbaseMetamodel.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/model/QVTbaseMetamodel.java
@@ -301,6 +301,7 @@ public class QVTbaseMetamodel extends ASResourceImpl
 		private final @NonNull Class _OCLExpression = createClass("OCLExpression");
 		private final @NonNull Class _Package_1 = createClass("Package");
 		private final @NonNull Class _Parameter = createClass("Parameter");
+		private final @NonNull Class _ParameterVariable = createClass("ParameterVariable");
 		private final @NonNull Class _Variable_1 = createClass("Variable");
 
 		private final @NonNull Class _BaseModel = createClass(QVTbasePackage.Literals.BASE_MODEL);
@@ -385,6 +386,9 @@ public class QVTbaseMetamodel extends ASResourceImpl
 			ownedClasses.add(type = _Parameter);
 			superClasses = type.getSuperClasses();
 			superClasses.add(_OclElement);
+			ownedClasses.add(type = _ParameterVariable);
+			superClasses = type.getSuperClasses();
+			superClasses.add(_OclElement);
 			ownedClasses.add(type = _Variable_1);
 			superClasses = type.getSuperClasses();
 			superClasses.add(_OclElement);
@@ -631,6 +635,7 @@ public class QVTbaseMetamodel extends ASResourceImpl
 		private final @NonNull Property pr_Package_TypedModel_usedPackage = createProperty("TypedModel", _Bag_TypedModel);
 		private final @NonNull Property pr_Parameter_Transformation_ownedContext = createProperty("Transformation", _Transformation);
 		private final @NonNull Property pr_Parameter_TypedModel_ownedContext = createProperty("TypedModel", _TypedModel);
+		private final @NonNull Property pr_ParameterVariable_Rule_ownedContext = createProperty("Rule", _Rule);
 		private final @NonNull Property pr_Variable_Pattern_bindsTo = createProperty("Pattern", _Bag_Pattern);
 
 		private final @NonNull Property pr_CompoundTargetElement_ownedTargetElements = createProperty(QVTbasePackage.Literals.COMPOUND_TARGET_ELEMENT__OWNED_TARGET_ELEMENTS, _OrderedSet_SimpleTargetElement_NullFree);
@@ -647,6 +652,7 @@ public class QVTbaseMetamodel extends ASResourceImpl
 		private final @NonNull Property pr_Rule_isAbstract = createProperty(QVTbasePackage.Literals.RULE__IS_ABSTRACT, _Boolean);
 		private final @NonNull Property pr_Rule_overridden = createProperty(QVTbasePackage.Literals.RULE__OVERRIDDEN, _Rule);
 		private final @NonNull Property pr_Rule_overrides = createProperty(QVTbasePackage.Literals.RULE__OVERRIDES, _OrderedSet_Rule_NullFree);
+		private final @NonNull Property pr_Rule_ownedContext = createProperty(QVTbasePackage.Literals.RULE__OWNED_CONTEXT, _ParameterVariable);
 		private final @NonNull Property pr_Rule_transformation = createProperty(QVTbasePackage.Literals.RULE__TRANSFORMATION, _Transformation);
 		private final @NonNull Property pr_SimpleTargetElement_iterates = createProperty(QVTbasePackage.Literals.SIMPLE_TARGET_ELEMENT__ITERATES, _Set_TypedModel_NullFree);
 		private final @NonNull Property pr_SimpleTargetElement_kind = createProperty(QVTbasePackage.Literals.SIMPLE_TARGET_ELEMENT__KIND, _TargetElementKind);
@@ -716,6 +722,13 @@ public class QVTbaseMetamodel extends ASResourceImpl
 			property.setIsResolveProxies(true);
 			property.setOpposite(pr_TypedModel_ownedContext);
 
+			ownedProperties = _ParameterVariable.getOwnedProperties();
+			ownedProperties.add(property = pr_ParameterVariable_Rule_ownedContext);
+			property.setIsImplicit(true);
+			property.setIsRequired(false);
+			property.setIsResolveProxies(true);
+			property.setOpposite(pr_Rule_ownedContext);
+
 			ownedProperties = _Variable_1.getOwnedProperties();
 			ownedProperties.add(property = pr_Variable_Pattern_bindsTo);
 			property.setIsImplicit(true);
@@ -786,6 +799,11 @@ public class QVTbaseMetamodel extends ASResourceImpl
 			ownedProperties.add(property = pr_Rule_overrides);
 			property.setIsResolveProxies(true);
 			property.setOpposite(pr_Rule_overridden);
+			ownedProperties.add(property = pr_Rule_ownedContext);
+			property.setIsComposite(true);
+			property.setIsRequired(false);
+			property.setIsResolveProxies(true);
+			property.setOpposite(pr_ParameterVariable_Rule_ownedContext);
 			ownedProperties.add(property = pr_Rule_transformation);
 			property.setIsRequired(false);
 			property.setIsTransient(true);
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/model-gen/QVTbase.oclas b/plugins/org.eclipse.qvtd.pivot.qvtbase/model-gen/QVTbase.oclas
index bc0de4cf8..cc5d98df7 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/model-gen/QVTbase.oclas
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/model-gen/QVTbase.oclas
@@ -71,6 +71,7 @@
       <ownedProperties xmi:id="r3ogk" defaultValueString="false" name="isAbstract" type="pivot:BooleanType &_1;#XEMMs"/>
       <ownedProperties xmi:id="zgFwC" isRequired="false" name="overridden" opposite="#mSVz," type="#zS2p0"/>
       <ownedProperties xmi:id="mSVz," name="overrides" opposite="#zgFwC" type="#n3g5w"/>
+      <ownedProperties xmi:id="J3nSf" isComposite="true" isRequired="false" name="ownedContext" type="pivot:Class &_0;#2i39P"/>
       <ownedProperties xmi:id="Img5I" isRequired="false" isResolveProxies="false" isTransient="true" name="transformation" opposite="#UVEee"
           type="#AjDLV"/>
     </ownedClasses>
@@ -167,6 +168,9 @@
       <ownedProperties xmi:id="5F8CN" isImplicit="true" isRequired="false" name="Transformation" opposite="#iWDDR" type="#AjDLV"/>
       <ownedProperties xmi:id="PNCQp" isImplicit="true" isRequired="false" name="TypedModel" opposite="#ggm9N" type="#WqJYx"/>
     </ownedClasses>
+    <ownedClasses xmi:id="2i39P" name="ParameterVariable">
+      <ownedProperties xmi:id="YSoi+" isImplicit="true" isRequired="false" name="Rule" opposite="#J3nSf" type="#zS2p0"/>
+    </ownedClasses>
     <ownedClasses xmi:id="t4j6T" name="Variable">
       <ownedProperties xmi:id="YwYCh" isImplicit="true" name="Pattern" opposite="#056L0" type="#pJjNZ"/>
     </ownedClasses>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore
index f818f0872..c4c499a9b 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore
@@ -236,6 +236,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-transformation"
         name="transformation" eType="#T-qvtbase-Transformation" transient="true" resolveProxies="false"
         eOpposite="#F-qvtbase-Transformation-rule"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-ownedContext"
+        name="ownedContext" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-ParameterVariable"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-SimpleTargetElement" name="SimpleTargetElement"
       eSuperTypes="#T-qvtbase-TargetElement">
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel
index 43f7275ff..5310b08a9 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel
@@ -71,6 +71,7 @@
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference QVTbase.ecore#F-qvtbase-Rule-overridden"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference QVTbase.ecore#F-qvtbase-Rule-overrides"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference QVTbase.ecore#F-qvtbase-Rule-transformation"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference QVTbase.ecore#F-qvtbase-Rule-ownedContext"/>
       <genOperations ecoreOperation="QVTbase.ecore#//Rule/validateDomainNameIsUnique">
         <genParameters ecoreParameter="QVTbase.ecore#//Rule/validateDomainNameIsUnique/diagnostics"/>
         <genParameters ecoreParameter="QVTbase.ecore#//Rule/validateDomainNameIsUnique/context"/>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbaseStructural.ecore b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbaseStructural.ecore
index 8ab683b04..8dee0b872 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbaseStructural.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbaseStructural.ecore
@@ -69,6 +69,8 @@
         eType="#//Rule" eOpposite="#//Rule/overridden"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="transformation" eType="#//Transformation"
         transient="true" resolveProxies="false" eOpposite="#//Transformation/rule"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedContext" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-ParameterVariable"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SimpleTargetElement" eSuperTypes="#//TargetElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="typedModel" ordered="false"
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcoreTables.java b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcoreTables.java
index 4db8c5776..dd9ea0209 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcoreTables.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcoreTables.java
@@ -1685,6 +1685,7 @@ public class QVTcoreTables extends AbstractTables
 			QVTbaseTables.Properties._Rule__overrides,
 			PivotTables.Properties._Element__ownedAnnotations,
 			PivotTables.Properties._Element__ownedComments,
+			QVTbaseTables.Properties._Rule__ownedContext,
 			PivotTables.Properties._Element__ownedExtensions,
 			QVTcoreTables.Properties._Mapping__refinement,
 			QVTcoreTables.Properties._Mapping__specification,
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeTables.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeTables.java
index de9e949eb..b8f30ded2 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeTables.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeTables.java
@@ -2709,6 +2709,7 @@ public class QVTimperativeTables extends AbstractTables
 			QVTbaseTables.Properties._Rule__overrides,
 			PivotTables.Properties._Element__ownedAnnotations,
 			PivotTables.Properties._Element__ownedComments,
+			QVTbaseTables.Properties._Rule__ownedContext,
 			PivotTables.Properties._Element__ownedExtensions,
 			QVTimperativeTables.Properties._Mapping__ownedMappingParameters,
 			QVTimperativeTables.Properties._Mapping__ownedStatements,
@@ -2835,6 +2836,7 @@ public class QVTimperativeTables extends AbstractTables
 			QVTbaseTables.Properties._Rule__overrides,
 			PivotTables.Properties._Element__ownedAnnotations,
 			PivotTables.Properties._Element__ownedComments,
+			QVTbaseTables.Properties._Rule__ownedContext,
 			PivotTables.Properties._Element__ownedExtensions,
 			QVTimperativeTables.Properties._Mapping__ownedMappingParameters,
 			QVTimperativeTables.Properties._Mapping__ownedStatements,
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationTables.java b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationTables.java
index f35f690ed..54b0245bf 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationTables.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationTables.java
@@ -1178,6 +1178,7 @@ public class QVTrelationTables extends AbstractTables
 			QVTbaseTables.Properties._Rule__overrides,
 			PivotTables.Properties._Element__ownedAnnotations,
 			PivotTables.Properties._Element__ownedComments,
+			QVTbaseTables.Properties._Rule__ownedContext,
 			PivotTables.Properties._Element__ownedExtensions,
 			QVTbaseTables.Properties._Rule__transformation,
 			QVTrelationTables.Properties._Relation__variable,