[513375] Regenerate with KeyPartEdge as a NavigationEdge

19 files changed, 94 insertions, 83 deletions

diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/KeyPartEdge.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/KeyPartEdge.java
index 8926ab135..f55061b71 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/KeyPartEdge.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/KeyPartEdge.java
@@ -35,7 +35,7 @@ package org.eclipse.qvtd.pivot.qvtschedule;
  * @model
  * @generated
  */
-public interface KeyPartEdge extends ArgumentEdge {
+public interface KeyPartEdge extends NavigationEdge {
 	/**
 	 * Returns the value of the '<em><b>Referred Part</b></em>' reference.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/PropertyDatum.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/PropertyDatum.java
index 2bf2b3170..4c21f0120 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/PropertyDatum.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/PropertyDatum.java
@@ -172,7 +172,7 @@ public interface PropertyDatum extends AbstractDatum {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * The ClassDatum that this PropertyDatum's slot references. if it is more derived than the referencedProperty.type.
+	 * The elemental ClassDatum that this PropertyDatum's slot references. if it is more derived than the referencedProperty.type.
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Target Class Datum</em>' reference.
 	 * @see #setTargetClassDatum(ClassDatum)
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/QVTscheduleTables.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/QVTscheduleTables.java
index 4667ae0b2..13ab361cc 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/QVTscheduleTables.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/QVTscheduleTables.java
@@ -622,11 +622,12 @@ public class QVTscheduleTables
 		private static final @NonNull ExecutorFragment _IteratorNode__OclElement = new ExecutorFragment(Types._IteratorNode, OCLstdlibTables.Types._OclElement);
 		private static final @NonNull ExecutorFragment _IteratorNode__VariableNode = new ExecutorFragment(Types._IteratorNode, QVTscheduleTables.Types._VariableNode);
 
-		private static final @NonNull ExecutorFragment _KeyPartEdge__ArgumentEdge = new ExecutorFragment(Types._KeyPartEdge, QVTscheduleTables.Types._ArgumentEdge);
+		private static final @NonNull ExecutorFragment _KeyPartEdge__ConnectionEnd = new ExecutorFragment(Types._KeyPartEdge, QVTscheduleTables.Types._ConnectionEnd);
 		private static final @NonNull ExecutorFragment _KeyPartEdge__Edge = new ExecutorFragment(Types._KeyPartEdge, QVTscheduleTables.Types._Edge);
 		private static final @NonNull ExecutorFragment _KeyPartEdge__Element = new ExecutorFragment(Types._KeyPartEdge, PivotTables.Types._Element);
-		private static final @NonNull ExecutorFragment _KeyPartEdge__ExpressionEdge = new ExecutorFragment(Types._KeyPartEdge, QVTscheduleTables.Types._ExpressionEdge);
 		private static final @NonNull ExecutorFragment _KeyPartEdge__KeyPartEdge = new ExecutorFragment(Types._KeyPartEdge, QVTscheduleTables.Types._KeyPartEdge);
+		private static final @NonNull ExecutorFragment _KeyPartEdge__NavigableEdge = new ExecutorFragment(Types._KeyPartEdge, QVTscheduleTables.Types._NavigableEdge);
+		private static final @NonNull ExecutorFragment _KeyPartEdge__NavigationEdge = new ExecutorFragment(Types._KeyPartEdge, QVTscheduleTables.Types._NavigationEdge);
 		private static final @NonNull ExecutorFragment _KeyPartEdge__OclAny = new ExecutorFragment(Types._KeyPartEdge, OCLstdlibTables.Types._OclAny);
 		private static final @NonNull ExecutorFragment _KeyPartEdge__OclElement = new ExecutorFragment(Types._KeyPartEdge, OCLstdlibTables.Types._OclElement);
 
@@ -1676,13 +1677,14 @@ public class QVTscheduleTables
 			{
 				Fragments._KeyPartEdge__OclAny /* 0 */,
 				Fragments._KeyPartEdge__OclElement /* 1 */,
+				Fragments._KeyPartEdge__ConnectionEnd /* 2 */,
 				Fragments._KeyPartEdge__Element /* 2 */,
 				Fragments._KeyPartEdge__Edge /* 3 */,
-				Fragments._KeyPartEdge__ExpressionEdge /* 4 */,
-				Fragments._KeyPartEdge__ArgumentEdge /* 5 */,
+				Fragments._KeyPartEdge__NavigableEdge /* 4 */,
+				Fragments._KeyPartEdge__NavigationEdge /* 5 */,
 				Fragments._KeyPartEdge__KeyPartEdge /* 6 */
 			};
-		private static final int @NonNull [] __KeyPartEdge = { 1,1,1,1,1,1,1 };
+		private static final int @NonNull [] __KeyPartEdge = { 1,1,2,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _KeyedValueNode =
 			{
@@ -3416,13 +3418,14 @@ public class QVTscheduleTables
 		private static final @NonNull ExecutorOperation @NonNull [] _IteratorNode__VariableNode = {};
 
 		private static final @NonNull ExecutorOperation @NonNull [] _KeyPartEdge__KeyPartEdge = {};
-		private static final @NonNull ExecutorOperation @NonNull [] _KeyPartEdge__ArgumentEdge = {};
+		private static final @NonNull ExecutorOperation @NonNull [] _KeyPartEdge__ConnectionEnd = {};
 		private static final @NonNull ExecutorOperation @NonNull [] _KeyPartEdge__Edge = {};
 		private static final @NonNull ExecutorOperation @NonNull [] _KeyPartEdge__Element = {
 			PivotTables.Operations._Element__allOwnedElements /* allOwnedElements() */,
 			PivotTables.Operations._Element__getValue /* getValue(Type[1],String[1]) */
 		};
-		private static final @NonNull ExecutorOperation @NonNull [] _KeyPartEdge__ExpressionEdge = {};
+		private static final @NonNull ExecutorOperation @NonNull [] _KeyPartEdge__NavigableEdge = {};
+		private static final @NonNull ExecutorOperation @NonNull [] _KeyPartEdge__NavigationEdge = {};
 		private static final @NonNull ExecutorOperation @NonNull [] _KeyPartEdge__OclAny = {
 			OCLstdlibTables.Operations._OclAny___lt__gt_ /* _'<>'(OclSelf[1]) */,
 			OCLstdlibTables.Operations._OclAny___eq_ /* _'='(OclSelf[1]) */,
@@ -5339,11 +5342,12 @@ public class QVTscheduleTables
 			Fragments._IteratorNode__OclElement.initOperations(_IteratorNode__OclElement);
 			Fragments._IteratorNode__VariableNode.initOperations(_IteratorNode__VariableNode);
 
-			Fragments._KeyPartEdge__ArgumentEdge.initOperations(_KeyPartEdge__ArgumentEdge);
+			Fragments._KeyPartEdge__ConnectionEnd.initOperations(_KeyPartEdge__ConnectionEnd);
 			Fragments._KeyPartEdge__Edge.initOperations(_KeyPartEdge__Edge);
 			Fragments._KeyPartEdge__Element.initOperations(_KeyPartEdge__Element);
-			Fragments._KeyPartEdge__ExpressionEdge.initOperations(_KeyPartEdge__ExpressionEdge);
 			Fragments._KeyPartEdge__KeyPartEdge.initOperations(_KeyPartEdge__KeyPartEdge);
+			Fragments._KeyPartEdge__NavigableEdge.initOperations(_KeyPartEdge__NavigableEdge);
+			Fragments._KeyPartEdge__NavigationEdge.initOperations(_KeyPartEdge__NavigationEdge);
 			Fragments._KeyPartEdge__OclAny.initOperations(_KeyPartEdge__OclAny);
 			Fragments._KeyPartEdge__OclElement.initOperations(_KeyPartEdge__OclElement);
 
@@ -6083,9 +6087,15 @@ public class QVTscheduleTables
 		private static final @NonNull ExecutorProperty @NonNull [] _KeyPartEdge = {
 			QVTscheduleTables.Properties._Edge__cluster,
 			QVTscheduleTables.Properties._Edge__edgeRole,
+			QVTscheduleTables.Properties._NavigableEdge__incomingConnection,
 			QVTscheduleTables.Properties._Edge__name,
+			QVTscheduleTables.Properties._NavigationEdge__oppositeEdge,
+			QVTscheduleTables.Properties._NavigableEdge__outgoingConnections,
 			QVTscheduleTables.Properties._Edge__owningRegion,
+			QVTscheduleTables.Properties._NavigationEdge__partial,
 			QVTscheduleTables.Properties._KeyPartEdge__referredPart,
+			QVTscheduleTables.Properties._NavigationEdge__referredProperty,
+			QVTscheduleTables.Properties._NavigationEdge__secondary,
 			QVTscheduleTables.Properties._Edge__sourceNode,
 			QVTscheduleTables.Properties._Edge__targetNode,
 			QVTscheduleTables.Properties._Edge__utility
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/ClassDatumImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/ClassDatumImpl.java
index 24b1e07eb..15de919c7 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/ClassDatumImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/ClassDatumImpl.java
@@ -329,7 +329,7 @@ public class ClassDatumImpl extends AbstractDatumImpl implements ClassDatum {
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 2:
 				if (eInternalContainer() != null)
 					msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetOwningScheduleModel((ScheduleModel)otherEnd, msgs);
+				return basicSetOwningScheduleModel((ScheduleModel)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -380,10 +380,10 @@ public class ClassDatumImpl extends AbstractDatumImpl implements ClassDatum {
 				return getOwningScheduleModel();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 3:
 				if (resolve) return getReferredClass();
-			return basicGetReferredClass();
+				return basicGetReferredClass();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				if (resolve) return getReferredTypedModel();
-			return basicGetReferredTypedModel();
+				return basicGetReferredTypedModel();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
 				return getSuperClassDatums();
 		}
@@ -401,25 +401,25 @@ public class ClassDatumImpl extends AbstractDatumImpl implements ClassDatum {
 		switch (featureID) {
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 0:
 				getCompleteClasses().clear();
-			getCompleteClasses().addAll((Collection<? extends CompleteClass>)newValue);
-			return;
+				getCompleteClasses().addAll((Collection<? extends CompleteClass>)newValue);
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 1:
 				getOwnedPropertyDatums().clear();
-			getOwnedPropertyDatums().addAll((Collection<? extends PropertyDatum>)newValue);
-			return;
+				getOwnedPropertyDatums().addAll((Collection<? extends PropertyDatum>)newValue);
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 2:
 				setOwningScheduleModel((ScheduleModel)newValue);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 3:
 				setReferredClass((org.eclipse.ocl.pivot.Class)newValue);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				setReferredTypedModel((TypedModel)newValue);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
 				getSuperClassDatums().clear();
-			getSuperClassDatums().addAll((Collection<? extends ClassDatum>)newValue);
-			return;
+				getSuperClassDatums().addAll((Collection<? extends ClassDatum>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -434,22 +434,22 @@ public class ClassDatumImpl extends AbstractDatumImpl implements ClassDatum {
 		switch (featureID) {
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 0:
 				getCompleteClasses().clear();
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 1:
 				getOwnedPropertyDatums().clear();
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 2:
 				setOwningScheduleModel((ScheduleModel)null);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 3:
 				setReferredClass((org.eclipse.ocl.pivot.Class)null);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				setReferredTypedModel((TypedModel)null);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
 				getSuperClassDatums().clear();
-			return;
+				return;
 		}
 		super.eUnset(featureID);
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/KeyPartEdgeImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/KeyPartEdgeImpl.java
index 94eda8f9f..d473b4bfc 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/KeyPartEdgeImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/KeyPartEdgeImpl.java
@@ -25,8 +25,8 @@ import org.eclipse.jdt.annotation.NonNull;
 
 import org.eclipse.ocl.pivot.internal.ElementImpl;
 import org.eclipse.ocl.pivot.util.Visitor;
-import org.eclipse.qvtd.pivot.qvtschedule.Edge;
 import org.eclipse.qvtd.pivot.qvtschedule.KeyPartEdge;
+import org.eclipse.qvtd.pivot.qvtschedule.NavigableEdge;
 import org.eclipse.qvtd.pivot.qvtschedule.Node;
 import org.eclipse.qvtd.pivot.qvtschedule.PropertyDatum;
 import org.eclipse.qvtd.pivot.qvtschedule.QVTschedulePackage;
@@ -47,7 +47,7 @@ import org.eclipse.qvtd.pivot.qvtschedule.util.QVTscheduleVisitor;
  *
  * @generated
  */
-public class KeyPartEdgeImpl extends ArgumentEdgeImpl implements KeyPartEdge {
+public class KeyPartEdgeImpl extends NavigationEdgeImpl implements KeyPartEdge {
 	/**
 	 * The number of structural features of the '<em>Key Part Edge</em>' class.
 	 * <!-- begin-user-doc -->
@@ -55,7 +55,7 @@ public class KeyPartEdgeImpl extends ArgumentEdgeImpl implements KeyPartEdge {
 	 * @generated
 	 * @ordered
 	 */
-	public static final int KEY_PART_EDGE_FEATURE_COUNT = ArgumentEdgeImpl.ARGUMENT_EDGE_FEATURE_COUNT + 1;
+	public static final int KEY_PART_EDGE_FEATURE_COUNT = NavigationEdgeImpl.NAVIGATION_EDGE_FEATURE_COUNT + 1;
 	/**
 	 * The number of operations of the '<em>Key Part Edge</em>' class.
 	 * <!-- begin-user-doc -->
@@ -63,7 +63,7 @@ public class KeyPartEdgeImpl extends ArgumentEdgeImpl implements KeyPartEdge {
 	 * @generated
 	 * @ordered
 	 */
-	public static final int KEY_PART_EDGE_OPERATION_COUNT = ArgumentEdgeImpl.ARGUMENT_EDGE_OPERATION_COUNT + 0;
+	public static final int KEY_PART_EDGE_OPERATION_COUNT = NavigationEdgeImpl.NAVIGATION_EDGE_OPERATION_COUNT + 0;
 	/**
 	 * The cached value of the '{@link #getReferredPart() <em>Referred Part</em>}' reference.
 	 * <!-- begin-user-doc -->
@@ -105,7 +105,7 @@ public class KeyPartEdgeImpl extends ArgumentEdgeImpl implements KeyPartEdge {
 			referredPart = (PropertyDatum)eResolveProxy(oldReferredPart);
 			if (referredPart != oldReferredPart) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementImpl.ELEMENT_FEATURE_COUNT + 7, oldReferredPart, referredPart));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementImpl.ELEMENT_FEATURE_COUNT + 13, oldReferredPart, referredPart));
 			}
 		}
 		return referredPart;
@@ -130,7 +130,7 @@ public class KeyPartEdgeImpl extends ArgumentEdgeImpl implements KeyPartEdge {
 		PropertyDatum oldReferredPart = referredPart;
 		referredPart = newReferredPart;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementImpl.ELEMENT_FEATURE_COUNT + 7, oldReferredPart, referredPart));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementImpl.ELEMENT_FEATURE_COUNT + 13, oldReferredPart, referredPart));
 	}
 
 	/**
@@ -141,9 +141,9 @@ public class KeyPartEdgeImpl extends ArgumentEdgeImpl implements KeyPartEdge {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementImpl.ELEMENT_FEATURE_COUNT + 7:
+			case ElementImpl.ELEMENT_FEATURE_COUNT + 13:
 				if (resolve) return getReferredPart();
-				return basicGetReferredPart();
+			return basicGetReferredPart();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -156,9 +156,9 @@ public class KeyPartEdgeImpl extends ArgumentEdgeImpl implements KeyPartEdge {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementImpl.ELEMENT_FEATURE_COUNT + 7:
+			case ElementImpl.ELEMENT_FEATURE_COUNT + 13:
 				setReferredPart((PropertyDatum)newValue);
-				return;
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -171,9 +171,9 @@ public class KeyPartEdgeImpl extends ArgumentEdgeImpl implements KeyPartEdge {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementImpl.ELEMENT_FEATURE_COUNT + 7:
+			case ElementImpl.ELEMENT_FEATURE_COUNT + 13:
 				setReferredPart((PropertyDatum)null);
-				return;
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -186,7 +186,7 @@ public class KeyPartEdgeImpl extends ArgumentEdgeImpl implements KeyPartEdge {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementImpl.ELEMENT_FEATURE_COUNT + 7:
+			case ElementImpl.ELEMENT_FEATURE_COUNT + 13:
 				return referredPart != null;
 		}
 		return super.eIsSet(featureID);
@@ -208,7 +208,7 @@ public class KeyPartEdgeImpl extends ArgumentEdgeImpl implements KeyPartEdge {
 	}
 
 	@Override
-	public @NonNull Edge createEdge(@NonNull Role edgeRole, @NonNull Utility utility, @NonNull Node sourceNode, @NonNull Node targetNode) {
+	public @NonNull NavigableEdge createEdge(@NonNull Role edgeRole, @NonNull Utility utility, @NonNull Node sourceNode, @NonNull Node targetNode) {
 		KeyPartEdge newEdge = (KeyPartEdge) super.createEdge(edgeRole, utility, sourceNode, targetNode);
 		newEdge.setReferredPart(getReferredPart());
 		return newEdge;
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/PartitionImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/PartitionImpl.java
index 95cba81af..70d6a0809 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/PartitionImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/PartitionImpl.java
@@ -205,16 +205,16 @@ public abstract class PartitionImpl extends NamedElementImpl implements Partitio
 		switch (featureID) {
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 0:
 				getPasses().clear();
-			getPasses().addAll((Collection<? extends Integer>)newValue);
-			return;
+				getPasses().addAll((Collection<? extends Integer>)newValue);
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 1:
 				getIntermediateConnections().clear();
-			getIntermediateConnections().addAll((Collection<? extends NodeConnection>)newValue);
-			return;
+				getIntermediateConnections().addAll((Collection<? extends NodeConnection>)newValue);
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 2:
 				getRootConnections().clear();
-			getRootConnections().addAll((Collection<? extends NodeConnection>)newValue);
-			return;
+				getRootConnections().addAll((Collection<? extends NodeConnection>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -229,13 +229,13 @@ public abstract class PartitionImpl extends NamedElementImpl implements Partitio
 		switch (featureID) {
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 0:
 				getPasses().clear();
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 1:
 				getIntermediateConnections().clear();
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 2:
 				getRootConnections().clear();
-			return;
+				return;
 		}
 		super.eUnset(featureID);
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/PropertyDatumImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/PropertyDatumImpl.java
index ecc2e07c3..197ba78aa 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/PropertyDatumImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/PropertyDatumImpl.java
@@ -358,7 +358,7 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 1:
 				if (eInternalContainer() != null)
 					msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetOwningClassDatum((ClassDatum)otherEnd, msgs);
+				return basicSetOwningClassDatum((ClassDatum)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -401,19 +401,19 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu
 		switch (featureID) {
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 0:
 				if (resolve) return getOpposite();
-			return basicGetOpposite();
+				return basicGetOpposite();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 1:
 				return getOwningClassDatum();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 2:
 				if (resolve) return getReferredProperty();
-			return basicGetReferredProperty();
+				return basicGetReferredProperty();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 3:
 				return getSuperPropertyDatums();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				return isKey();
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
 				if (resolve) return getTargetClassDatum();
-			return basicGetTargetClassDatum();
+				return basicGetTargetClassDatum();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -429,23 +429,23 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu
 		switch (featureID) {
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 0:
 				setOpposite((PropertyDatum)newValue);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 1:
 				setOwningClassDatum((ClassDatum)newValue);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 2:
 				setReferredProperty((Property)newValue);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 3:
 				getSuperPropertyDatums().clear();
-			getSuperPropertyDatums().addAll((Collection<? extends PropertyDatum>)newValue);
-			return;
+				getSuperPropertyDatums().addAll((Collection<? extends PropertyDatum>)newValue);
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				setKey((Boolean)newValue);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
 				setTargetClassDatum((ClassDatum)newValue);
-			return;
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -460,22 +460,22 @@ public class PropertyDatumImpl extends AbstractDatumImpl implements PropertyDatu
 		switch (featureID) {
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 0:
 				setOpposite((PropertyDatum)null);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 1:
 				setOwningClassDatum((ClassDatum)null);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 2:
 				setReferredProperty((Property)null);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 3:
 				getSuperPropertyDatums().clear();
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 4:
 				setKey(KEY_EDEFAULT);
-			return;
+				return;
 			case NamedElementImpl.NAMED_ELEMENT_FEATURE_COUNT + 5:
 				setTargetClassDatum((ClassDatum)null);
-			return;
+				return;
 		}
 		super.eUnset(featureID);
 	}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/QVTschedulePackageImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/QVTschedulePackageImpl.java
index b98763077..d4e3efd18 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/QVTschedulePackageImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/QVTschedulePackageImpl.java
@@ -3004,7 +3004,7 @@ public class QVTschedulePackageImpl extends EPackageImpl implements QVTscheduleP
 		iteratorNodeEClass = createEClass(29);
 
 		keyPartEdgeEClass = createEClass(30);
-		createEReference(keyPartEdgeEClass, ElementImpl.ELEMENT_FEATURE_COUNT + 7);
+		createEReference(keyPartEdgeEClass, ElementImpl.ELEMENT_FEATURE_COUNT + 13);
 
 		keyedValueNodeEClass = createEClass(31);
 		createEReference(keyedValueNodeEClass, ElementImpl.ELEMENT_FEATURE_COUNT + 10);
@@ -3248,7 +3248,7 @@ public class QVTschedulePackageImpl extends EPackageImpl implements QVTscheduleP
 		inputNodeEClass.getESuperTypes().add(this.getNode());
 		iteratedEdgeEClass.getESuperTypes().add(this.getEdge());
 		iteratorNodeEClass.getESuperTypes().add(this.getVariableNode());
-		keyPartEdgeEClass.getESuperTypes().add(this.getArgumentEdge());
+		keyPartEdgeEClass.getESuperTypes().add(this.getNavigationEdge());
 		keyedValueNodeEClass.getESuperTypes().add(this.getOperationNode());
 		loadingPartitionEClass.getESuperTypes().add(this.getMappingPartition());
 		loadingRegionEClass.getESuperTypes().add(this.getRegion());
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractExtendingQVTscheduleVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractExtendingQVTscheduleVisitor.java
index cc57699d3..0ef0c2299 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractExtendingQVTscheduleVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractExtendingQVTscheduleVisitor.java
@@ -188,7 +188,7 @@ public abstract class AbstractExtendingQVTscheduleVisitor<R, C>
 
 	@Override
 	public R visitKeyPartEdge(org.eclipse.qvtd.pivot.qvtschedule.@NonNull KeyPartEdge object) {
-		return visitArgumentEdge(object);
+		return visitNavigationEdge(object);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleAS2MonikerVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleAS2MonikerVisitor.java
index 231a6d2f5..953fddd02 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleAS2MonikerVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleAS2MonikerVisitor.java
@@ -192,7 +192,7 @@ public abstract class AbstractQVTscheduleAS2MonikerVisitor
 
 	@Override
 	public @Nullable Object visitKeyPartEdge(org.eclipse.qvtd.pivot.qvtschedule.@NonNull KeyPartEdge object) {
-		return visitArgumentEdge(object);
+		return visitNavigationEdge(object);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleAS2XMIidVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleAS2XMIidVisitor.java
index 8e428ef4d..c7802924d 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleAS2XMIidVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleAS2XMIidVisitor.java
@@ -194,7 +194,7 @@ implements QVTscheduleVisitor<Boolean>
 
 	@Override
 	public @Nullable Boolean visitKeyPartEdge(@NonNull KeyPartEdge object) {
-		return visitArgumentEdge(object);
+		return visitNavigationEdge(object);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleASSaverLocateVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleASSaverLocateVisitor.java
index 6e12bc81d..12d1741f7 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleASSaverLocateVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleASSaverLocateVisitor.java
@@ -192,7 +192,7 @@ public abstract class AbstractQVTscheduleASSaverLocateVisitor
 
 	@Override
 	public @Nullable Object visitKeyPartEdge(org.eclipse.qvtd.pivot.qvtschedule.@NonNull KeyPartEdge object) {
-		return visitArgumentEdge(object);
+		return visitNavigationEdge(object);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleASSaverNormalizeVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleASSaverNormalizeVisitor.java
index 05d4d83fc..d3acccbcc 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleASSaverNormalizeVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleASSaverNormalizeVisitor.java
@@ -192,7 +192,7 @@ public abstract class AbstractQVTscheduleASSaverNormalizeVisitor
 
 	@Override
 	public @Nullable Object visitKeyPartEdge(org.eclipse.qvtd.pivot.qvtschedule.@NonNull KeyPartEdge object) {
-		return visitArgumentEdge(object);
+		return visitNavigationEdge(object);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleASSaverResolveVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleASSaverResolveVisitor.java
index 2be31452e..fcbcd5a33 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleASSaverResolveVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleASSaverResolveVisitor.java
@@ -192,7 +192,7 @@ public abstract class AbstractQVTscheduleASSaverResolveVisitor
 
 	@Override
 	public @Nullable Object visitKeyPartEdge(org.eclipse.qvtd.pivot.qvtschedule.@NonNull KeyPartEdge object) {
-		return visitArgumentEdge(object);
+		return visitNavigationEdge(object);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleFlowAnalysisDeducerFromFalseVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleFlowAnalysisDeducerFromFalseVisitor.java
index d8d1997b9..8765030d7 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleFlowAnalysisDeducerFromFalseVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleFlowAnalysisDeducerFromFalseVisitor.java
@@ -192,7 +192,7 @@ public abstract class AbstractQVTscheduleFlowAnalysisDeducerFromFalseVisitor
 
 	@Override
 	public @Nullable Boolean visitKeyPartEdge(org.eclipse.qvtd.pivot.qvtschedule.@NonNull KeyPartEdge object) {
-		return visitArgumentEdge(object);
+		return visitNavigationEdge(object);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleFlowAnalysisDeducerFromNullVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleFlowAnalysisDeducerFromNullVisitor.java
index 34c9c483b..806c44dab 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleFlowAnalysisDeducerFromNullVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleFlowAnalysisDeducerFromNullVisitor.java
@@ -192,7 +192,7 @@ public abstract class AbstractQVTscheduleFlowAnalysisDeducerFromNullVisitor
 
 	@Override
 	public @Nullable Boolean visitKeyPartEdge(org.eclipse.qvtd.pivot.qvtschedule.@NonNull KeyPartEdge object) {
-		return visitArgumentEdge(object);
+		return visitNavigationEdge(object);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleFlowAnalysisDeducerFromTrueVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleFlowAnalysisDeducerFromTrueVisitor.java
index cda892b24..8defc41bf 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleFlowAnalysisDeducerFromTrueVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleFlowAnalysisDeducerFromTrueVisitor.java
@@ -192,7 +192,7 @@ public abstract class AbstractQVTscheduleFlowAnalysisDeducerFromTrueVisitor
 
 	@Override
 	public @Nullable Boolean visitKeyPartEdge(org.eclipse.qvtd.pivot.qvtschedule.@NonNull KeyPartEdge object) {
-		return visitArgumentEdge(object);
+		return visitNavigationEdge(object);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleTemplateParameterSubstitutionVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleTemplateParameterSubstitutionVisitor.java
index ee136e642..58d05ee92 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleTemplateParameterSubstitutionVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/AbstractQVTscheduleTemplateParameterSubstitutionVisitor.java
@@ -193,7 +193,7 @@ public abstract class AbstractQVTscheduleTemplateParameterSubstitutionVisitor
 
 	@Override
 	public @Nullable Object visitKeyPartEdge(org.eclipse.qvtd.pivot.qvtschedule.@NonNull KeyPartEdge object) {
-		return visitArgumentEdge(object);
+		return visitNavigationEdge(object);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/QVTscheduleSwitch.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/QVTscheduleSwitch.java
index cbd52a0e1..36022e18c 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/QVTscheduleSwitch.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/QVTscheduleSwitch.java
@@ -366,9 +366,10 @@ public class QVTscheduleSwitch<@Nullable T> extends Switch<T> {
 			case 30: {
 				KeyPartEdge keyPartEdge = (KeyPartEdge)theEObject;
 				T result = caseKeyPartEdge(keyPartEdge);
-				if (result == null) result = caseArgumentEdge(keyPartEdge);
-				if (result == null) result = caseExpressionEdge(keyPartEdge);
+				if (result == null) result = caseNavigationEdge(keyPartEdge);
+				if (result == null) result = caseNavigableEdge(keyPartEdge);
 				if (result == null) result = caseEdge(keyPartEdge);
+				if (result == null) result = caseConnectionEnd(keyPartEdge);
 				if (result == null) result = caseElement(keyPartEdge);
 				if (result == null) result = defaultCase(theEObject);
 				return result;