Attachment 113403 Details for Bug 232332 – API only update

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] API only update

API_Only_200809041439.patch (text/plain), 1.10 MB, created by James Bruck

on 2008-09-24 14:43:07 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: James Bruck

Created: 2008-09-24 14:43:07 EDT

Size: 1.10 MB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.uml2.uml.editor
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF,v
>retrieving revision 1.14
>diff -u -r1.14 MANIFEST.MF
>--- META-INF/MANIFEST.MF	21 Feb 2008 18:43:03 -0000	1.14
>+++ META-INF/MANIFEST.MF	24 Sep 2008 18:40:06 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.uml2.uml.editor; singleton:=true
>-Bundle-Version: 2.2.0.qualifier
>+Bundle-Version: 2.3.0.qualifier
> Bundle-ClassPath: .
> Bundle-Activator: org.eclipse.uml2.uml.editor.UMLEditorPlugin$Implementation
> Bundle-Vendor: %providerName
>@@ -14,7 +14,7 @@
> org.eclipse.uml2.uml.editor.presentation
> Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
> org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
>- org.eclipse.uml2.uml.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
>+ org.eclipse.uml2.uml.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
> org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
> org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
> org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport
>Index: src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java,v
>retrieving revision 1.44
>diff -u -r1.44 UMLEditor.java
>--- src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java	12 May 2008 19:49:05 -0000	1.44
>+++ src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java	24 Sep 2008 18:40:06 -0000
>@@ -457,9 +457,10 @@
> 							if (delta.getKind() == IResourceDelta.REMOVED
> 								|| delta.getKind() == IResourceDelta.CHANGED
> 								&& delta.getFlags() != IResourceDelta.MARKERS) {
>-								Resource resource = resourceSet.getResource(URI
>-									.createURI(delta.getFullPath().toString()),
>-									false);
>+								Resource resource = resourceSet
>+									.getResource(URI.createPlatformResourceURI(
>+										delta.getFullPath().toString(), true),
>+										false);
> 								if (resource != null) {
> 									if (delta.getKind() == IResourceDelta.REMOVED) {
> 										removedResources.add(resource);
>@@ -494,7 +495,6 @@
> 								public void run() {
> 									getSite().getPage().closeEditor(
> 										UMLEditor.this, false);
>-									UMLEditor.this.dispose();
> 								}
> 							});
> 					}
>@@ -536,7 +536,6 @@
> 		if (!removedResources.isEmpty()) {
> 			if (handleDirtyConflict()) {
> 				getSite().getPage().closeEditor(UMLEditor.this, false);
>-				UMLEditor.this.dispose();
> 			} else {
> 				removedResources.clear();
> 				changedResources.clear();
>#P org.eclipse.uml2.uml
>Index: src/org/eclipse/uml2/uml/util/UMLUtil.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java,v
>retrieving revision 1.76
>diff -u -r1.76 UMLUtil.java
>--- src/org/eclipse/uml2/uml/util/UMLUtil.java	19 Aug 2008 18:50:23 -0000	1.76
>+++ src/org/eclipse/uml2/uml/util/UMLUtil.java	24 Sep 2008 18:40:14 -0000
>@@ -2466,26 +2466,21 @@
> 									for (TemplateParameterSubstitution parameterSubstitution : templateBinding
> 										.getParameterSubstitutions()) {
> 
>-										EList<ParameterableElement> actuals = parameterSubstitution
>-											.getActuals();
>+										ParameterableElement actual = parameterSubstitution
>+											.getActual();
> 
>-										ParameterableElement argument = actuals
>-											.isEmpty()
>-											? null
>-											: actuals.get(0);
>-
>-										if (argument == null) {
>+										if (actual == null) {
> 											TemplateParameter formal = parameterSubstitution
> 												.getFormal();
> 
> 											if (formal != null) {
>-												argument = formal.getDefault();
>+												actual = formal.getDefault();
> 											}
> 										}
> 
>-										if (argument instanceof Classifier) {
>+										if (actual instanceof Classifier) {
> 											eTypeArguments
>-												.add(getEGenericType((Classifier) argument));
>+												.add(getEGenericType((Classifier) actual));
> 										}
> 									}
> 								}
>@@ -5866,8 +5861,8 @@
> 
> 						if (!(safeEquals(parameterSubstitution.getFormal(),
> 							otherParameterSubstitution.getFormal()) && safeEquals(
>-							parameterSubstitution.getActuals(),
>-							otherParameterSubstitution.getActuals()))) {
>+							parameterSubstitution.getActual(),
>+							otherParameterSubstitution.getActual()))) {
> 
> 							return false;
> 						}
>@@ -6359,8 +6354,7 @@
> 									.createParameterSubstitution();
> 								parameterSubstitution
> 									.setFormal(templateParameter);
>-								parameterSubstitution.getActuals().add(
>-									argumentType);
>+								parameterSubstitution.setActual(argumentType);
> 							}
> 						}
> 					}
>Index: src/org/eclipse/uml2/uml/util/UMLSwitch.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLSwitch.java,v
>retrieving revision 1.17
>diff -u -r1.17 UMLSwitch.java
>--- src/org/eclipse/uml2/uml/util/UMLSwitch.java	9 Jan 2008 18:56:03 -0000	1.17
>+++ src/org/eclipse/uml2/uml/util/UMLSwitch.java	24 Sep 2008 18:40:13 -0000
>@@ -226,6 +226,7 @@
> import org.eclipse.uml2.uml.SignalEvent;
> import org.eclipse.uml2.uml.Slot;
> import org.eclipse.uml2.uml.StartClassifierBehaviorAction;
>+import org.eclipse.uml2.uml.StartObjectBehaviorAction;
> import org.eclipse.uml2.uml.State;
> import org.eclipse.uml2.uml.StateInvariant;
> import org.eclipse.uml2.uml.StateMachine;
>@@ -888,19 +889,6 @@
> 					result = defaultCase(theEObject);
> 				return result;
> 			}
>-			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER : {
>-				ConnectableElementTemplateParameter connectableElementTemplateParameter = (ConnectableElementTemplateParameter) theEObject;
>-				T result = caseConnectableElementTemplateParameter(connectableElementTemplateParameter);
>-				if (result == null)
>-					result = caseTemplateParameter(connectableElementTemplateParameter);
>-				if (result == null)
>-					result = caseElement(connectableElementTemplateParameter);
>-				if (result == null)
>-					result = caseEModelElement(connectableElementTemplateParameter);
>-				if (result == null)
>-					result = defaultCase(theEObject);
>-				return result;
>-			}
> 			case UMLPackage.CONNECTOR_END : {
> 				ConnectorEnd connectorEnd = (ConnectorEnd) theEObject;
> 				T result = caseConnectorEnd(connectorEnd);
>@@ -924,8 +912,6 @@
> 				if (result == null)
> 					result = caseDeploymentTarget(property);
> 				if (result == null)
>-					result = caseTemplateableElement(property);
>-				if (result == null)
> 					result = caseFeature(property);
> 				if (result == null)
> 					result = caseTypedElement(property);
>@@ -936,10 +922,10 @@
> 				if (result == null)
> 					result = caseNamedElement(property);
> 				if (result == null)
>-					result = caseElement(property);
>-				if (result == null)
> 					result = caseRedefinableElement(property);
> 				if (result == null)
>+					result = caseElement(property);
>+				if (result == null)
> 					result = caseEModelElement(property);
> 				if (result == null)
> 					result = defaultCase(theEObject);
>@@ -1485,8 +1471,6 @@
> 				if (result == null)
> 					result = caseDeploymentTarget(port);
> 				if (result == null)
>-					result = caseTemplateableElement(port);
>-				if (result == null)
> 					result = caseFeature(port);
> 				if (result == null)
> 					result = caseTypedElement(port);
>@@ -1497,10 +1481,10 @@
> 				if (result == null)
> 					result = caseNamedElement(port);
> 				if (result == null)
>-					result = caseElement(port);
>-				if (result == null)
> 					result = caseRedefinableElement(port);
> 				if (result == null)
>+					result = caseElement(port);
>+				if (result == null)
> 					result = caseEModelElement(port);
> 				if (result == null)
> 					result = defaultCase(theEObject);
>@@ -1686,8 +1670,6 @@
> 				if (result == null)
> 					result = caseDeploymentTarget(extensionEnd);
> 				if (result == null)
>-					result = caseTemplateableElement(extensionEnd);
>-				if (result == null)
> 					result = caseFeature(extensionEnd);
> 				if (result == null)
> 					result = caseTypedElement(extensionEnd);
>@@ -1698,10 +1680,10 @@
> 				if (result == null)
> 					result = caseNamedElement(extensionEnd);
> 				if (result == null)
>-					result = caseElement(extensionEnd);
>-				if (result == null)
> 					result = caseRedefinableElement(extensionEnd);
> 				if (result == null)
>+					result = caseElement(extensionEnd);
>+				if (result == null)
> 					result = caseEModelElement(extensionEnd);
> 				if (result == null)
> 					result = defaultCase(theEObject);
>@@ -1873,6 +1855,19 @@
> 					result = defaultCase(theEObject);
> 				return result;
> 			}
>+			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER : {
>+				ConnectableElementTemplateParameter connectableElementTemplateParameter = (ConnectableElementTemplateParameter) theEObject;
>+				T result = caseConnectableElementTemplateParameter(connectableElementTemplateParameter);
>+				if (result == null)
>+					result = caseTemplateParameter(connectableElementTemplateParameter);
>+				if (result == null)
>+					result = caseElement(connectableElementTemplateParameter);
>+				if (result == null)
>+					result = caseEModelElement(connectableElementTemplateParameter);
>+				if (result == null)
>+					result = defaultCase(theEObject);
>+				return result;
>+			}
> 			case UMLPackage.COLLABORATION_USE : {
> 				CollaborationUse collaborationUse = (CollaborationUse) theEObject;
> 				T result = caseCollaborationUse(collaborationUse);
>@@ -3718,6 +3713,23 @@
> 					result = defaultCase(theEObject);
> 				return result;
> 			}
>+			case UMLPackage.OBJECT_FLOW : {
>+				ObjectFlow objectFlow = (ObjectFlow) theEObject;
>+				T result = caseObjectFlow(objectFlow);
>+				if (result == null)
>+					result = caseActivityEdge(objectFlow);
>+				if (result == null)
>+					result = caseRedefinableElement(objectFlow);
>+				if (result == null)
>+					result = caseNamedElement(objectFlow);
>+				if (result == null)
>+					result = caseElement(objectFlow);
>+				if (result == null)
>+					result = caseEModelElement(objectFlow);
>+				if (result == null)
>+					result = defaultCase(theEObject);
>+				return result;
>+			}
> 			case UMLPackage.ACTIVITY_FINAL_NODE : {
> 				ActivityFinalNode activityFinalNode = (ActivityFinalNode) theEObject;
> 				T result = caseActivityFinalNode(activityFinalNode);
>@@ -5232,6 +5244,31 @@
> 					result = defaultCase(theEObject);
> 				return result;
> 			}
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION : {
>+				StartObjectBehaviorAction startObjectBehaviorAction = (StartObjectBehaviorAction) theEObject;
>+				T result = caseStartObjectBehaviorAction(startObjectBehaviorAction);
>+				if (result == null)
>+					result = caseCallAction(startObjectBehaviorAction);
>+				if (result == null)
>+					result = caseInvocationAction(startObjectBehaviorAction);
>+				if (result == null)
>+					result = caseAction(startObjectBehaviorAction);
>+				if (result == null)
>+					result = caseExecutableNode(startObjectBehaviorAction);
>+				if (result == null)
>+					result = caseActivityNode(startObjectBehaviorAction);
>+				if (result == null)
>+					result = caseRedefinableElement(startObjectBehaviorAction);
>+				if (result == null)
>+					result = caseNamedElement(startObjectBehaviorAction);
>+				if (result == null)
>+					result = caseElement(startObjectBehaviorAction);
>+				if (result == null)
>+					result = caseEModelElement(startObjectBehaviorAction);
>+				if (result == null)
>+					result = defaultCase(theEObject);
>+				return result;
>+			}
> 			case UMLPackage.JOIN_NODE : {
> 				JoinNode joinNode = (JoinNode) theEObject;
> 				T result = caseJoinNode(joinNode);
>@@ -5274,23 +5311,6 @@
> 					result = defaultCase(theEObject);
> 				return result;
> 			}
>-			case UMLPackage.OBJECT_FLOW : {
>-				ObjectFlow objectFlow = (ObjectFlow) theEObject;
>-				T result = caseObjectFlow(objectFlow);
>-				if (result == null)
>-					result = caseActivityEdge(objectFlow);
>-				if (result == null)
>-					result = caseRedefinableElement(objectFlow);
>-				if (result == null)
>-					result = caseNamedElement(objectFlow);
>-				if (result == null)
>-					result = caseElement(objectFlow);
>-				if (result == null)
>-					result = caseEModelElement(objectFlow);
>-				if (result == null)
>-					result = defaultCase(theEObject);
>-				return result;
>-			}
> 			case UMLPackage.CONDITIONAL_NODE : {
> 				ConditionalNode conditionalNode = (ConditionalNode) theEObject;
> 				T result = caseConditionalNode(conditionalNode);
>@@ -8722,6 +8742,21 @@
> 	}
> 
> 	/**
>+	 * Returns the result of interpreting the object as an instance of 'Start Object Behavior Action'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Start Object Behavior Action'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseStartObjectBehaviorAction(StartObjectBehaviorAction object) {
>+		return null;
>+	}
>+
>+	/**
> 	 * Returns the result of interpreting the object as an instance of 'Control Node'.
> 	 * 
> 	 * This implementation returns null;
>Index: src/org/eclipse/uml2/uml/util/UMLValidator.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java,v
>retrieving revision 1.25
>diff -u -r1.25 UMLValidator.java
>--- src/org/eclipse/uml2/uml/util/UMLValidator.java	25 Mar 2008 13:41:38 -0000	1.25
>+++ src/org/eclipse/uml2/uml/util/UMLValidator.java	24 Sep 2008 18:40:15 -0000
>@@ -241,6 +241,7 @@
> import org.eclipse.uml2.uml.SignalEvent;
> import org.eclipse.uml2.uml.Slot;
> import org.eclipse.uml2.uml.StartClassifierBehaviorAction;
>+import org.eclipse.uml2.uml.StartObjectBehaviorAction;
> import org.eclipse.uml2.uml.State;
> import org.eclipse.uml2.uml.StateInvariant;
> import org.eclipse.uml2.uml.StateMachine;
>@@ -437,7 +438,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROFILE__METACLASS_REFERENCE_NOT_SPECIALIZED = 128;
>+	public static final int PROFILE__METACLASS_REFERENCE_NOT_SPECIALIZED = 127;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate References Same Metamodel' of 'Profile'.
>@@ -445,7 +446,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROFILE__REFERENCES_SAME_METAMODEL = 129;
>+	public static final int PROFILE__REFERENCES_SAME_METAMODEL = 128;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Name Not Clash' of 'Stereotype'.
>@@ -453,7 +454,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STEREOTYPE__NAME_NOT_CLASH = 126;
>+	public static final int STEREOTYPE__NAME_NOT_CLASH = 125;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Generalize' of 'Stereotype'.
>@@ -461,7 +462,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STEREOTYPE__GENERALIZE = 127;
>+	public static final int STEREOTYPE__GENERALIZE = 126;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Passive Class' of 'Class'.
>@@ -469,7 +470,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CLASS__PASSIVE_CLASS = 69;
>+	public static final int CLASS__PASSIVE_CLASS = 68;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Class Behavior' of 'Behaviored Classifier'.
>@@ -477,7 +478,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int BEHAVIORED_CLASSIFIER__CLASS_BEHAVIOR = 70;
>+	public static final int BEHAVIORED_CLASSIFIER__CLASS_BEHAVIOR = 69;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Cycles In Generalization' of 'Classifier'.
>@@ -557,7 +558,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int USE_CASE__MUST_HAVE_NAME = 136;
>+	public static final int USE_CASE__MUST_HAVE_NAME = 135;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Binary Associations' of 'Use Case'.
>@@ -565,7 +566,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int USE_CASE__BINARY_ASSOCIATIONS = 137;
>+	public static final int USE_CASE__BINARY_ASSOCIATIONS = 136;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Association To Use Case' of 'Use Case'.
>@@ -573,7 +574,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int USE_CASE__NO_ASSOCIATION_TO_USE_CASE = 138;
>+	public static final int USE_CASE__NO_ASSOCIATION_TO_USE_CASE = 137;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Cannot Include Self' of 'Use Case'.
>@@ -581,7 +582,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int USE_CASE__CANNOT_INCLUDE_SELF = 139;
>+	public static final int USE_CASE__CANNOT_INCLUDE_SELF = 138;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Extension Points' of 'Extend'.
>@@ -589,7 +590,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int EXTEND__EXTENSION_POINTS = 140;
>+	public static final int EXTEND__EXTENSION_POINTS = 139;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Not Apply To Self' of 'Constraint'.
>@@ -637,7 +638,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int EXTENSION_POINT__MUST_HAVE_NAME = 141;
>+	public static final int EXTENSION_POINT__MUST_HAVE_NAME = 140;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Language Body Size' of 'Opaque Expression'.
>@@ -704,20 +705,12 @@
> 	public static final int PARAMETER__IN_AND_OUT = 41;
> 
> 	/**
>-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Upper Gt0' of 'Multiplicity Element'.
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public static final int MULTIPLICITY_ELEMENT__UPPER_GT0 = 42;
>-
>-	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Lower Ge0' of 'Multiplicity Element'.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int MULTIPLICITY_ELEMENT__LOWER_GE0 = 43;
>+	public static final int MULTIPLICITY_ELEMENT__LOWER_GE0 = 42;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Upper Ge Lower' of 'Multiplicity Element'.
>@@ -725,7 +718,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int MULTIPLICITY_ELEMENT__UPPER_GE_LOWER = 44;
>+	public static final int MULTIPLICITY_ELEMENT__UPPER_GE_LOWER = 43;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Value Specification No Side Effects' of 'Multiplicity Element'.
>@@ -733,7 +726,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int MULTIPLICITY_ELEMENT__VALUE_SPECIFICATION_NO_SIDE_EFFECTS = 45;
>+	public static final int MULTIPLICITY_ELEMENT__VALUE_SPECIFICATION_NO_SIDE_EFFECTS = 44;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Value Specification Constant' of 'Multiplicity Element'.
>@@ -741,7 +734,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int MULTIPLICITY_ELEMENT__VALUE_SPECIFICATION_CONSTANT = 46;
>+	public static final int MULTIPLICITY_ELEMENT__VALUE_SPECIFICATION_CONSTANT = 45;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Connector End'.
>@@ -749,7 +742,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTOR_END__MULTIPLICITY = 47;
>+	public static final int CONNECTOR_END__MULTIPLICITY = 46;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Part With Port Empty' of 'Connector End'.
>@@ -757,7 +750,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTOR_END__PART_WITH_PORT_EMPTY = 48;
>+	public static final int CONNECTOR_END__PART_WITH_PORT_EMPTY = 47;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Role And Part With Port' of 'Connector End'.
>@@ -765,7 +758,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTOR_END__ROLE_AND_PART_WITH_PORT = 49;
>+	public static final int CONNECTOR_END__ROLE_AND_PART_WITH_PORT = 48;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Self Part With Port' of 'Connector End'.
>@@ -773,7 +766,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTOR_END__SELF_PART_WITH_PORT = 50;
>+	public static final int CONNECTOR_END__SELF_PART_WITH_PORT = 49;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Composite' of 'Property'.
>@@ -781,7 +774,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROPERTY__MULTIPLICITY_OF_COMPOSITE = 51;
>+	public static final int PROPERTY__MULTIPLICITY_OF_COMPOSITE = 50;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Subsetting Context Conforms' of 'Property'.
>@@ -789,7 +782,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROPERTY__SUBSETTING_CONTEXT_CONFORMS = 52;
>+	public static final int PROPERTY__SUBSETTING_CONTEXT_CONFORMS = 51;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Redefined Property Inherited' of 'Property'.
>@@ -797,7 +790,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROPERTY__REDEFINED_PROPERTY_INHERITED = 53;
>+	public static final int PROPERTY__REDEFINED_PROPERTY_INHERITED = 52;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Subsetting Rules' of 'Property'.
>@@ -805,7 +798,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROPERTY__SUBSETTING_RULES = 54;
>+	public static final int PROPERTY__SUBSETTING_RULES = 53;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Navigable Readonly' of 'Property'.
>@@ -813,7 +806,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROPERTY__NAVIGABLE_READONLY = 55;
>+	public static final int PROPERTY__NAVIGABLE_READONLY = 54;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Derived Union Is Derived' of 'Property'.
>@@ -821,7 +814,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROPERTY__DERIVED_UNION_IS_DERIVED = 56;
>+	public static final int PROPERTY__DERIVED_UNION_IS_DERIVED = 55;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Derived Union Is Read Only' of 'Property'.
>@@ -829,7 +822,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROPERTY__DERIVED_UNION_IS_READ_ONLY = 57;
>+	public static final int PROPERTY__DERIVED_UNION_IS_READ_ONLY = 56;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Subsetted Property Names' of 'Property'.
>@@ -837,7 +830,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROPERTY__SUBSETTED_PROPERTY_NAMES = 58;
>+	public static final int PROPERTY__SUBSETTED_PROPERTY_NAMES = 57;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Deployment Target' of 'Property'.
>@@ -845,7 +838,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROPERTY__DEPLOYMENT_TARGET = 59;
>+	public static final int PROPERTY__DEPLOYMENT_TARGET = 58;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Binding To Attribute' of 'Property'.
>@@ -853,7 +846,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROPERTY__BINDING_TO_ATTRIBUTE = 60;
>+	public static final int PROPERTY__BINDING_TO_ATTRIBUTE = 59;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Deployed Elements' of 'Deployment Specification'.
>@@ -861,7 +854,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int DEPLOYMENT_SPECIFICATION__DEPLOYED_ELEMENTS = 61;
>+	public static final int DEPLOYMENT_SPECIFICATION__DEPLOYED_ELEMENTS = 60;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Deployment Target' of 'Deployment Specification'.
>@@ -869,7 +862,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int DEPLOYMENT_SPECIFICATION__DEPLOYMENT_TARGET = 62;
>+	public static final int DEPLOYMENT_SPECIFICATION__DEPLOYMENT_TARGET = 61;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate At Most One Return' of 'Operation'.
>@@ -877,7 +870,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OPERATION__AT_MOST_ONE_RETURN = 63;
>+	public static final int OPERATION__AT_MOST_ONE_RETURN = 62;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Only Body For Query' of 'Operation'.
>@@ -885,7 +878,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OPERATION__ONLY_BODY_FOR_QUERY = 64;
>+	public static final int OPERATION__ONLY_BODY_FOR_QUERY = 63;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Parameters Match' of 'Behavior'.
>@@ -893,7 +886,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int BEHAVIOR__PARAMETERS_MATCH = 65;
>+	public static final int BEHAVIOR__PARAMETERS_MATCH = 64;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Feature Of Context Classifier' of 'Behavior'.
>@@ -901,7 +894,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int BEHAVIOR__FEATURE_OF_CONTEXT_CLASSIFIER = 66;
>+	public static final int BEHAVIOR__FEATURE_OF_CONTEXT_CLASSIFIER = 65;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Must Realize' of 'Behavior'.
>@@ -909,7 +902,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int BEHAVIOR__MUST_REALIZE = 67;
>+	public static final int BEHAVIOR__MUST_REALIZE = 66;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Most One Behaviour' of 'Behavior'.
>@@ -917,7 +910,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int BEHAVIOR__MOST_ONE_BEHAVIOUR = 68;
>+	public static final int BEHAVIOR__MOST_ONE_BEHAVIOUR = 67;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Parameterized Entity' of 'Parameter Set'.
>@@ -925,7 +918,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PARAMETER_SET__SAME_PARAMETERIZED_ENTITY = 130;
>+	public static final int PARAMETER_SET__SAME_PARAMETERIZED_ENTITY = 129;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Input' of 'Parameter Set'.
>@@ -933,7 +926,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PARAMETER_SET__INPUT = 131;
>+	public static final int PARAMETER_SET__INPUT = 130;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Two Parameter Sets' of 'Parameter Set'.
>@@ -941,7 +934,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PARAMETER_SET__TWO_PARAMETER_SETS = 132;
>+	public static final int PARAMETER_SET__TWO_PARAMETER_SETS = 131;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Visibility' of 'Interface'.
>@@ -949,7 +942,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERFACE__VISIBILITY = 71;
>+	public static final int INTERFACE__VISIBILITY = 70;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Not Query' of 'Reception'.
>@@ -957,7 +950,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int RECEPTION__NOT_QUERY = 72;
>+	public static final int RECEPTION__NOT_QUERY = 71;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Protocol Transitions' of 'Protocol State Machine'.
>@@ -965,7 +958,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROTOCOL_STATE_MACHINE__PROTOCOL_TRANSITIONS = 73;
>+	public static final int PROTOCOL_STATE_MACHINE__PROTOCOL_TRANSITIONS = 72;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Entry Exit Do' of 'Protocol State Machine'.
>@@ -973,7 +966,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROTOCOL_STATE_MACHINE__ENTRY_EXIT_DO = 74;
>+	public static final int PROTOCOL_STATE_MACHINE__ENTRY_EXIT_DO = 73;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Deep Or Shallow History' of 'Protocol State Machine'.
>@@ -981,7 +974,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROTOCOL_STATE_MACHINE__DEEP_OR_SHALLOW_HISTORY = 75;
>+	public static final int PROTOCOL_STATE_MACHINE__DEEP_OR_SHALLOW_HISTORY = 74;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Ports Connected' of 'Protocol State Machine'.
>@@ -989,7 +982,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROTOCOL_STATE_MACHINE__PORTS_CONNECTED = 76;
>+	public static final int PROTOCOL_STATE_MACHINE__PORTS_CONNECTED = 75;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Classifier Context' of 'Protocol State Machine'.
>@@ -997,7 +990,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROTOCOL_STATE_MACHINE__CLASSIFIER_CONTEXT = 77;
>+	public static final int PROTOCOL_STATE_MACHINE__CLASSIFIER_CONTEXT = 76;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Classifier Context' of 'State Machine'.
>@@ -1005,7 +998,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STATE_MACHINE__CLASSIFIER_CONTEXT = 78;
>+	public static final int STATE_MACHINE__CLASSIFIER_CONTEXT = 77;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Context Classifier' of 'State Machine'.
>@@ -1013,7 +1006,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STATE_MACHINE__CONTEXT_CLASSIFIER = 79;
>+	public static final int STATE_MACHINE__CONTEXT_CLASSIFIER = 78;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Connection Points' of 'State Machine'.
>@@ -1021,7 +1014,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STATE_MACHINE__CONNECTION_POINTS = 80;
>+	public static final int STATE_MACHINE__CONNECTION_POINTS = 79;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Method' of 'State Machine'.
>@@ -1029,7 +1022,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STATE_MACHINE__METHOD = 81;
>+	public static final int STATE_MACHINE__METHOD = 80;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Initial Vertex' of 'Region'.
>@@ -1037,7 +1030,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int REGION__INITIAL_VERTEX = 82;
>+	public static final int REGION__INITIAL_VERTEX = 81;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Deep History Vertex' of 'Region'.
>@@ -1045,7 +1038,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int REGION__DEEP_HISTORY_VERTEX = 83;
>+	public static final int REGION__DEEP_HISTORY_VERTEX = 82;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Shallow History Vertex' of 'Region'.
>@@ -1053,7 +1046,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int REGION__SHALLOW_HISTORY_VERTEX = 84;
>+	public static final int REGION__SHALLOW_HISTORY_VERTEX = 83;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Owned' of 'Region'.
>@@ -1061,7 +1054,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int REGION__OWNED = 85;
>+	public static final int REGION__OWNED = 84;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Fork Segment Guards' of 'Transition'.
>@@ -1069,7 +1062,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int TRANSITION__FORK_SEGMENT_GUARDS = 86;
>+	public static final int TRANSITION__FORK_SEGMENT_GUARDS = 85;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Join Segment Guards' of 'Transition'.
>@@ -1077,7 +1070,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int TRANSITION__JOIN_SEGMENT_GUARDS = 87;
>+	public static final int TRANSITION__JOIN_SEGMENT_GUARDS = 86;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Fork Segment State' of 'Transition'.
>@@ -1085,7 +1078,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int TRANSITION__FORK_SEGMENT_STATE = 88;
>+	public static final int TRANSITION__FORK_SEGMENT_STATE = 87;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Join Segment State' of 'Transition'.
>@@ -1093,7 +1086,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int TRANSITION__JOIN_SEGMENT_STATE = 89;
>+	public static final int TRANSITION__JOIN_SEGMENT_STATE = 88;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Outgoing Pseudostates' of 'Transition'.
>@@ -1101,7 +1094,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int TRANSITION__OUTGOING_PSEUDOSTATES = 90;
>+	public static final int TRANSITION__OUTGOING_PSEUDOSTATES = 89;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Initial Transition' of 'Transition'.
>@@ -1109,7 +1102,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int TRANSITION__INITIAL_TRANSITION = 91;
>+	public static final int TRANSITION__INITIAL_TRANSITION = 90;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Signatures Compatible' of 'Transition'.
>@@ -1117,7 +1110,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int TRANSITION__SIGNATURES_COMPATIBLE = 92;
>+	public static final int TRANSITION__SIGNATURES_COMPATIBLE = 91;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Required Interfaces' of 'Port'.
>@@ -1125,7 +1118,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PORT__REQUIRED_INTERFACES = 93;
>+	public static final int PORT__REQUIRED_INTERFACES = 92;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Port Aggregation' of 'Port'.
>@@ -1133,7 +1126,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PORT__PORT_AGGREGATION = 94;
>+	public static final int PORT__PORT_AGGREGATION = 93;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Port Destroyed' of 'Port'.
>@@ -1141,7 +1134,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PORT__PORT_DESTROYED = 95;
>+	public static final int PORT__PORT_DESTROYED = 94;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Default Value' of 'Port'.
>@@ -1149,7 +1142,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PORT__DEFAULT_VALUE = 96;
>+	public static final int PORT__DEFAULT_VALUE = 95;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Submachine States' of 'State'.
>@@ -1157,7 +1150,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STATE__SUBMACHINE_STATES = 97;
>+	public static final int STATE__SUBMACHINE_STATES = 96;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Destinations Or Sources Of Transitions' of 'State'.
>@@ -1165,7 +1158,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STATE__DESTINATIONS_OR_SOURCES_OF_TRANSITIONS = 98;
>+	public static final int STATE__DESTINATIONS_OR_SOURCES_OF_TRANSITIONS = 97;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Submachine Or Regions' of 'State'.
>@@ -1173,7 +1166,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STATE__SUBMACHINE_OR_REGIONS = 99;
>+	public static final int STATE__SUBMACHINE_OR_REGIONS = 98;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Composite States' of 'State'.
>@@ -1181,7 +1174,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STATE__COMPOSITE_STATES = 100;
>+	public static final int STATE__COMPOSITE_STATES = 99;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Entry Or Exit' of 'State'.
>@@ -1189,7 +1182,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STATE__ENTRY_OR_EXIT = 101;
>+	public static final int STATE__ENTRY_OR_EXIT = 100;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Entry Pseudostates' of 'Connection Point Reference'.
>@@ -1197,7 +1190,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTION_POINT_REFERENCE__ENTRY_PSEUDOSTATES = 102;
>+	public static final int CONNECTION_POINT_REFERENCE__ENTRY_PSEUDOSTATES = 101;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Exit Pseudostates' of 'Connection Point Reference'.
>@@ -1205,7 +1198,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTION_POINT_REFERENCE__EXIT_PSEUDOSTATES = 103;
>+	public static final int CONNECTION_POINT_REFERENCE__EXIT_PSEUDOSTATES = 102;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Initial Vertex' of 'Pseudostate'.
>@@ -1213,7 +1206,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PSEUDOSTATE__INITIAL_VERTEX = 104;
>+	public static final int PSEUDOSTATE__INITIAL_VERTEX = 103;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate History Vertices' of 'Pseudostate'.
>@@ -1221,7 +1214,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PSEUDOSTATE__HISTORY_VERTICES = 105;
>+	public static final int PSEUDOSTATE__HISTORY_VERTICES = 104;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Join Vertex' of 'Pseudostate'.
>@@ -1229,7 +1222,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PSEUDOSTATE__JOIN_VERTEX = 106;
>+	public static final int PSEUDOSTATE__JOIN_VERTEX = 105;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Transitions Incoming' of 'Pseudostate'.
>@@ -1237,7 +1230,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PSEUDOSTATE__TRANSITIONS_INCOMING = 107;
>+	public static final int PSEUDOSTATE__TRANSITIONS_INCOMING = 106;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Fork Vertex' of 'Pseudostate'.
>@@ -1245,7 +1238,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PSEUDOSTATE__FORK_VERTEX = 108;
>+	public static final int PSEUDOSTATE__FORK_VERTEX = 107;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Transitions Outgoing' of 'Pseudostate'.
>@@ -1253,7 +1246,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PSEUDOSTATE__TRANSITIONS_OUTGOING = 109;
>+	public static final int PSEUDOSTATE__TRANSITIONS_OUTGOING = 108;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Junction Vertex' of 'Pseudostate'.
>@@ -1261,7 +1254,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PSEUDOSTATE__JUNCTION_VERTEX = 110;
>+	public static final int PSEUDOSTATE__JUNCTION_VERTEX = 109;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Choice Vertex' of 'Pseudostate'.
>@@ -1269,7 +1262,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PSEUDOSTATE__CHOICE_VERTEX = 111;
>+	public static final int PSEUDOSTATE__CHOICE_VERTEX = 110;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Outgoing From Initial' of 'Pseudostate'.
>@@ -1277,7 +1270,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PSEUDOSTATE__OUTGOING_FROM_INITIAL = 112;
>+	public static final int PSEUDOSTATE__OUTGOING_FROM_INITIAL = 111;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Specialized End Number' of 'Association'.
>@@ -1317,7 +1310,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int COLLABORATION_USE__CLIENT_ELEMENTS = 133;
>+	public static final int COLLABORATION_USE__CLIENT_ELEMENTS = 132;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Every Role' of 'Collaboration Use'.
>@@ -1325,7 +1318,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int COLLABORATION_USE__EVERY_ROLE = 134;
>+	public static final int COLLABORATION_USE__EVERY_ROLE = 133;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Connectors' of 'Collaboration Use'.
>@@ -1333,7 +1326,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int COLLABORATION_USE__CONNECTORS = 135;
>+	public static final int COLLABORATION_USE__CONNECTORS = 134;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicities' of 'Structured Classifier'.
>@@ -1341,7 +1334,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STRUCTURED_CLASSIFIER__MULTIPLICITIES = 113;
>+	public static final int STRUCTURED_CLASSIFIER__MULTIPLICITIES = 112;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Types' of 'Connector'.
>@@ -1349,7 +1342,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTOR__TYPES = 114;
>+	public static final int CONNECTOR__TYPES = 113;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Compatible' of 'Connector'.
>@@ -1357,7 +1350,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTOR__COMPATIBLE = 115;
>+	public static final int CONNECTOR__COMPATIBLE = 114;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Roles' of 'Connector'.
>@@ -1365,7 +1358,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTOR__ROLES = 116;
>+	public static final int CONNECTOR__ROLES = 115;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Between Interfaces Ports' of 'Connector'.
>@@ -1373,7 +1366,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTOR__BETWEEN_INTERFACES_PORTS = 117;
>+	public static final int CONNECTOR__BETWEEN_INTERFACES_PORTS = 116;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Between Interface Port Implements' of 'Connector'.
>@@ -1381,7 +1374,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTOR__BETWEEN_INTERFACE_PORT_IMPLEMENTS = 118;
>+	public static final int CONNECTOR__BETWEEN_INTERFACE_PORT_IMPLEMENTS = 117;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Between Interface Port Signature' of 'Connector'.
>@@ -1389,7 +1382,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTOR__BETWEEN_INTERFACE_PORT_SIGNATURE = 119;
>+	public static final int CONNECTOR__BETWEEN_INTERFACE_PORT_SIGNATURE = 118;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Union Signature Compatible' of 'Connector'.
>@@ -1397,7 +1390,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTOR__UNION_SIGNATURE_COMPATIBLE = 120;
>+	public static final int CONNECTOR__UNION_SIGNATURE_COMPATIBLE = 119;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Assembly Connector' of 'Connector'.
>@@ -1405,7 +1398,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONNECTOR__ASSEMBLY_CONNECTOR = 121;
>+	public static final int CONNECTOR__ASSEMBLY_CONNECTOR = 120;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Inherited Parameters' of 'Redefinable Template Signature'.
>@@ -1413,7 +1406,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int REDEFINABLE_TEMPLATE_SIGNATURE__INHERITED_PARAMETERS = 142;
>+	public static final int REDEFINABLE_TEMPLATE_SIGNATURE__INHERITED_PARAMETERS = 141;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Has Constraining Classifier' of 'Classifier Template Parameter'.
>@@ -1421,7 +1414,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CLASSIFIER_TEMPLATE_PARAMETER__HAS_CONSTRAINING_CLASSIFIER = 143;
>+	public static final int CLASSIFIER_TEMPLATE_PARAMETER__HAS_CONSTRAINING_CLASSIFIER = 142;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Non Owned End' of 'Extension'.
>@@ -1429,7 +1422,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int EXTENSION__NON_OWNED_END = 122;
>+	public static final int EXTENSION__NON_OWNED_END = 121;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Is Binary' of 'Extension'.
>@@ -1437,7 +1430,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int EXTENSION__IS_BINARY = 123;
>+	public static final int EXTENSION__IS_BINARY = 122;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Extension End'.
>@@ -1445,7 +1438,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int EXTENSION_END__MULTIPLICITY = 124;
>+	public static final int EXTENSION_END__MULTIPLICITY = 123;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Aggregation' of 'Extension End'.
>@@ -1453,7 +1446,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int EXTENSION_END__AGGREGATION = 125;
>+	public static final int EXTENSION_END__AGGREGATION = 124;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Operands' of 'String Expression'.
>@@ -1461,7 +1454,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STRING_EXPRESSION__OPERANDS = 144;
>+	public static final int STRING_EXPRESSION__OPERANDS = 143;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Subexpressions' of 'String Expression'.
>@@ -1469,7 +1462,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STRING_EXPRESSION__SUBEXPRESSIONS = 145;
>+	public static final int STRING_EXPRESSION__SUBEXPRESSIONS = 144;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Defining Feature' of 'Instance Specification'.
>@@ -1477,7 +1470,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INSTANCE_SPECIFICATION__DEFINING_FEATURE = 146;
>+	public static final int INSTANCE_SPECIFICATION__DEFINING_FEATURE = 145;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Structural Feature' of 'Instance Specification'.
>@@ -1485,7 +1478,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INSTANCE_SPECIFICATION__STRUCTURAL_FEATURE = 147;
>+	public static final int INSTANCE_SPECIFICATION__STRUCTURAL_FEATURE = 146;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Deployment Target' of 'Instance Specification'.
>@@ -1493,7 +1486,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INSTANCE_SPECIFICATION__DEPLOYMENT_TARGET = 148;
>+	public static final int INSTANCE_SPECIFICATION__DEPLOYMENT_TARGET = 147;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Deployment Artifact' of 'Instance Specification'.
>@@ -1501,7 +1494,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INSTANCE_SPECIFICATION__DEPLOYMENT_ARTIFACT = 149;
>+	public static final int INSTANCE_SPECIFICATION__DEPLOYMENT_ARTIFACT = 148;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate One Output Parameter' of 'Function Behavior'.
>@@ -1509,7 +1502,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int FUNCTION_BEHAVIOR__ONE_OUTPUT_PARAMETER = 150;
>+	public static final int FUNCTION_BEHAVIOR__ONE_OUTPUT_PARAMETER = 149;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Types Of Parameters' of 'Function Behavior'.
>@@ -1517,7 +1510,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int FUNCTION_BEHAVIOR__TYPES_OF_PARAMETERS = 151;
>+	public static final int FUNCTION_BEHAVIOR__TYPES_OF_PARAMETERS = 150;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Associations' of 'Actor'.
>@@ -1525,7 +1518,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTOR__ASSOCIATIONS = 235;
>+	public static final int ACTOR__ASSOCIATIONS = 236;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Must Have Name' of 'Actor'.
>@@ -1533,7 +1526,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTOR__MUST_HAVE_NAME = 236;
>+	public static final int ACTOR__MUST_HAVE_NAME = 237;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Sending Receiving Message Event' of 'Message'.
>@@ -1541,7 +1534,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int MESSAGE__SENDING_RECEIVING_MESSAGE_EVENT = 204;
>+	public static final int MESSAGE__SENDING_RECEIVING_MESSAGE_EVENT = 205;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Signature Refer To' of 'Message'.
>@@ -1549,7 +1542,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int MESSAGE__SIGNATURE_REFER_TO = 205;
>+	public static final int MESSAGE__SIGNATURE_REFER_TO = 206;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Signature Is Operation' of 'Message'.
>@@ -1557,7 +1550,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int MESSAGE__SIGNATURE_IS_OPERATION = 206;
>+	public static final int MESSAGE__SIGNATURE_IS_OPERATION = 207;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Signature Is Signal' of 'Message'.
>@@ -1565,7 +1558,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int MESSAGE__SIGNATURE_IS_SIGNAL = 207;
>+	public static final int MESSAGE__SIGNATURE_IS_SIGNAL = 208;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Arguments' of 'Message'.
>@@ -1573,7 +1566,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int MESSAGE__ARGUMENTS = 208;
>+	public static final int MESSAGE__ARGUMENTS = 209;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Cannot Cross Boundaries' of 'Message'.
>@@ -1581,7 +1574,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int MESSAGE__CANNOT_CROSS_BOUNDARIES = 209;
>+	public static final int MESSAGE__CANNOT_CROSS_BOUNDARIES = 210;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Occurrence Specifications' of 'Message'.
>@@ -1589,7 +1582,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int MESSAGE__OCCURRENCE_SPECIFICATIONS = 210;
>+	public static final int MESSAGE__OCCURRENCE_SPECIFICATIONS = 211;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Interaction Uses Share Lifeline' of 'Lifeline'.
>@@ -1597,7 +1590,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LIFELINE__INTERACTION_USES_SHARE_LIFELINE = 211;
>+	public static final int LIFELINE__INTERACTION_USES_SHARE_LIFELINE = 212;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Selector Specified' of 'Lifeline'.
>@@ -1605,7 +1598,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LIFELINE__SELECTOR_SPECIFIED = 212;
>+	public static final int LIFELINE__SELECTOR_SPECIFIED = 213;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Classifier' of 'Lifeline'.
>@@ -1613,7 +1606,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LIFELINE__SAME_CLASSIFIER = 213;
>+	public static final int LIFELINE__SAME_CLASSIFIER = 214;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Parts Of Internal Structures' of 'Part Decomposition'.
>@@ -1621,7 +1614,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PART_DECOMPOSITION__PARTS_OF_INTERNAL_STRUCTURES = 214;
>+	public static final int PART_DECOMPOSITION__PARTS_OF_INTERNAL_STRUCTURES = 215;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Assume' of 'Part Decomposition'.
>@@ -1629,7 +1622,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PART_DECOMPOSITION__ASSUME = 215;
>+	public static final int PART_DECOMPOSITION__ASSUME = 216;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Commutativity Of Decomposition' of 'Part Decomposition'.
>@@ -1637,7 +1630,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PART_DECOMPOSITION__COMMUTATIVITY_OF_DECOMPOSITION = 216;
>+	public static final int PART_DECOMPOSITION__COMMUTATIVITY_OF_DECOMPOSITION = 217;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Gates Match' of 'Interaction Use'.
>@@ -1645,7 +1638,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERACTION_USE__GATES_MATCH = 217;
>+	public static final int INTERACTION_USE__GATES_MATCH = 218;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate All Lifelines' of 'Interaction Use'.
>@@ -1653,7 +1646,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERACTION_USE__ALL_LIFELINES = 218;
>+	public static final int INTERACTION_USE__ALL_LIFELINES = 219;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Arguments Correspond To Parameters' of 'Interaction Use'.
>@@ -1661,7 +1654,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERACTION_USE__ARGUMENTS_CORRESPOND_TO_PARAMETERS = 219;
>+	public static final int INTERACTION_USE__ARGUMENTS_CORRESPOND_TO_PARAMETERS = 220;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Arguments Are Constants' of 'Interaction Use'.
>@@ -1669,7 +1662,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERACTION_USE__ARGUMENTS_ARE_CONSTANTS = 220;
>+	public static final int INTERACTION_USE__ARGUMENTS_ARE_CONSTANTS = 221;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Messages Actual Gate' of 'Gate'.
>@@ -1677,7 +1670,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int GATE__MESSAGES_ACTUAL_GATE = 221;
>+	public static final int GATE__MESSAGES_ACTUAL_GATE = 222;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Messages Combined Fragment' of 'Gate'.
>@@ -1685,7 +1678,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int GATE__MESSAGES_COMBINED_FRAGMENT = 222;
>+	public static final int GATE__MESSAGES_COMBINED_FRAGMENT = 223;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Owned' of 'Activity Node'.
>@@ -1693,7 +1686,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_NODE__OWNED = 153;
>+	public static final int ACTIVITY_NODE__OWNED = 152;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Owned Structured Node' of 'Activity Node'.
>@@ -1701,7 +1694,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_NODE__OWNED_STRUCTURED_NODE = 152;
>+	public static final int ACTIVITY_NODE__OWNED_STRUCTURED_NODE = 151;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Source And Target' of 'Activity Edge'.
>@@ -1709,7 +1702,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_EDGE__SOURCE_AND_TARGET = 162;
>+	public static final int ACTIVITY_EDGE__SOURCE_AND_TARGET = 161;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Owned' of 'Activity Edge'.
>@@ -1717,7 +1710,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_EDGE__OWNED = 163;
>+	public static final int ACTIVITY_EDGE__OWNED = 162;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Structured Node' of 'Activity Edge'.
>@@ -1725,7 +1718,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_EDGE__STRUCTURED_NODE = 164;
>+	public static final int ACTIVITY_EDGE__STRUCTURED_NODE = 163;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Supergroups' of 'Activity'.
>@@ -1733,7 +1726,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY__NO_SUPERGROUPS = 158;
>+	public static final int ACTIVITY__NO_SUPERGROUPS = 157;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Activity Parameter Node' of 'Activity'.
>@@ -1741,7 +1734,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY__ACTIVITY_PARAMETER_NODE = 159;
>+	public static final int ACTIVITY__ACTIVITY_PARAMETER_NODE = 158;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Autonomous' of 'Activity'.
>@@ -1749,7 +1742,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY__AUTONOMOUS = 160;
>+	public static final int ACTIVITY__AUTONOMOUS = 159;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Dimension Not Contained' of 'Activity Partition'.
>@@ -1757,7 +1750,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_PARTITION__DIMENSION_NOT_CONTAINED = 165;
>+	public static final int ACTIVITY_PARTITION__DIMENSION_NOT_CONTAINED = 164;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Represents Part' of 'Activity Partition'.
>@@ -1765,7 +1758,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_PARTITION__REPRESENTS_PART = 166;
>+	public static final int ACTIVITY_PARTITION__REPRESENTS_PART = 165;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Represents Classifier' of 'Activity Partition'.
>@@ -1773,7 +1766,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_PARTITION__REPRESENTS_CLASSIFIER = 167;
>+	public static final int ACTIVITY_PARTITION__REPRESENTS_CLASSIFIER = 166;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Represents Part And Is Contained' of 'Activity Partition'.
>@@ -1781,7 +1774,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_PARTITION__REPRESENTS_PART_AND_IS_CONTAINED = 168;
>+	public static final int ACTIVITY_PARTITION__REPRESENTS_PART_AND_IS_CONTAINED = 167;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Nodes And Edges' of 'Activity Group'.
>@@ -1789,7 +1782,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_GROUP__NODES_AND_EDGES = 155;
>+	public static final int ACTIVITY_GROUP__NODES_AND_EDGES = 154;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Not Contained' of 'Activity Group'.
>@@ -1797,7 +1790,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_GROUP__NOT_CONTAINED = 156;
>+	public static final int ACTIVITY_GROUP__NOT_CONTAINED = 155;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Group Owned' of 'Activity Group'.
>@@ -1805,7 +1798,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_GROUP__GROUP_OWNED = 157;
>+	public static final int ACTIVITY_GROUP__GROUP_OWNED = 156;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Edges' of 'Structured Activity Node'.
>@@ -1813,7 +1806,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STRUCTURED_ACTIVITY_NODE__EDGES = 154;
>+	public static final int STRUCTURED_ACTIVITY_NODE__EDGES = 153;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Owned' of 'Variable'.
>@@ -1821,7 +1814,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int VARIABLE__OWNED = 161;
>+	public static final int VARIABLE__OWNED = 160;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Interrupting Edges' of 'Interruptible Activity Region'.
>@@ -1829,7 +1822,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGES = 169;
>+	public static final int INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGES = 168;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Exception Body' of 'Exception Handler'.
>@@ -1837,7 +1830,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int EXCEPTION_HANDLER__EXCEPTION_BODY = 170;
>+	public static final int EXCEPTION_HANDLER__EXCEPTION_BODY = 169;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Result Pins' of 'Exception Handler'.
>@@ -1845,7 +1838,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int EXCEPTION_HANDLER__RESULT_PINS = 171;
>+	public static final int EXCEPTION_HANDLER__RESULT_PINS = 170;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate One Input' of 'Exception Handler'.
>@@ -1853,7 +1846,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int EXCEPTION_HANDLER__ONE_INPUT = 172;
>+	public static final int EXCEPTION_HANDLER__ONE_INPUT = 171;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Edge Source Target' of 'Exception Handler'.
>@@ -1861,7 +1854,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int EXCEPTION_HANDLER__EDGE_SOURCE_TARGET = 173;
>+	public static final int EXCEPTION_HANDLER__EDGE_SOURCE_TARGET = 172;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Object Flow Edges' of 'Object Node'.
>@@ -1869,7 +1862,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OBJECT_NODE__OBJECT_FLOW_EDGES = 174;
>+	public static final int OBJECT_NODE__OBJECT_FLOW_EDGES = 173;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Not Unique' of 'Object Node'.
>@@ -1877,7 +1870,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OBJECT_NODE__NOT_UNIQUE = 175;
>+	public static final int OBJECT_NODE__NOT_UNIQUE = 174;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Selection Behavior' of 'Object Node'.
>@@ -1885,7 +1878,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OBJECT_NODE__SELECTION_BEHAVIOR = 176;
>+	public static final int OBJECT_NODE__SELECTION_BEHAVIOR = 175;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Input Output Parameter' of 'Object Node'.
>@@ -1893,7 +1886,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OBJECT_NODE__INPUT_OUTPUT_PARAMETER = 177;
>+	public static final int OBJECT_NODE__INPUT_OUTPUT_PARAMETER = 176;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Incoming Edges Structured Only' of 'Output Pin'.
>@@ -1901,7 +1894,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OUTPUT_PIN__INCOMING_EDGES_STRUCTURED_ONLY = 178;
>+	public static final int OUTPUT_PIN__INCOMING_EDGES_STRUCTURED_ONLY = 177;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Control Pins' of 'Pin'.
>@@ -1909,7 +1902,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PIN__CONTROL_PINS = 179;
>+	public static final int PIN__CONTROL_PINS = 178;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Outgoing Edges Structured Only' of 'Input Pin'.
>@@ -1917,7 +1910,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INPUT_PIN__OUTGOING_EDGES_STRUCTURED_ONLY = 180;
>+	public static final int INPUT_PIN__OUTGOING_EDGES_STRUCTURED_ONLY = 179;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Guard Directly Prior' of 'Interaction Operand'.
>@@ -1925,7 +1918,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERACTION_OPERAND__GUARD_DIRECTLY_PRIOR = 223;
>+	public static final int INTERACTION_OPERAND__GUARD_DIRECTLY_PRIOR = 224;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Guard Contain References' of 'Interaction Operand'.
>@@ -1933,7 +1926,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERACTION_OPERAND__GUARD_CONTAIN_REFERENCES = 224;
>+	public static final int INTERACTION_OPERAND__GUARD_CONTAIN_REFERENCES = 225;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Dynamic Variables' of 'Interaction Constraint'.
>@@ -1941,7 +1934,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERACTION_CONSTRAINT__DYNAMIC_VARIABLES = 225;
>+	public static final int INTERACTION_CONSTRAINT__DYNAMIC_VARIABLES = 226;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Global Data' of 'Interaction Constraint'.
>@@ -1949,7 +1942,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERACTION_CONSTRAINT__GLOBAL_DATA = 226;
>+	public static final int INTERACTION_CONSTRAINT__GLOBAL_DATA = 227;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Minint Maxint' of 'Interaction Constraint'.
>@@ -1957,7 +1950,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERACTION_CONSTRAINT__MININT_MAXINT = 227;
>+	public static final int INTERACTION_CONSTRAINT__MININT_MAXINT = 228;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Minint Non Negative' of 'Interaction Constraint'.
>@@ -1965,7 +1958,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERACTION_CONSTRAINT__MININT_NON_NEGATIVE = 228;
>+	public static final int INTERACTION_CONSTRAINT__MININT_NON_NEGATIVE = 229;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Maxint Positive' of 'Interaction Constraint'.
>@@ -1973,7 +1966,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERACTION_CONSTRAINT__MAXINT_POSITIVE = 229;
>+	public static final int INTERACTION_CONSTRAINT__MAXINT_POSITIVE = 230;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Maxint Greater Equal Minint' of 'Interaction Constraint'.
>@@ -1981,7 +1974,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INTERACTION_CONSTRAINT__MAXINT_GREATER_EQUAL_MININT = 230;
>+	public static final int INTERACTION_CONSTRAINT__MAXINT_GREATER_EQUAL_MININT = 231;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Lifeline' of 'Execution Specification'.
>@@ -1989,7 +1982,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int EXECUTION_SPECIFICATION__SAME_LIFELINE = 231;
>+	public static final int EXECUTION_SPECIFICATION__SAME_LIFELINE = 232;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Action Referenced' of 'Action Execution Specification'.
>@@ -1997,7 +1990,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTION_EXECUTION_SPECIFICATION__ACTION_REFERENCED = 232;
>+	public static final int ACTION_EXECUTION_SPECIFICATION__ACTION_REFERENCED = 233;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Occurrence Above' of 'Creation Event'.
>@@ -2005,7 +1998,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CREATION_EVENT__NO_OCCURRENCE_ABOVE = 233;
>+	public static final int CREATION_EVENT__NO_OCCURRENCE_ABOVE = 234;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Occurrence Specifications Below' of 'Destruction Event'.
>@@ -2013,7 +2006,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int DESTRUCTION_EVENT__NO_OCCURRENCE_SPECIFICATIONS_BELOW = 234;
>+	public static final int DESTRUCTION_EVENT__NO_OCCURRENCE_SPECIFICATIONS_BELOW = 235;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Opt Loop Break Neg' of 'Combined Fragment'.
>@@ -2021,7 +2014,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int COMBINED_FRAGMENT__OPT_LOOP_BREAK_NEG = 247;
>+	public static final int COMBINED_FRAGMENT__OPT_LOOP_BREAK_NEG = 261;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Minint And Maxint' of 'Combined Fragment'.
>@@ -2029,7 +2022,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int COMBINED_FRAGMENT__MININT_AND_MAXINT = 248;
>+	public static final int COMBINED_FRAGMENT__MININT_AND_MAXINT = 262;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Break' of 'Combined Fragment'.
>@@ -2037,7 +2030,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int COMBINED_FRAGMENT__BREAK = 249;
>+	public static final int COMBINED_FRAGMENT__BREAK = 263;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Consider And Ignore' of 'Combined Fragment'.
>@@ -2045,7 +2038,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int COMBINED_FRAGMENT__CONSIDER_AND_IGNORE = 250;
>+	public static final int COMBINED_FRAGMENT__CONSIDER_AND_IGNORE = 264;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Name' of 'Continuation'.
>@@ -2053,7 +2046,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONTINUATION__SAME_NAME = 251;
>+	public static final int CONTINUATION__SAME_NAME = 265;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Global' of 'Continuation'.
>@@ -2061,7 +2054,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONTINUATION__GLOBAL = 252;
>+	public static final int CONTINUATION__GLOBAL = 266;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate First Or Last Interaction Fragment' of 'Continuation'.
>@@ -2069,7 +2062,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONTINUATION__FIRST_OR_LAST_INTERACTION_FRAGMENT = 253;
>+	public static final int CONTINUATION__FIRST_OR_LAST_INTERACTION_FRAGMENT = 267;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Consider Or Ignore' of 'Consider Ignore Fragment'.
>@@ -2077,7 +2070,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONSIDER_IGNORE_FRAGMENT__CONSIDER_OR_IGNORE = 254;
>+	public static final int CONSIDER_IGNORE_FRAGMENT__CONSIDER_OR_IGNORE = 268;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type' of 'Consider Ignore Fragment'.
>@@ -2085,7 +2078,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONSIDER_IGNORE_FRAGMENT__TYPE = 255;
>+	public static final int CONSIDER_IGNORE_FRAGMENT__TYPE = 269;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Classifier Not Abstract' of 'Create Object Action'.
>@@ -2093,7 +2086,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CREATE_OBJECT_ACTION__CLASSIFIER_NOT_ABSTRACT = 256;
>+	public static final int CREATE_OBJECT_ACTION__CLASSIFIER_NOT_ABSTRACT = 270;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Classifier Not Association Class' of 'Create Object Action'.
>@@ -2101,7 +2094,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CREATE_OBJECT_ACTION__CLASSIFIER_NOT_ASSOCIATION_CLASS = 257;
>+	public static final int CREATE_OBJECT_ACTION__CLASSIFIER_NOT_ASSOCIATION_CLASS = 271;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Type' of 'Create Object Action'.
>@@ -2109,7 +2102,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CREATE_OBJECT_ACTION__SAME_TYPE = 258;
>+	public static final int CREATE_OBJECT_ACTION__SAME_TYPE = 272;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Create Object Action'.
>@@ -2117,7 +2110,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CREATE_OBJECT_ACTION__MULTIPLICITY = 259;
>+	public static final int CREATE_OBJECT_ACTION__MULTIPLICITY = 273;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Destroy Object Action'.
>@@ -2125,7 +2118,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int DESTROY_OBJECT_ACTION__MULTIPLICITY = 260;
>+	public static final int DESTROY_OBJECT_ACTION__MULTIPLICITY = 274;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Type' of 'Destroy Object Action'.
>@@ -2133,7 +2126,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int DESTROY_OBJECT_ACTION__NO_TYPE = 261;
>+	public static final int DESTROY_OBJECT_ACTION__NO_TYPE = 275;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Type' of 'Test Identity Action'.
>@@ -2141,7 +2134,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int TEST_IDENTITY_ACTION__NO_TYPE = 262;
>+	public static final int TEST_IDENTITY_ACTION__NO_TYPE = 276;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Test Identity Action'.
>@@ -2149,7 +2142,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int TEST_IDENTITY_ACTION__MULTIPLICITY = 263;
>+	public static final int TEST_IDENTITY_ACTION__MULTIPLICITY = 277;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Result Is Boolean' of 'Test Identity Action'.
>@@ -2157,7 +2150,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int TEST_IDENTITY_ACTION__RESULT_IS_BOOLEAN = 264;
>+	public static final int TEST_IDENTITY_ACTION__RESULT_IS_BOOLEAN = 278;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Contained' of 'Read Self Action'.
>@@ -2165,7 +2158,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_SELF_ACTION__CONTAINED = 265;
>+	public static final int READ_SELF_ACTION__CONTAINED = 279;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Not Static' of 'Read Self Action'.
>@@ -2173,7 +2166,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_SELF_ACTION__NOT_STATIC = 266;
>+	public static final int READ_SELF_ACTION__NOT_STATIC = 280;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type' of 'Read Self Action'.
>@@ -2181,7 +2174,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_SELF_ACTION__TYPE = 267;
>+	public static final int READ_SELF_ACTION__TYPE = 281;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Read Self Action'.
>@@ -2189,7 +2182,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_SELF_ACTION__MULTIPLICITY = 268;
>+	public static final int READ_SELF_ACTION__MULTIPLICITY = 282;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Not Static' of 'Structural Feature Action'.
>@@ -2197,7 +2190,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STRUCTURAL_FEATURE_ACTION__NOT_STATIC = 269;
>+	public static final int STRUCTURAL_FEATURE_ACTION__NOT_STATIC = 283;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Type' of 'Structural Feature Action'.
>@@ -2205,7 +2198,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STRUCTURAL_FEATURE_ACTION__SAME_TYPE = 270;
>+	public static final int STRUCTURAL_FEATURE_ACTION__SAME_TYPE = 284;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Structural Feature Action'.
>@@ -2213,7 +2206,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STRUCTURAL_FEATURE_ACTION__MULTIPLICITY = 271;
>+	public static final int STRUCTURAL_FEATURE_ACTION__MULTIPLICITY = 285;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Visibility' of 'Structural Feature Action'.
>@@ -2221,7 +2214,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STRUCTURAL_FEATURE_ACTION__VISIBILITY = 272;
>+	public static final int STRUCTURAL_FEATURE_ACTION__VISIBILITY = 286;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate One Featuring Classifier' of 'Structural Feature Action'.
>@@ -2229,7 +2222,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int STRUCTURAL_FEATURE_ACTION__ONE_FEATURING_CLASSIFIER = 273;
>+	public static final int STRUCTURAL_FEATURE_ACTION__ONE_FEATURING_CLASSIFIER = 287;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type And Ordering' of 'Read Structural Feature Action'.
>@@ -2237,7 +2230,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_STRUCTURAL_FEATURE_ACTION__TYPE_AND_ORDERING = 274;
>+	public static final int READ_STRUCTURAL_FEATURE_ACTION__TYPE_AND_ORDERING = 288;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Read Structural Feature Action'.
>@@ -2245,7 +2238,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_STRUCTURAL_FEATURE_ACTION__MULTIPLICITY = 275;
>+	public static final int READ_STRUCTURAL_FEATURE_ACTION__MULTIPLICITY = 289;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Input Pin' of 'Write Structural Feature Action'.
>@@ -2253,7 +2246,23 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int WRITE_STRUCTURAL_FEATURE_ACTION__INPUT_PIN = 276;
>+	public static final int WRITE_STRUCTURAL_FEATURE_ACTION__INPUT_PIN = 290;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Of Result' of 'Write Structural Feature Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int WRITE_STRUCTURAL_FEATURE_ACTION__TYPE_OF_RESULT = 291;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Result' of 'Write Structural Feature Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int WRITE_STRUCTURAL_FEATURE_ACTION__MULTIPLICITY_OF_RESULT = 292;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Write Structural Feature Action'.
>@@ -2261,7 +2270,23 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int WRITE_STRUCTURAL_FEATURE_ACTION__MULTIPLICITY = 277;
>+	public static final int WRITE_STRUCTURAL_FEATURE_ACTION__MULTIPLICITY = 293;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Of Result' of 'Clear Structural Feature Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int CLEAR_STRUCTURAL_FEATURE_ACTION__TYPE_OF_RESULT = 294;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Result' of 'Clear Structural Feature Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int CLEAR_STRUCTURAL_FEATURE_ACTION__MULTIPLICITY_OF_RESULT = 295;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Non Unique Removal' of 'Remove Structural Feature Value Action'.
>@@ -2269,7 +2294,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__NON_UNIQUE_REMOVAL = 278;
>+	public static final int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__NON_UNIQUE_REMOVAL = 296;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Unlimited Natural And Multiplicity' of 'Add Structural Feature Value Action'.
>@@ -2277,7 +2302,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ADD_STRUCTURAL_FEATURE_VALUE_ACTION__UNLIMITED_NATURAL_AND_MULTIPLICITY = 279;
>+	public static final int ADD_STRUCTURAL_FEATURE_VALUE_ACTION__UNLIMITED_NATURAL_AND_MULTIPLICITY = 297;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Association' of 'Link Action'.
>@@ -2285,7 +2310,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LINK_ACTION__SAME_ASSOCIATION = 280;
>+	public static final int LINK_ACTION__SAME_ASSOCIATION = 298;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Not Static' of 'Link Action'.
>@@ -2293,7 +2318,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LINK_ACTION__NOT_STATIC = 281;
>+	public static final int LINK_ACTION__NOT_STATIC = 299;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Pins' of 'Link Action'.
>@@ -2301,7 +2326,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LINK_ACTION__SAME_PINS = 282;
>+	public static final int LINK_ACTION__SAME_PINS = 300;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Property Is Association End' of 'Link End Data'.
>@@ -2309,7 +2334,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LINK_END_DATA__PROPERTY_IS_ASSOCIATION_END = 283;
>+	public static final int LINK_END_DATA__PROPERTY_IS_ASSOCIATION_END = 301;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Type' of 'Link End Data'.
>@@ -2317,7 +2342,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LINK_END_DATA__SAME_TYPE = 284;
>+	public static final int LINK_END_DATA__SAME_TYPE = 302;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Link End Data'.
>@@ -2325,7 +2350,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LINK_END_DATA__MULTIPLICITY = 285;
>+	public static final int LINK_END_DATA__MULTIPLICITY = 303;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Qualifiers' of 'Link End Data'.
>@@ -2333,7 +2358,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LINK_END_DATA__QUALIFIERS = 286;
>+	public static final int LINK_END_DATA__QUALIFIERS = 304;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate End Object Input Pin' of 'Link End Data'.
>@@ -2341,7 +2366,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LINK_END_DATA__END_OBJECT_INPUT_PIN = 287;
>+	public static final int LINK_END_DATA__END_OBJECT_INPUT_PIN = 305;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Qualifier Attribute' of 'Qualifier Value'.
>@@ -2349,7 +2374,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int QUALIFIER_VALUE__QUALIFIER_ATTRIBUTE = 288;
>+	public static final int QUALIFIER_VALUE__QUALIFIER_ATTRIBUTE = 306;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Of Qualifier' of 'Qualifier Value'.
>@@ -2357,7 +2382,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int QUALIFIER_VALUE__TYPE_OF_QUALIFIER = 289;
>+	public static final int QUALIFIER_VALUE__TYPE_OF_QUALIFIER = 307;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Qualifier' of 'Qualifier Value'.
>@@ -2365,7 +2390,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int QUALIFIER_VALUE__MULTIPLICITY_OF_QUALIFIER = 290;
>+	public static final int QUALIFIER_VALUE__MULTIPLICITY_OF_QUALIFIER = 308;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate One Open End' of 'Read Link Action'.
>@@ -2373,7 +2398,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_ACTION__ONE_OPEN_END = 291;
>+	public static final int READ_LINK_ACTION__ONE_OPEN_END = 309;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type And Ordering' of 'Read Link Action'.
>@@ -2381,7 +2406,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_ACTION__TYPE_AND_ORDERING = 292;
>+	public static final int READ_LINK_ACTION__TYPE_AND_ORDERING = 310;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Compatible Multiplicity' of 'Read Link Action'.
>@@ -2389,7 +2414,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_ACTION__COMPATIBLE_MULTIPLICITY = 293;
>+	public static final int READ_LINK_ACTION__COMPATIBLE_MULTIPLICITY = 311;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Navigable Open End' of 'Read Link Action'.
>@@ -2397,7 +2422,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_ACTION__NAVIGABLE_OPEN_END = 294;
>+	public static final int READ_LINK_ACTION__NAVIGABLE_OPEN_END = 312;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Visibility' of 'Read Link Action'.
>@@ -2405,7 +2430,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_ACTION__VISIBILITY = 295;
>+	public static final int READ_LINK_ACTION__VISIBILITY = 313;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Create Link Action' of 'Link End Creation Data'.
>@@ -2413,7 +2438,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LINK_END_CREATION_DATA__CREATE_LINK_ACTION = 296;
>+	public static final int LINK_END_CREATION_DATA__CREATE_LINK_ACTION = 314;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Single Input Pin' of 'Link End Creation Data'.
>@@ -2421,7 +2446,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LINK_END_CREATION_DATA__SINGLE_INPUT_PIN = 297;
>+	public static final int LINK_END_CREATION_DATA__SINGLE_INPUT_PIN = 315;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Association Not Abstract' of 'Create Link Action'.
>@@ -2429,7 +2454,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CREATE_LINK_ACTION__ASSOCIATION_NOT_ABSTRACT = 298;
>+	public static final int CREATE_LINK_ACTION__ASSOCIATION_NOT_ABSTRACT = 316;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Allow Access' of 'Write Link Action'.
>@@ -2437,7 +2462,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int WRITE_LINK_ACTION__ALLOW_ACCESS = 299;
>+	public static final int WRITE_LINK_ACTION__ALLOW_ACCESS = 317;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Destroy Link Action' of 'Link End Destruction Data'.
>@@ -2445,7 +2470,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LINK_END_DESTRUCTION_DATA__DESTROY_LINK_ACTION = 300;
>+	public static final int LINK_END_DESTRUCTION_DATA__DESTROY_LINK_ACTION = 318;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Unlimited Natural And Multiplicity' of 'Link End Destruction Data'.
>@@ -2453,7 +2478,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LINK_END_DESTRUCTION_DATA__UNLIMITED_NATURAL_AND_MULTIPLICITY = 301;
>+	public static final int LINK_END_DESTRUCTION_DATA__UNLIMITED_NATURAL_AND_MULTIPLICITY = 319;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Type' of 'Clear Association Action'.
>@@ -2461,7 +2486,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CLEAR_ASSOCIATION_ACTION__SAME_TYPE = 302;
>+	public static final int CLEAR_ASSOCIATION_ACTION__SAME_TYPE = 320;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Clear Association Action'.
>@@ -2469,7 +2494,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CLEAR_ASSOCIATION_ACTION__MULTIPLICITY = 303;
>+	public static final int CLEAR_ASSOCIATION_ACTION__MULTIPLICITY = 321;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Number And Order' of 'Broadcast Signal Action'.
>@@ -2477,7 +2502,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int BROADCAST_SIGNAL_ACTION__NUMBER_AND_ORDER = 304;
>+	public static final int BROADCAST_SIGNAL_ACTION__NUMBER_AND_ORDER = 322;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Ordering Multiplicity' of 'Broadcast Signal Action'.
>@@ -2485,7 +2510,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int BROADCAST_SIGNAL_ACTION__TYPE_ORDERING_MULTIPLICITY = 305;
>+	public static final int BROADCAST_SIGNAL_ACTION__TYPE_ORDERING_MULTIPLICITY = 323;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate On Port Receiver' of 'Invocation Action'.
>@@ -2493,7 +2518,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INVOCATION_ACTION__ON_PORT_RECEIVER = 184;
>+	public static final int INVOCATION_ACTION__ON_PORT_RECEIVER = 183;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Compatible Type' of 'Value Specification Action'.
>@@ -2501,7 +2526,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int VALUE_SPECIFICATION_ACTION__COMPATIBLE_TYPE = 306;
>+	public static final int VALUE_SPECIFICATION_ACTION__COMPATIBLE_TYPE = 324;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Value Specification Action'.
>@@ -2509,7 +2534,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int VALUE_SPECIFICATION_ACTION__MULTIPLICITY = 307;
>+	public static final int VALUE_SPECIFICATION_ACTION__MULTIPLICITY = 325;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate First Event Multiplicity' of 'Duration Constraint'.
>@@ -2517,7 +2542,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int DURATION_CONSTRAINT__FIRST_EVENT_MULTIPLICITY = 308;
>+	public static final int DURATION_CONSTRAINT__FIRST_EVENT_MULTIPLICITY = 326;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate First Event Multiplicity' of 'Duration Observation'.
>@@ -2525,7 +2550,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int DURATION_OBSERVATION__FIRST_EVENT_MULTIPLICITY = 309;
>+	public static final int DURATION_OBSERVATION__FIRST_EVENT_MULTIPLICITY = 327;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Compatible Type' of 'Value Pin'.
>@@ -2533,7 +2558,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int VALUE_PIN__COMPATIBLE_TYPE = 202;
>+	public static final int VALUE_PIN__COMPATIBLE_TYPE = 203;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Incoming Edges' of 'Value Pin'.
>@@ -2541,7 +2566,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int VALUE_PIN__NO_INCOMING_EDGES = 203;
>+	public static final int VALUE_PIN__NO_INCOMING_EDGES = 204;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Synchronous Call' of 'Call Action'.
>@@ -2549,7 +2574,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CALL_ACTION__SYNCHRONOUS_CALL = 181;
>+	public static final int CALL_ACTION__SYNCHRONOUS_CALL = 180;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Number And Order' of 'Call Action'.
>@@ -2557,7 +2582,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CALL_ACTION__NUMBER_AND_ORDER = 182;
>+	public static final int CALL_ACTION__NUMBER_AND_ORDER = 181;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Ordering Multiplicity' of 'Call Action'.
>@@ -2565,7 +2590,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CALL_ACTION__TYPE_ORDERING_MULTIPLICITY = 183;
>+	public static final int CALL_ACTION__TYPE_ORDERING_MULTIPLICITY = 182;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Number Order' of 'Send Signal Action'.
>@@ -2573,7 +2598,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int SEND_SIGNAL_ACTION__NUMBER_ORDER = 185;
>+	public static final int SEND_SIGNAL_ACTION__NUMBER_ORDER = 184;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Ordering Multiplicity' of 'Send Signal Action'.
>@@ -2581,7 +2606,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int SEND_SIGNAL_ACTION__TYPE_ORDERING_MULTIPLICITY = 186;
>+	public static final int SEND_SIGNAL_ACTION__TYPE_ORDERING_MULTIPLICITY = 185;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Argument Pin Equal Parameter' of 'Call Operation Action'.
>@@ -2589,7 +2614,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CALL_OPERATION_ACTION__ARGUMENT_PIN_EQUAL_PARAMETER = 187;
>+	public static final int CALL_OPERATION_ACTION__ARGUMENT_PIN_EQUAL_PARAMETER = 186;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Result Pin Equal Parameter' of 'Call Operation Action'.
>@@ -2597,7 +2622,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CALL_OPERATION_ACTION__RESULT_PIN_EQUAL_PARAMETER = 188;
>+	public static final int CALL_OPERATION_ACTION__RESULT_PIN_EQUAL_PARAMETER = 187;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Target Pin' of 'Call Operation Action'.
>@@ -2605,7 +2630,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CALL_OPERATION_ACTION__TYPE_TARGET_PIN = 189;
>+	public static final int CALL_OPERATION_ACTION__TYPE_TARGET_PIN = 188;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Ordering Multiplicity' of 'Call Operation Action'.
>@@ -2613,7 +2638,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CALL_OPERATION_ACTION__TYPE_ORDERING_MULTIPLICITY = 190;
>+	public static final int CALL_OPERATION_ACTION__TYPE_ORDERING_MULTIPLICITY = 189;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Argument Pin Equal Parameter' of 'Call Behavior Action'.
>@@ -2621,7 +2646,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CALL_BEHAVIOR_ACTION__ARGUMENT_PIN_EQUAL_PARAMETER = 191;
>+	public static final int CALL_BEHAVIOR_ACTION__ARGUMENT_PIN_EQUAL_PARAMETER = 190;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Result Pin Equal Parameter' of 'Call Behavior Action'.
>@@ -2629,7 +2654,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CALL_BEHAVIOR_ACTION__RESULT_PIN_EQUAL_PARAMETER = 192;
>+	public static final int CALL_BEHAVIOR_ACTION__RESULT_PIN_EQUAL_PARAMETER = 191;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Ordering Multiplicity' of 'Call Behavior Action'.
>@@ -2637,7 +2662,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CALL_BEHAVIOR_ACTION__TYPE_ORDERING_MULTIPLICITY = 193;
>+	public static final int CALL_BEHAVIOR_ACTION__TYPE_ORDERING_MULTIPLICITY = 192;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Sources And Targets' of 'Information Item'.
>@@ -2645,7 +2670,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INFORMATION_ITEM__SOURCES_AND_TARGETS = 328;
>+	public static final int INFORMATION_ITEM__SOURCES_AND_TARGETS = 346;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Has No' of 'Information Item'.
>@@ -2653,7 +2678,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INFORMATION_ITEM__HAS_NO = 329;
>+	public static final int INFORMATION_ITEM__HAS_NO = 347;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Not Instantiable' of 'Information Item'.
>@@ -2661,7 +2686,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INFORMATION_ITEM__NOT_INSTANTIABLE = 330;
>+	public static final int INFORMATION_ITEM__NOT_INSTANTIABLE = 348;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Sources And Targets Kind' of 'Information Flow'.
>@@ -2669,7 +2694,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INFORMATION_FLOW__SOURCES_AND_TARGETS_KIND = 331;
>+	public static final int INFORMATION_FLOW__SOURCES_AND_TARGETS_KIND = 349;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Must Conform' of 'Information Flow'.
>@@ -2677,7 +2702,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INFORMATION_FLOW__MUST_CONFORM = 332;
>+	public static final int INFORMATION_FLOW__MUST_CONFORM = 350;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Convey Classifiers' of 'Information Flow'.
>@@ -2685,7 +2710,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INFORMATION_FLOW__CONVEY_CLASSIFIERS = 333;
>+	public static final int INFORMATION_FLOW__CONVEY_CLASSIFIERS = 351;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Scope Of Variable' of 'Variable Action'.
>@@ -2693,7 +2718,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int VARIABLE_ACTION__SCOPE_OF_VARIABLE = 318;
>+	public static final int VARIABLE_ACTION__SCOPE_OF_VARIABLE = 336;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type And Ordering' of 'Read Variable Action'.
>@@ -2701,7 +2726,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_VARIABLE_ACTION__TYPE_AND_ORDERING = 319;
>+	public static final int READ_VARIABLE_ACTION__TYPE_AND_ORDERING = 337;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Compatible Multiplicity' of 'Read Variable Action'.
>@@ -2709,7 +2734,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_VARIABLE_ACTION__COMPATIBLE_MULTIPLICITY = 320;
>+	public static final int READ_VARIABLE_ACTION__COMPATIBLE_MULTIPLICITY = 338;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Type' of 'Write Variable Action'.
>@@ -2717,7 +2742,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int WRITE_VARIABLE_ACTION__SAME_TYPE = 321;
>+	public static final int WRITE_VARIABLE_ACTION__SAME_TYPE = 339;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Write Variable Action'.
>@@ -2725,7 +2750,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int WRITE_VARIABLE_ACTION__MULTIPLICITY = 322;
>+	public static final int WRITE_VARIABLE_ACTION__MULTIPLICITY = 340;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Single Input Pin' of 'Add Variable Value Action'.
>@@ -2733,7 +2758,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ADD_VARIABLE_VALUE_ACTION__SINGLE_INPUT_PIN = 323;
>+	public static final int ADD_VARIABLE_VALUE_ACTION__SINGLE_INPUT_PIN = 341;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Unlimited Natural' of 'Remove Variable Value Action'.
>@@ -2741,7 +2766,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int REMOVE_VARIABLE_VALUE_ACTION__UNLIMITED_NATURAL = 324;
>+	public static final int REMOVE_VARIABLE_VALUE_ACTION__UNLIMITED_NATURAL = 342;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate One Output Pin' of 'Action Input Pin'.
>@@ -2749,7 +2774,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTION_INPUT_PIN__ONE_OUTPUT_PIN = 325;
>+	public static final int ACTION_INPUT_PIN__ONE_OUTPUT_PIN = 343;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Input Pin' of 'Action Input Pin'.
>@@ -2757,7 +2782,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTION_INPUT_PIN__INPUT_PIN = 326;
>+	public static final int ACTION_INPUT_PIN__INPUT_PIN = 344;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Control Or Data Flow' of 'Action Input Pin'.
>@@ -2765,7 +2790,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTION_INPUT_PIN__NO_CONTROL_OR_DATA_FLOW = 327;
>+	public static final int ACTION_INPUT_PIN__NO_CONTROL_OR_DATA_FLOW = 345;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Is Classifier' of 'Read Extent Action'.
>@@ -2773,7 +2798,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_EXTENT_ACTION__TYPE_IS_CLASSIFIER = 334;
>+	public static final int READ_EXTENT_ACTION__TYPE_IS_CLASSIFIER = 352;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Result' of 'Read Extent Action'.
>@@ -2781,7 +2806,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_EXTENT_ACTION__MULTIPLICITY_OF_RESULT = 335;
>+	public static final int READ_EXTENT_ACTION__MULTIPLICITY_OF_RESULT = 353;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Classifier Not Abstract' of 'Reclassify Object Action'.
>@@ -2789,7 +2814,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int RECLASSIFY_OBJECT_ACTION__CLASSIFIER_NOT_ABSTRACT = 336;
>+	public static final int RECLASSIFY_OBJECT_ACTION__CLASSIFIER_NOT_ABSTRACT = 354;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Reclassify Object Action'.
>@@ -2797,7 +2822,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int RECLASSIFY_OBJECT_ACTION__MULTIPLICITY = 337;
>+	public static final int RECLASSIFY_OBJECT_ACTION__MULTIPLICITY = 355;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Input Pin' of 'Reclassify Object Action'.
>@@ -2805,7 +2830,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int RECLASSIFY_OBJECT_ACTION__INPUT_PIN = 338;
>+	public static final int RECLASSIFY_OBJECT_ACTION__INPUT_PIN = 356;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Input' of 'Read Is Classified Object Action'.
>@@ -2813,7 +2838,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_IS_CLASSIFIED_OBJECT_ACTION__MULTIPLICITY_OF_INPUT = 339;
>+	public static final int READ_IS_CLASSIFIED_OBJECT_ACTION__MULTIPLICITY_OF_INPUT = 357;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Type' of 'Read Is Classified Object Action'.
>@@ -2821,7 +2846,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_IS_CLASSIFIED_OBJECT_ACTION__NO_TYPE = 340;
>+	public static final int READ_IS_CLASSIFIED_OBJECT_ACTION__NO_TYPE = 358;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Output' of 'Read Is Classified Object Action'.
>@@ -2829,7 +2854,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_IS_CLASSIFIED_OBJECT_ACTION__MULTIPLICITY_OF_OUTPUT = 341;
>+	public static final int READ_IS_CLASSIFIED_OBJECT_ACTION__MULTIPLICITY_OF_OUTPUT = 359;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Boolean Result' of 'Read Is Classified Object Action'.
>@@ -2837,7 +2862,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_IS_CLASSIFIED_OBJECT_ACTION__BOOLEAN_RESULT = 342;
>+	public static final int READ_IS_CLASSIFIED_OBJECT_ACTION__BOOLEAN_RESULT = 360;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Start Classifier Behavior Action'.
>@@ -2845,7 +2870,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int START_CLASSIFIER_BEHAVIOR_ACTION__MULTIPLICITY = 343;
>+	public static final int START_CLASSIFIER_BEHAVIOR_ACTION__MULTIPLICITY = 361;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Has Classifier' of 'Start Classifier Behavior Action'.
>@@ -2853,7 +2878,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int START_CLASSIFIER_BEHAVIOR_ACTION__TYPE_HAS_CLASSIFIER = 344;
>+	public static final int START_CLASSIFIER_BEHAVIOR_ACTION__TYPE_HAS_CLASSIFIER = 362;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Property' of 'Read Link Object End Action'.
>@@ -2861,7 +2886,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_ACTION__PROPERTY = 345;
>+	public static final int READ_LINK_OBJECT_END_ACTION__PROPERTY = 363;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Association Of Association' of 'Read Link Object End Action'.
>@@ -2869,7 +2894,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_ACTION__ASSOCIATION_OF_ASSOCIATION = 346;
>+	public static final int READ_LINK_OBJECT_END_ACTION__ASSOCIATION_OF_ASSOCIATION = 364;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Ends Of Association' of 'Read Link Object End Action'.
>@@ -2877,7 +2902,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_ACTION__ENDS_OF_ASSOCIATION = 347;
>+	public static final int READ_LINK_OBJECT_END_ACTION__ENDS_OF_ASSOCIATION = 365;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Of Object' of 'Read Link Object End Action'.
>@@ -2885,7 +2910,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_ACTION__TYPE_OF_OBJECT = 348;
>+	public static final int READ_LINK_OBJECT_END_ACTION__TYPE_OF_OBJECT = 366;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Object' of 'Read Link Object End Action'.
>@@ -2893,7 +2918,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_ACTION__MULTIPLICITY_OF_OBJECT = 349;
>+	public static final int READ_LINK_OBJECT_END_ACTION__MULTIPLICITY_OF_OBJECT = 367;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Of Result' of 'Read Link Object End Action'.
>@@ -2901,7 +2926,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_ACTION__TYPE_OF_RESULT = 350;
>+	public static final int READ_LINK_OBJECT_END_ACTION__TYPE_OF_RESULT = 368;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Result' of 'Read Link Object End Action'.
>@@ -2909,7 +2934,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_ACTION__MULTIPLICITY_OF_RESULT = 351;
>+	public static final int READ_LINK_OBJECT_END_ACTION__MULTIPLICITY_OF_RESULT = 369;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Qualifier Attribute' of 'Read Link Object End Qualifier Action'.
>@@ -2917,7 +2942,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__QUALIFIER_ATTRIBUTE = 352;
>+	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__QUALIFIER_ATTRIBUTE = 370;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Association Of Association' of 'Read Link Object End Qualifier Action'.
>@@ -2925,7 +2950,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__ASSOCIATION_OF_ASSOCIATION = 353;
>+	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__ASSOCIATION_OF_ASSOCIATION = 371;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Ends Of Association' of 'Read Link Object End Qualifier Action'.
>@@ -2933,7 +2958,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__ENDS_OF_ASSOCIATION = 354;
>+	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__ENDS_OF_ASSOCIATION = 372;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Of Object' of 'Read Link Object End Qualifier Action'.
>@@ -2941,7 +2966,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__TYPE_OF_OBJECT = 355;
>+	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__TYPE_OF_OBJECT = 373;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Qualifier' of 'Read Link Object End Qualifier Action'.
>@@ -2949,7 +2974,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__MULTIPLICITY_OF_QUALIFIER = 356;
>+	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__MULTIPLICITY_OF_QUALIFIER = 374;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Object' of 'Read Link Object End Qualifier Action'.
>@@ -2957,7 +2982,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__MULTIPLICITY_OF_OBJECT = 357;
>+	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__MULTIPLICITY_OF_OBJECT = 375;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Type' of 'Read Link Object End Qualifier Action'.
>@@ -2965,7 +2990,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__SAME_TYPE = 358;
>+	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__SAME_TYPE = 376;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Result' of 'Read Link Object End Qualifier Action'.
>@@ -2973,7 +2998,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__MULTIPLICITY_OF_RESULT = 359;
>+	public static final int READ_LINK_OBJECT_END_QUALIFIER_ACTION__MULTIPLICITY_OF_RESULT = 377;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Association Class' of 'Create Link Object Action'.
>@@ -2981,7 +3006,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CREATE_LINK_OBJECT_ACTION__ASSOCIATION_CLASS = 360;
>+	public static final int CREATE_LINK_OBJECT_ACTION__ASSOCIATION_CLASS = 378;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Of Result' of 'Create Link Object Action'.
>@@ -2989,7 +3014,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CREATE_LINK_OBJECT_ACTION__TYPE_OF_RESULT = 361;
>+	public static final int CREATE_LINK_OBJECT_ACTION__TYPE_OF_RESULT = 379;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity' of 'Create Link Object Action'.
>@@ -2997,7 +3022,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CREATE_LINK_OBJECT_ACTION__MULTIPLICITY = 362;
>+	public static final int CREATE_LINK_OBJECT_ACTION__MULTIPLICITY = 380;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Input Pins' of 'Accept Event Action'.
>@@ -3005,7 +3030,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACCEPT_EVENT_ACTION__NO_INPUT_PINS = 363;
>+	public static final int ACCEPT_EVENT_ACTION__NO_INPUT_PINS = 381;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Output Pins' of 'Accept Event Action'.
>@@ -3013,7 +3038,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACCEPT_EVENT_ACTION__NO_OUTPUT_PINS = 364;
>+	public static final int ACCEPT_EVENT_ACTION__NO_OUTPUT_PINS = 382;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Trigger Events' of 'Accept Event Action'.
>@@ -3021,7 +3046,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACCEPT_EVENT_ACTION__TRIGGER_EVENTS = 365;
>+	public static final int ACCEPT_EVENT_ACTION__TRIGGER_EVENTS = 383;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Unmarshall Signal Events' of 'Accept Event Action'.
>@@ -3029,7 +3054,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACCEPT_EVENT_ACTION__UNMARSHALL_SIGNAL_EVENTS = 366;
>+	public static final int ACCEPT_EVENT_ACTION__UNMARSHALL_SIGNAL_EVENTS = 384;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Result Pins' of 'Accept Call Action'.
>@@ -3037,7 +3062,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACCEPT_CALL_ACTION__RESULT_PINS = 367;
>+	public static final int ACCEPT_CALL_ACTION__RESULT_PINS = 385;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Trigger Call Event' of 'Accept Call Action'.
>@@ -3045,7 +3070,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACCEPT_CALL_ACTION__TRIGGER_CALL_EVENT = 368;
>+	public static final int ACCEPT_CALL_ACTION__TRIGGER_CALL_EVENT = 386;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Unmarshall' of 'Accept Call Action'.
>@@ -3053,7 +3078,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACCEPT_CALL_ACTION__UNMARSHALL = 369;
>+	public static final int ACCEPT_CALL_ACTION__UNMARSHALL = 387;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Pins Match Parameter' of 'Reply Action'.
>@@ -3061,7 +3086,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int REPLY_ACTION__PINS_MATCH_PARAMETER = 370;
>+	public static final int REPLY_ACTION__PINS_MATCH_PARAMETER = 388;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Event On Reply To Call Trigger' of 'Reply Action'.
>@@ -3069,7 +3094,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int REPLY_ACTION__EVENT_ON_REPLY_TO_CALL_TRIGGER = 371;
>+	public static final int REPLY_ACTION__EVENT_ON_REPLY_TO_CALL_TRIGGER = 389;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Type' of 'Unmarshall Action'.
>@@ -3077,7 +3102,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int UNMARSHALL_ACTION__SAME_TYPE = 372;
>+	public static final int UNMARSHALL_ACTION__SAME_TYPE = 390;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Object' of 'Unmarshall Action'.
>@@ -3085,7 +3110,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int UNMARSHALL_ACTION__MULTIPLICITY_OF_OBJECT = 373;
>+	public static final int UNMARSHALL_ACTION__MULTIPLICITY_OF_OBJECT = 391;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Number Of Result' of 'Unmarshall Action'.
>@@ -3093,7 +3118,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int UNMARSHALL_ACTION__NUMBER_OF_RESULT = 374;
>+	public static final int UNMARSHALL_ACTION__NUMBER_OF_RESULT = 392;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type And Ordering' of 'Unmarshall Action'.
>@@ -3101,7 +3126,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int UNMARSHALL_ACTION__TYPE_AND_ORDERING = 375;
>+	public static final int UNMARSHALL_ACTION__TYPE_AND_ORDERING = 393;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Result' of 'Unmarshall Action'.
>@@ -3109,7 +3134,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int UNMARSHALL_ACTION__MULTIPLICITY_OF_RESULT = 376;
>+	public static final int UNMARSHALL_ACTION__MULTIPLICITY_OF_RESULT = 394;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Structural Feature' of 'Unmarshall Action'.
>@@ -3117,7 +3142,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int UNMARSHALL_ACTION__STRUCTURAL_FEATURE = 377;
>+	public static final int UNMARSHALL_ACTION__STRUCTURAL_FEATURE = 395;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Unmarshall Type Is Classifier' of 'Unmarshall Action'.
>@@ -3125,7 +3150,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int UNMARSHALL_ACTION__UNMARSHALL_TYPE_IS_CLASSIFIER = 378;
>+	public static final int UNMARSHALL_ACTION__UNMARSHALL_TYPE_IS_CLASSIFIER = 396;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Input Type Is Collection' of 'Reduce Action'.
>@@ -3133,7 +3158,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int REDUCE_ACTION__INPUT_TYPE_IS_COLLECTION = 379;
>+	public static final int REDUCE_ACTION__INPUT_TYPE_IS_COLLECTION = 397;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Output Types Are Compatible' of 'Reduce Action'.
>@@ -3141,7 +3166,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int REDUCE_ACTION__OUTPUT_TYPES_ARE_COMPATIBLE = 380;
>+	public static final int REDUCE_ACTION__OUTPUT_TYPES_ARE_COMPATIBLE = 398;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Reducer Inputs Output' of 'Reduce Action'.
>@@ -3149,7 +3174,47 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int REDUCE_ACTION__REDUCER_INPUTS_OUTPUT = 381;
>+	public static final int REDUCE_ACTION__REDUCER_INPUTS_OUTPUT = 399;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Of Object' of 'Start Object Behavior Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int START_OBJECT_BEHAVIOR_ACTION__TYPE_OF_OBJECT = 400;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Multiplicity Of Object' of 'Start Object Behavior Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int START_OBJECT_BEHAVIOR_ACTION__MULTIPLICITY_OF_OBJECT = 401;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Number Order Arguments' of 'Start Object Behavior Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int START_OBJECT_BEHAVIOR_ACTION__NUMBER_ORDER_ARGUMENTS = 402;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Number Order Results' of 'Start Object Behavior Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int START_OBJECT_BEHAVIOR_ACTION__NUMBER_ORDER_RESULTS = 403;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Type Ordering Multiplicity Match' of 'Start Object Behavior Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int START_OBJECT_BEHAVIOR_ACTION__TYPE_ORDERING_MULTIPLICITY_MATCH = 404;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Object Nodes' of 'Control Flow'.
>@@ -3157,7 +3222,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONTROL_FLOW__OBJECT_NODES = 194;
>+	public static final int CONTROL_FLOW__OBJECT_NODES = 193;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Incoming Edges' of 'Initial Node'.
>@@ -3165,7 +3230,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INITIAL_NODE__NO_INCOMING_EDGES = 195;
>+	public static final int INITIAL_NODE__NO_INCOMING_EDGES = 194;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Control Edges' of 'Initial Node'.
>@@ -3173,7 +3238,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int INITIAL_NODE__CONTROL_EDGES = 196;
>+	public static final int INITIAL_NODE__CONTROL_EDGES = 195;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Has Parameters' of 'Activity Parameter Node'.
>@@ -3181,7 +3246,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_PARAMETER_NODE__HAS_PARAMETERS = 197;
>+	public static final int ACTIVITY_PARAMETER_NODE__HAS_PARAMETERS = 196;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Type' of 'Activity Parameter Node'.
>@@ -3189,7 +3254,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_PARAMETER_NODE__SAME_TYPE = 198;
>+	public static final int ACTIVITY_PARAMETER_NODE__SAME_TYPE = 197;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Edges' of 'Activity Parameter Node'.
>@@ -3197,7 +3262,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_PARAMETER_NODE__NO_EDGES = 199;
>+	public static final int ACTIVITY_PARAMETER_NODE__NO_EDGES = 198;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Incoming Edges' of 'Activity Parameter Node'.
>@@ -3205,7 +3270,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_PARAMETER_NODE__NO_INCOMING_EDGES = 200;
>+	public static final int ACTIVITY_PARAMETER_NODE__NO_INCOMING_EDGES = 199;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Outgoing Edges' of 'Activity Parameter Node'.
>@@ -3213,7 +3278,23 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ACTIVITY_PARAMETER_NODE__NO_OUTGOING_EDGES = 201;
>+	public static final int ACTIVITY_PARAMETER_NODE__NO_OUTGOING_EDGES = 200;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Maximum One Parameter Node' of 'Activity Parameter Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int ACTIVITY_PARAMETER_NODE__MAXIMUM_ONE_PARAMETER_NODE = 201;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Maximum Two Parameter Nodes' of 'Activity Parameter Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int ACTIVITY_PARAMETER_NODE__MAXIMUM_TWO_PARAMETER_NODES = 202;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate One Incoming Edge' of 'Fork Node'.
>@@ -3221,7 +3302,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int FORK_NODE__ONE_INCOMING_EDGE = 237;
>+	public static final int FORK_NODE__ONE_INCOMING_EDGE = 238;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Edges' of 'Fork Node'.
>@@ -3229,7 +3310,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int FORK_NODE__EDGES = 238;
>+	public static final int FORK_NODE__EDGES = 239;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Outgoing Edges' of 'Final Node'.
>@@ -3237,7 +3318,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int FINAL_NODE__NO_OUTGOING_EDGES = 239;
>+	public static final int FINAL_NODE__NO_OUTGOING_EDGES = 240;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate One Outgoing Edge' of 'Merge Node'.
>@@ -3245,7 +3326,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int MERGE_NODE__ONE_OUTGOING_EDGE = 240;
>+	public static final int MERGE_NODE__ONE_OUTGOING_EDGE = 241;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Edges' of 'Merge Node'.
>@@ -3253,31 +3334,71 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int MERGE_NODE__EDGES = 241;
>+	public static final int MERGE_NODE__EDGES = 242;
> 
> 	/**
>-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate One Incoming Edge' of 'Decision Node'.
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Incoming Outgoing Edges' of 'Decision Node'.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int DECISION_NODE__ONE_INCOMING_EDGE = 242;
>+	public static final int DECISION_NODE__INCOMING_OUTGOING_EDGES = 243;
> 
> 	/**
>-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Input Parameter' of 'Decision Node'.
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Edges' of 'Decision Node'.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int DECISION_NODE__INPUT_PARAMETER = 243;
>+	public static final int DECISION_NODE__EDGES = 244;
> 
> 	/**
>-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Edges' of 'Decision Node'.
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Decision Input Flow Incoming' of 'Decision Node'.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int DECISION_NODE__EDGES = 244;
>+	public static final int DECISION_NODE__DECISION_INPUT_FLOW_INCOMING = 245;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Parameters' of 'Decision Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int DECISION_NODE__PARAMETERS = 246;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Zero Input Parameters' of 'Decision Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int DECISION_NODE__ZERO_INPUT_PARAMETERS = 247;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Incoming Object One Input Parameter' of 'Decision Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int DECISION_NODE__INCOMING_OBJECT_ONE_INPUT_PARAMETER = 248;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Incoming Control One Input Parameter' of 'Decision Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int DECISION_NODE__INCOMING_CONTROL_ONE_INPUT_PARAMETER = 249;
>+
>+	/**
>+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Two Input Parameters' of 'Decision Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static final int DECISION_NODE__TWO_INPUT_PARAMETERS = 250;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate One Outgoing Edge' of 'Join Node'.
>@@ -3285,7 +3406,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int JOIN_NODE__ONE_OUTGOING_EDGE = 382;
>+	public static final int JOIN_NODE__ONE_OUTGOING_EDGE = 405;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Incoming Object Flow' of 'Join Node'.
>@@ -3293,7 +3414,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int JOIN_NODE__INCOMING_OBJECT_FLOW = 383;
>+	public static final int JOIN_NODE__INCOMING_OBJECT_FLOW = 406;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Actions' of 'Object Flow'.
>@@ -3301,7 +3422,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OBJECT_FLOW__NO_ACTIONS = 384;
>+	public static final int OBJECT_FLOW__NO_ACTIONS = 251;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Compatible Types' of 'Object Flow'.
>@@ -3309,7 +3430,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OBJECT_FLOW__COMPATIBLE_TYPES = 385;
>+	public static final int OBJECT_FLOW__COMPATIBLE_TYPES = 252;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Same Upper Bounds' of 'Object Flow'.
>@@ -3317,7 +3438,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OBJECT_FLOW__SAME_UPPER_BOUNDS = 386;
>+	public static final int OBJECT_FLOW__SAME_UPPER_BOUNDS = 253;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Target' of 'Object Flow'.
>@@ -3325,7 +3446,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OBJECT_FLOW__TARGET = 387;
>+	public static final int OBJECT_FLOW__TARGET = 254;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Transformation Behaviour' of 'Object Flow'.
>@@ -3333,7 +3454,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OBJECT_FLOW__TRANSFORMATION_BEHAVIOUR = 388;
>+	public static final int OBJECT_FLOW__TRANSFORMATION_BEHAVIOUR = 255;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Selection Behaviour' of 'Object Flow'.
>@@ -3341,7 +3462,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OBJECT_FLOW__SELECTION_BEHAVIOUR = 389;
>+	public static final int OBJECT_FLOW__SELECTION_BEHAVIOUR = 256;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Input And Output Parameter' of 'Object Flow'.
>@@ -3349,7 +3470,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OBJECT_FLOW__INPUT_AND_OUTPUT_PARAMETER = 390;
>+	public static final int OBJECT_FLOW__INPUT_AND_OUTPUT_PARAMETER = 257;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Is Multicast Or Is Multireceive' of 'Object Flow'.
>@@ -3357,7 +3478,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int OBJECT_FLOW__IS_MULTICAST_OR_IS_MULTIRECEIVE = 391;
>+	public static final int OBJECT_FLOW__IS_MULTICAST_OR_IS_MULTIRECEIVE = 258;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Result No Incoming' of 'Conditional Node'.
>@@ -3365,7 +3486,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CONDITIONAL_NODE__RESULT_NO_INCOMING = 392;
>+	public static final int CONDITIONAL_NODE__RESULT_NO_INCOMING = 407;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Decider Output' of 'Clause'.
>@@ -3373,7 +3494,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CLAUSE__DECIDER_OUTPUT = 393;
>+	public static final int CLAUSE__DECIDER_OUTPUT = 408;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Body Output Pins' of 'Clause'.
>@@ -3381,7 +3502,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int CLAUSE__BODY_OUTPUT_PINS = 394;
>+	public static final int CLAUSE__BODY_OUTPUT_PINS = 409;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Input Edges' of 'Loop Node'.
>@@ -3389,7 +3510,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LOOP_NODE__INPUT_EDGES = 395;
>+	public static final int LOOP_NODE__INPUT_EDGES = 410;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Body Output Pins' of 'Loop Node'.
>@@ -3397,7 +3518,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LOOP_NODE__BODY_OUTPUT_PINS = 396;
>+	public static final int LOOP_NODE__BODY_OUTPUT_PINS = 411;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Result No Incoming' of 'Loop Node'.
>@@ -3405,7 +3526,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int LOOP_NODE__RESULT_NO_INCOMING = 397;
>+	public static final int LOOP_NODE__RESULT_NO_INCOMING = 412;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Expansion Nodes' of 'Expansion Region'.
>@@ -3413,7 +3534,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int EXPANSION_REGION__EXPANSION_NODES = 398;
>+	public static final int EXPANSION_REGION__EXPANSION_NODES = 413;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Internal Structure' of 'Node'.
>@@ -3421,7 +3542,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int NODE__INTERNAL_STRUCTURE = 245;
>+	public static final int NODE__INTERNAL_STRUCTURE = 259;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Association Ends' of 'Communication Path'.
>@@ -3429,7 +3550,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int COMMUNICATION_PATH__ASSOCIATION_ENDS = 246;
>+	public static final int COMMUNICATION_PATH__ASSOCIATION_ENDS = 260;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Outgoing Transitions' of 'Final State'.
>@@ -3437,7 +3558,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int FINAL_STATE__NO_OUTGOING_TRANSITIONS = 310;
>+	public static final int FINAL_STATE__NO_OUTGOING_TRANSITIONS = 328;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Regions' of 'Final State'.
>@@ -3445,7 +3566,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int FINAL_STATE__NO_REGIONS = 311;
>+	public static final int FINAL_STATE__NO_REGIONS = 329;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Cannot Reference Submachine' of 'Final State'.
>@@ -3453,7 +3574,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int FINAL_STATE__CANNOT_REFERENCE_SUBMACHINE = 312;
>+	public static final int FINAL_STATE__CANNOT_REFERENCE_SUBMACHINE = 330;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Entry Behavior' of 'Final State'.
>@@ -3461,7 +3582,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int FINAL_STATE__NO_ENTRY_BEHAVIOR = 313;
>+	public static final int FINAL_STATE__NO_ENTRY_BEHAVIOR = 331;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No Exit Behavior' of 'Final State'.
>@@ -3469,7 +3590,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int FINAL_STATE__NO_EXIT_BEHAVIOR = 314;
>+	public static final int FINAL_STATE__NO_EXIT_BEHAVIOR = 332;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate No State Behavior' of 'Final State'.
>@@ -3477,7 +3598,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int FINAL_STATE__NO_STATE_BEHAVIOR = 315;
>+	public static final int FINAL_STATE__NO_STATE_BEHAVIOR = 333;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate When Non Negative' of 'Time Event'.
>@@ -3485,7 +3606,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int TIME_EVENT__WHEN_NON_NEGATIVE = 316;
>+	public static final int TIME_EVENT__WHEN_NON_NEGATIVE = 334;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Starting Time' of 'Time Event'.
>@@ -3493,7 +3614,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int TIME_EVENT__STARTING_TIME = 317;
>+	public static final int TIME_EVENT__STARTING_TIME = 335;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Belongs To Psm' of 'Protocol Transition'.
>@@ -3501,7 +3622,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROTOCOL_TRANSITION__BELONGS_TO_PSM = 399;
>+	public static final int PROTOCOL_TRANSITION__BELONGS_TO_PSM = 414;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Associated Actions' of 'Protocol Transition'.
>@@ -3509,7 +3630,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROTOCOL_TRANSITION__ASSOCIATED_ACTIONS = 400;
>+	public static final int PROTOCOL_TRANSITION__ASSOCIATED_ACTIONS = 415;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Refers To Operation' of 'Protocol Transition'.
>@@ -3517,7 +3638,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int PROTOCOL_TRANSITION__REFERS_TO_OPERATION = 401;
>+	public static final int PROTOCOL_TRANSITION__REFERS_TO_OPERATION = 416;
> 
> 	/**
> 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate Cannot Be Defined' of 'Association Class'.
>@@ -3525,7 +3646,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static final int ASSOCIATION_CLASS__CANNOT_BE_DEFINED = 402;
>+	public static final int ASSOCIATION_CLASS__CANNOT_BE_DEFINED = 417;
> 
> 	/**
> 	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
>@@ -3533,7 +3654,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 402;
>+	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 417;
> 
> 	/**
> 	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
>@@ -3672,10 +3793,6 @@
> 			case UMLPackage.CONNECTABLE_ELEMENT :
> 				return validateConnectableElement((ConnectableElement) value,
> 					diagnostics, context);
>-			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER :
>-				return validateConnectableElementTemplateParameter(
>-					(ConnectableElementTemplateParameter) value, diagnostics,
>-					context);
> 			case UMLPackage.CONNECTOR_END :
> 				return validateConnectorEnd((ConnectorEnd) value, diagnostics,
> 					context);
>@@ -3788,6 +3905,10 @@
> 			case UMLPackage.STRUCTURAL_FEATURE :
> 				return validateStructuralFeature((StructuralFeature) value,
> 					diagnostics, context);
>+			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER :
>+				return validateConnectableElementTemplateParameter(
>+					(ConnectableElementTemplateParameter) value, diagnostics,
>+					context);
> 			case UMLPackage.COLLABORATION_USE :
> 				return validateCollaborationUse((CollaborationUse) value,
> 					diagnostics, context);
>@@ -4048,6 +4169,9 @@
> 			case UMLPackage.DECISION_NODE :
> 				return validateDecisionNode((DecisionNode) value, diagnostics,
> 					context);
>+			case UMLPackage.OBJECT_FLOW :
>+				return validateObjectFlow((ObjectFlow) value, diagnostics,
>+					context);
> 			case UMLPackage.ACTIVITY_FINAL_NODE :
> 				return validateActivityFinalNode((ActivityFinalNode) value,
> 					diagnostics, context);
>@@ -4251,14 +4375,14 @@
> 			case UMLPackage.REDUCE_ACTION :
> 				return validateReduceAction((ReduceAction) value, diagnostics,
> 					context);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION :
>+				return validateStartObjectBehaviorAction(
>+					(StartObjectBehaviorAction) value, diagnostics, context);
> 			case UMLPackage.JOIN_NODE :
> 				return validateJoinNode((JoinNode) value, diagnostics, context);
> 			case UMLPackage.DATA_STORE_NODE :
> 				return validateDataStoreNode((DataStoreNode) value,
> 					diagnostics, context);
>-			case UMLPackage.OBJECT_FLOW :
>-				return validateObjectFlow((ObjectFlow) value, diagnostics,
>-					context);
> 			case UMLPackage.CONDITIONAL_NODE :
> 				return validateConditionalNode((ConditionalNode) value,
> 					diagnostics, context);
>@@ -6824,9 +6948,6 @@
> 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
> 				parameter, diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateMultiplicityElement_validateUpperGt0(parameter,
>-				diagnostics, context);
>-		if (result || diagnostics != null)
> 			result &= validateMultiplicityElement_validateLowerGe0(parameter,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>@@ -6948,9 +7069,6 @@
> 			result &= validateElement_validateHasOwner(multiplicityElement,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateMultiplicityElement_validateUpperGt0(
>-				multiplicityElement, diagnostics, context);
>-		if (result || diagnostics != null)
> 			result &= validateMultiplicityElement_validateLowerGe0(
> 				multiplicityElement, diagnostics, context);
> 		if (result || diagnostics != null)
>@@ -6966,18 +7084,6 @@
> 	}
> 
> 	/**
>-	 * Validates the validateUpperGt0 constraint of 'Multiplicity Element'.
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public boolean validateMultiplicityElement_validateUpperGt0(
>-			MultiplicityElement multiplicityElement,
>-			DiagnosticChain diagnostics, Map<Object, Object> context) {
>-		return multiplicityElement.validateUpperGt0(diagnostics, context);
>-	}
>-
>-	/**
> 	 * Validates the validateLowerGe0 constraint of 'Multiplicity Element'.
> 	 * 
> 	 * 
>@@ -7106,9 +7212,6 @@
> 			result &= validateElement_validateHasOwner(connectorEnd,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateMultiplicityElement_validateUpperGt0(
>-				connectorEnd, diagnostics, context);
>-		if (result || diagnostics != null)
> 			result &= validateMultiplicityElement_validateLowerGe0(
> 				connectorEnd, diagnostics, context);
> 		if (result || diagnostics != null)
>@@ -7230,9 +7333,6 @@
> 			result &= validateRedefinableElement_validateRedefinitionConsistent(
> 				property, diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateMultiplicityElement_validateUpperGt0(property,
>-				diagnostics, context);
>-		if (result || diagnostics != null)
> 			result &= validateMultiplicityElement_validateLowerGe0(property,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>@@ -9133,9 +9233,6 @@
> 			result &= validateRedefinableElement_validateRedefinitionConsistent(
> 				port, diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateMultiplicityElement_validateUpperGt0(port,
>-				diagnostics, context);
>-		if (result || diagnostics != null)
> 			result &= validateMultiplicityElement_validateLowerGe0(port,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>@@ -9740,9 +9837,6 @@
> 			result &= validateRedefinableElement_validateRedefinitionConsistent(
> 				structuralFeature, diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateMultiplicityElement_validateUpperGt0(
>-				structuralFeature, diagnostics, context);
>-		if (result || diagnostics != null)
> 			result &= validateMultiplicityElement_validateLowerGe0(
> 				structuralFeature, diagnostics, context);
> 		if (result || diagnostics != null)
>@@ -10727,9 +10821,6 @@
> 			result &= validateRedefinableElement_validateRedefinitionConsistent(
> 				extensionEnd, diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateMultiplicityElement_validateUpperGt0(
>-				extensionEnd, diagnostics, context);
>-		if (result || diagnostics != null)
> 			result &= validateMultiplicityElement_validateLowerGe0(
> 				extensionEnd, diagnostics, context);
> 		if (result || diagnostics != null)
>@@ -13305,9 +13396,6 @@
> 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
> 				variable, diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateMultiplicityElement_validateUpperGt0(variable,
>-				diagnostics, context);
>-		if (result || diagnostics != null)
> 			result &= validateMultiplicityElement_validateLowerGe0(variable,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>@@ -13672,9 +13760,6 @@
> 			result &= validateObjectNode_validateInputOutputParameter(
> 				outputPin, diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateMultiplicityElement_validateUpperGt0(outputPin,
>-				diagnostics, context);
>-		if (result || diagnostics != null)
> 			result &= validateMultiplicityElement_validateLowerGe0(outputPin,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>@@ -13770,9 +13855,6 @@
> 			result &= validateObjectNode_validateInputOutputParameter(pin,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateMultiplicityElement_validateUpperGt0(pin,
>-				diagnostics, context);
>-		if (result || diagnostics != null)
> 			result &= validateMultiplicityElement_validateLowerGe0(pin,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>@@ -13865,9 +13947,6 @@
> 			result &= validateObjectNode_validateInputOutputParameter(inputPin,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateMultiplicityElement_validateUpperGt0(inputPin,
>-				diagnostics, context);
>-		if (result || diagnostics != null)
> 			result &= validateMultiplicityElement_validateLowerGe0(inputPin,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>@@ -16140,6 +16219,12 @@
> 		if (result || diagnostics != null)
> 			result &= validateWriteStructuralFeatureAction_validateInputPin(
> 				writeStructuralFeatureAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateWriteStructuralFeatureAction_validateTypeOfResult(
>+				writeStructuralFeatureAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateWriteStructuralFeatureAction_validateMultiplicityOfResult(
>+				writeStructuralFeatureAction, diagnostics, context);
> 		return result;
> 	}
> 
>@@ -16157,6 +16242,32 @@
> 	}
> 
> 	/**
>+	 * Validates the validateTypeOfResult constraint of 'Write Structural Feature Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateWriteStructuralFeatureAction_validateTypeOfResult(
>+			WriteStructuralFeatureAction writeStructuralFeatureAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return writeStructuralFeatureAction.validateTypeOfResult(diagnostics,
>+			context);
>+	}
>+
>+	/**
>+	 * Validates the validateMultiplicityOfResult constraint of 'Write Structural Feature Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateWriteStructuralFeatureAction_validateMultiplicityOfResult(
>+			WriteStructuralFeatureAction writeStructuralFeatureAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return writeStructuralFeatureAction.validateMultiplicityOfResult(
>+			diagnostics, context);
>+	}
>+
>+	/**
> 	 * Validates the validateMultiplicity constraint of 'Write Structural Feature Action'.
> 	 * 
> 	 * 
>@@ -16258,10 +16369,42 @@
> 		if (result || diagnostics != null)
> 			result &= validateStructuralFeatureAction_validateOneFeaturingClassifier(
> 				clearStructuralFeatureAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateClearStructuralFeatureAction_validateTypeOfResult(
>+				clearStructuralFeatureAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateClearStructuralFeatureAction_validateMultiplicityOfResult(
>+				clearStructuralFeatureAction, diagnostics, context);
> 		return result;
> 	}
> 
> 	/**
>+	 * Validates the validateTypeOfResult constraint of 'Clear Structural Feature Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateClearStructuralFeatureAction_validateTypeOfResult(
>+			ClearStructuralFeatureAction clearStructuralFeatureAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return clearStructuralFeatureAction.validateTypeOfResult(diagnostics,
>+			context);
>+	}
>+
>+	/**
>+	 * Validates the validateMultiplicityOfResult constraint of 'Clear Structural Feature Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateClearStructuralFeatureAction_validateMultiplicityOfResult(
>+			ClearStructuralFeatureAction clearStructuralFeatureAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return clearStructuralFeatureAction.validateMultiplicityOfResult(
>+			diagnostics, context);
>+	}
>+
>+	/**
> 	 * 
> 	 * 
> 	 * @generated
>@@ -16335,6 +16478,12 @@
> 			result &= validateWriteStructuralFeatureAction_validateInputPin(
> 				removeStructuralFeatureValueAction, diagnostics, context);
> 		if (result || diagnostics != null)
>+			result &= validateWriteStructuralFeatureAction_validateTypeOfResult(
>+				removeStructuralFeatureValueAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateWriteStructuralFeatureAction_validateMultiplicityOfResult(
>+				removeStructuralFeatureValueAction, diagnostics, context);
>+		if (result || diagnostics != null)
> 			result &= validateRemoveStructuralFeatureValueAction_validateNonUniqueRemoval(
> 				removeStructuralFeatureValueAction, diagnostics, context);
> 		return result;
>@@ -16427,6 +16576,12 @@
> 			result &= validateWriteStructuralFeatureAction_validateInputPin(
> 				addStructuralFeatureValueAction, diagnostics, context);
> 		if (result || diagnostics != null)
>+			result &= validateWriteStructuralFeatureAction_validateTypeOfResult(
>+				addStructuralFeatureValueAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateWriteStructuralFeatureAction_validateMultiplicityOfResult(
>+				addStructuralFeatureValueAction, diagnostics, context);
>+		if (result || diagnostics != null)
> 			result &= validateAddStructuralFeatureValueAction_validateUnlimitedNaturalAndMultiplicity(
> 				addStructuralFeatureValueAction, diagnostics, context);
> 		return result;
>@@ -17872,9 +18027,6 @@
> 			result &= validateObjectNode_validateInputOutputParameter(valuePin,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateMultiplicityElement_validateUpperGt0(valuePin,
>-				diagnostics, context);
>-		if (result || diagnostics != null)
> 			result &= validateMultiplicityElement_validateLowerGe0(valuePin,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>@@ -19742,9 +19894,6 @@
> 			result &= validateObjectNode_validateInputOutputParameter(
> 				actionInputPin, diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateMultiplicityElement_validateUpperGt0(
>-				actionInputPin, diagnostics, context);
>-		if (result || diagnostics != null)
> 			result &= validateMultiplicityElement_validateLowerGe0(
> 				actionInputPin, diagnostics, context);
> 		if (result || diagnostics != null)
>@@ -21278,6 +21427,156 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public boolean validateStartObjectBehaviorAction(
>+			StartObjectBehaviorAction startObjectBehaviorAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		boolean result = validate_EveryMultiplicityConforms(
>+			startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validate_EveryDataValueConforms(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validate_EveryReferenceIsContained(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validate_EveryProxyResolves(startObjectBehaviorAction,
>+				diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validate_UniqueID(startObjectBehaviorAction, diagnostics,
>+				context);
>+		if (result || diagnostics != null)
>+			result &= validate_EveryKeyUnique(startObjectBehaviorAction,
>+				diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validate_EveryMapEntryUnique(startObjectBehaviorAction,
>+				diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateElement_validateNotOwnSelf(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateElement_validateHasOwner(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateNamedElement_validateHasNoQualifiedName(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateNamedElement_validateHasQualifiedName(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateNamedElement_validateVisibilityNeedsOwnership(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateRedefinableElement_validateRedefinitionContextValid(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateRedefinableElement_validateRedefinitionConsistent(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateActivityNode_validateOwnedStructuredNode(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateActivityNode_validateOwned(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateInvocationAction_validateOnPortReceiver(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateCallAction_validateSynchronousCall(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateCallAction_validateNumberAndOrder(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateCallAction_validateTypeOrderingMultiplicity(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateStartObjectBehaviorAction_validateTypeOfObject(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateStartObjectBehaviorAction_validateMultiplicityOfObject(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateStartObjectBehaviorAction_validateNumberOrderArguments(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateStartObjectBehaviorAction_validateNumberOrderResults(
>+				startObjectBehaviorAction, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateStartObjectBehaviorAction_validateTypeOrderingMultiplicityMatch(
>+				startObjectBehaviorAction, diagnostics, context);
>+		return result;
>+	}
>+
>+	/**
>+	 * Validates the validateTypeOfObject constraint of 'Start Object Behavior Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateStartObjectBehaviorAction_validateTypeOfObject(
>+			StartObjectBehaviorAction startObjectBehaviorAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return startObjectBehaviorAction.validateTypeOfObject(diagnostics,
>+			context);
>+	}
>+
>+	/**
>+	 * Validates the validateMultiplicityOfObject constraint of 'Start Object Behavior Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateStartObjectBehaviorAction_validateMultiplicityOfObject(
>+			StartObjectBehaviorAction startObjectBehaviorAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return startObjectBehaviorAction.validateMultiplicityOfObject(
>+			diagnostics, context);
>+	}
>+
>+	/**
>+	 * Validates the validateNumberOrderArguments constraint of 'Start Object Behavior Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateStartObjectBehaviorAction_validateNumberOrderArguments(
>+			StartObjectBehaviorAction startObjectBehaviorAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return startObjectBehaviorAction.validateNumberOrderArguments(
>+			diagnostics, context);
>+	}
>+
>+	/**
>+	 * Validates the validateNumberOrderResults constraint of 'Start Object Behavior Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateStartObjectBehaviorAction_validateNumberOrderResults(
>+			StartObjectBehaviorAction startObjectBehaviorAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return startObjectBehaviorAction.validateNumberOrderResults(
>+			diagnostics, context);
>+	}
>+
>+	/**
>+	 * Validates the validateTypeOrderingMultiplicityMatch constraint of 'Start Object Behavior Action'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateStartObjectBehaviorAction_validateTypeOrderingMultiplicityMatch(
>+			StartObjectBehaviorAction startObjectBehaviorAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return startObjectBehaviorAction.validateTypeOrderingMultiplicityMatch(
>+			diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public boolean validateControlNode(ControlNode controlNode,
> 			DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		boolean result = validate_EveryMultiplicityConforms(controlNode,
>@@ -21568,6 +21867,12 @@
> 		if (result || diagnostics != null)
> 			result &= validateActivityParameterNode_validateNoOutgoingEdges(
> 				activityParameterNode, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateActivityParameterNode_validateMaximumOneParameterNode(
>+				activityParameterNode, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateActivityParameterNode_validateMaximumTwoParameterNodes(
>+				activityParameterNode, diagnostics, context);
> 		return result;
> 	}
> 
>@@ -21635,6 +21940,32 @@
> 	}
> 
> 	/**
>+	 * Validates the validateMaximumOneParameterNode constraint of 'Activity Parameter Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateActivityParameterNode_validateMaximumOneParameterNode(
>+			ActivityParameterNode activityParameterNode,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return activityParameterNode.validateMaximumOneParameterNode(
>+			diagnostics, context);
>+	}
>+
>+	/**
>+	 * Validates the validateMaximumTwoParameterNodes constraint of 'Activity Parameter Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateActivityParameterNode_validateMaximumTwoParameterNodes(
>+			ActivityParameterNode activityParameterNode,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return activityParameterNode.validateMaximumTwoParameterNodes(
>+			diagnostics, context);
>+	}
>+
>+	/**
> 	 * 
> 	 * 
> 	 * @generated
>@@ -22053,51 +22384,129 @@
> 			result &= validateActivityNode_validateOwned(decisionNode,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateDecisionNode_validateOneIncomingEdge(
>+			result &= validateDecisionNode_validateIncomingOutgoingEdges(
> 				decisionNode, diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateDecisionNode_validateInputParameter(decisionNode,
>+			result &= validateDecisionNode_validateEdges(decisionNode,
> 				diagnostics, context);
> 		if (result || diagnostics != null)
>-			result &= validateDecisionNode_validateEdges(decisionNode,
>+			result &= validateDecisionNode_validateDecisionInputFlowIncoming(
>+				decisionNode, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateDecisionNode_validateParameters(decisionNode,
> 				diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateDecisionNode_validateZeroInputParameters(
>+				decisionNode, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateDecisionNode_validateIncomingObjectOneInputParameter(
>+				decisionNode, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateDecisionNode_validateIncomingControlOneInputParameter(
>+				decisionNode, diagnostics, context);
>+		if (result || diagnostics != null)
>+			result &= validateDecisionNode_validateTwoInputParameters(
>+				decisionNode, diagnostics, context);
> 		return result;
> 	}
> 
> 	/**
>-	 * Validates the validateOneIncomingEdge constraint of 'Decision Node'.
>+	 * Validates the validateIncomingOutgoingEdges constraint of 'Decision Node'.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateDecisionNode_validateOneIncomingEdge(
>+	public boolean validateDecisionNode_validateIncomingOutgoingEdges(
> 			DecisionNode decisionNode, DiagnosticChain diagnostics,
> 			Map<Object, Object> context) {
>-		return decisionNode.validateOneIncomingEdge(diagnostics, context);
>+		return decisionNode.validateIncomingOutgoingEdges(diagnostics, context);
> 	}
> 
> 	/**
>-	 * Validates the validateInputParameter constraint of 'Decision Node'.
>+	 * Validates the validateEdges constraint of 'Decision Node'.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateDecisionNode_validateInputParameter(
>+	public boolean validateDecisionNode_validateEdges(
> 			DecisionNode decisionNode, DiagnosticChain diagnostics,
> 			Map<Object, Object> context) {
>-		return decisionNode.validateInputParameter(diagnostics, context);
>+		return decisionNode.validateEdges(diagnostics, context);
> 	}
> 
> 	/**
>-	 * Validates the validateEdges constraint of 'Decision Node'.
>+	 * Validates the validateDecisionInputFlowIncoming constraint of 'Decision Node'.
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateDecisionNode_validateEdges(
>+	public boolean validateDecisionNode_validateDecisionInputFlowIncoming(
> 			DecisionNode decisionNode, DiagnosticChain diagnostics,
> 			Map<Object, Object> context) {
>-		return decisionNode.validateEdges(diagnostics, context);
>+		return decisionNode.validateDecisionInputFlowIncoming(diagnostics,
>+			context);
>+	}
>+
>+	/**
>+	 * Validates the validateParameters constraint of 'Decision Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateDecisionNode_validateParameters(
>+			DecisionNode decisionNode, DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return decisionNode.validateParameters(diagnostics, context);
>+	}
>+
>+	/**
>+	 * Validates the validateZeroInputParameters constraint of 'Decision Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateDecisionNode_validateZeroInputParameters(
>+			DecisionNode decisionNode, DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return decisionNode.validateZeroInputParameters(diagnostics, context);
>+	}
>+
>+	/**
>+	 * Validates the validateIncomingObjectOneInputParameter constraint of 'Decision Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateDecisionNode_validateIncomingObjectOneInputParameter(
>+			DecisionNode decisionNode, DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return decisionNode.validateIncomingObjectOneInputParameter(
>+			diagnostics, context);
>+	}
>+
>+	/**
>+	 * Validates the validateIncomingControlOneInputParameter constraint of 'Decision Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateDecisionNode_validateIncomingControlOneInputParameter(
>+			DecisionNode decisionNode, DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return decisionNode.validateIncomingControlOneInputParameter(
>+			diagnostics, context);
>+	}
>+
>+	/**
>+	 * Validates the validateTwoInputParameters constraint of 'Decision Node'.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateDecisionNode_validateTwoInputParameters(
>+			DecisionNode decisionNode, DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return decisionNode.validateTwoInputParameters(diagnostics, context);
> 	}
> 
> 	/**
>Index: src/org/eclipse/uml2/uml/util/UMLAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLAdapterFactory.java,v
>retrieving revision 1.12
>diff -u -r1.12 UMLAdapterFactory.java
>--- src/org/eclipse/uml2/uml/util/UMLAdapterFactory.java	9 Jan 2008 18:56:03 -0000	1.12
>+++ src/org/eclipse/uml2/uml/util/UMLAdapterFactory.java	24 Sep 2008 18:40:13 -0000
>@@ -228,6 +228,7 @@
> import org.eclipse.uml2.uml.SignalEvent;
> import org.eclipse.uml2.uml.Slot;
> import org.eclipse.uml2.uml.StartClassifierBehaviorAction;
>+import org.eclipse.uml2.uml.StartObjectBehaviorAction;
> import org.eclipse.uml2.uml.State;
> import org.eclipse.uml2.uml.StateInvariant;
> import org.eclipse.uml2.uml.StateMachine;
>@@ -497,12 +498,6 @@
> 		}
> 
> 		@Override
>-		public Adapter caseConnectableElementTemplateParameter(
>-				ConnectableElementTemplateParameter object) {
>-			return createConnectableElementTemplateParameterAdapter();
>-		}
>-
>-		@Override
> 		public Adapter caseConnectorEnd(ConnectorEnd object) {
> 			return createConnectorEndAdapter();
> 		}
>@@ -716,6 +711,12 @@
> 		}
> 
> 		@Override
>+		public Adapter caseConnectableElementTemplateParameter(
>+				ConnectableElementTemplateParameter object) {
>+			return createConnectableElementTemplateParameterAdapter();
>+		}
>+
>+		@Override
> 		public Adapter caseCollaborationUse(CollaborationUse object) {
> 			return createCollaborationUseAdapter();
> 		}
>@@ -1180,6 +1181,11 @@
> 		}
> 
> 		@Override
>+		public Adapter caseObjectFlow(ObjectFlow object) {
>+			return createObjectFlowAdapter();
>+		}
>+
>+		@Override
> 		public Adapter caseActivityFinalNode(ActivityFinalNode object) {
> 			return createActivityFinalNodeAdapter();
> 		}
>@@ -1532,6 +1538,12 @@
> 		}
> 
> 		@Override
>+		public Adapter caseStartObjectBehaviorAction(
>+				StartObjectBehaviorAction object) {
>+			return createStartObjectBehaviorActionAdapter();
>+		}
>+
>+		@Override
> 		public Adapter caseJoinNode(JoinNode object) {
> 			return createJoinNodeAdapter();
> 		}
>@@ -1542,11 +1554,6 @@
> 		}
> 
> 		@Override
>-		public Adapter caseObjectFlow(ObjectFlow object) {
>-			return createObjectFlowAdapter();
>-		}
>-
>-		@Override
> 		public Adapter caseConditionalNode(ConditionalNode object) {
> 			return createConditionalNodeAdapter();
> 		}
>@@ -4630,6 +4637,20 @@
> 	}
> 
> 	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.uml2.uml.StartObjectBehaviorAction Start Object Behavior Action}'.
>+	 * 
>+	 * This default implementation returns null so that we can easily ignore cases;
>+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.uml2.uml.StartObjectBehaviorAction
>+	 * @generated
>+	 */
>+	public Adapter createStartObjectBehaviorActionAdapter() {
>+		return null;
>+	}
>+
>+	/**
> 	 * Creates a new adapter for an object of class '{@link org.eclipse.uml2.uml.ControlNode Control Node}'.
> 	 * 
> 	 * This default implementation returns null so that we can easily ignore cases;
>Index: src/org/eclipse/uml2/uml/UMLFactory.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLFactory.java,v
>retrieving revision 1.6
>diff -u -r1.6 UMLFactory.java
>--- src/org/eclipse/uml2/uml/UMLFactory.java	19 Jan 2006 23:06:36 -0000	1.6
>+++ src/org/eclipse/uml2/uml/UMLFactory.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2006 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -1565,6 +1565,15 @@
> 	ReduceAction createReduceAction();
> 
> 	/**
>+	 * Returns a new object of class 'Start Object Behavior Action'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Start Object Behavior Action'.
>+	 * @generated
>+	 */
>+	StartObjectBehaviorAction createStartObjectBehaviorAction();
>+
>+	/**
> 	 * Returns a new object of class 'Control Flow'.
> 	 * 
> 	 * 
>Index: src/org/eclipse/uml2/uml/Transition.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Transition.java,v
>retrieving revision 1.22
>diff -u -r1.22 Transition.java
>--- src/org/eclipse/uml2/uml/Transition.java	23 Oct 2007 15:54:21 -0000	1.22
>+++ src/org/eclipse/uml2/uml/Transition.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -34,12 +34,12 @@
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.Transition#getKind Kind}</li>
> * <li>{@link org.eclipse.uml2.uml.Transition#getContainer Container}</li>
>+ * <li>{@link org.eclipse.uml2.uml.Transition#getSource Source}</li>
>+ * <li>{@link org.eclipse.uml2.uml.Transition#getTarget Target}</li>
> * <li>{@link org.eclipse.uml2.uml.Transition#getRedefinedTransition Redefined Transition}</li>
> * <li>{@link org.eclipse.uml2.uml.Transition#getGuard Guard}</li>
> * <li>{@link org.eclipse.uml2.uml.Transition#getEffect Effect}</li>
> * <li>{@link org.eclipse.uml2.uml.Transition#getTriggers Trigger}</li>
>- * <li>{@link org.eclipse.uml2.uml.Transition#getTarget Target}</li>
>- * <li>{@link org.eclipse.uml2.uml.Transition#getSource Source}</li>
> * </ul>
> * 
> *
>@@ -405,9 +405,7 @@
> 	 * 
> 	 * 
> 	 * Transitions outgoing pseudostates may not have a trigger.
>-	 * source.oclIsKindOf(Pseudostate) and
>-	 * ((source.kind <> #junction) and (source.kind <> #join) and (source.kind <> #initial)) implies trigger->isEmpty()
>-	 * 
>+	 * source.oclIsKindOf(Pseudostate) and (source.kind <> #initial)) implies trigger->isEmpty()
> 	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
> 	 * @param context The cache of context-specific information.
> 	 * 
>Index: src/org/eclipse/uml2/uml/Vertex.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Vertex.java,v
>retrieving revision 1.12
>diff -u -r1.12 Vertex.java
>--- src/org/eclipse/uml2/uml/Vertex.java	23 Oct 2007 15:54:20 -0000	1.12
>+++ src/org/eclipse/uml2/uml/Vertex.java	24 Sep 2008 18:40:10 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -28,8 +28,8 @@
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.uml2.uml.Vertex#getIncomings Incoming}</li>
> * <li>{@link org.eclipse.uml2.uml.Vertex#getOutgoings Outgoing}</li>
>+ * <li>{@link org.eclipse.uml2.uml.Vertex#getIncomings Incoming}</li>
> * <li>{@link org.eclipse.uml2.uml.Vertex#getContainer Container}</li>
> * </ul>
> * 
>@@ -51,7 +51,7 @@
> 	 * 
> 	 * @return the value of the 'Outgoing' reference list.
> 	 * @see org.eclipse.uml2.uml.UMLPackage#getVertex_Outgoing()
>-	 * @model transient="true" volatile="true" derived="true" ordered="false"
>+	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
> 	 * @generated
> 	 */
> 	EList<Transition> getOutgoings();
>@@ -90,7 +90,7 @@
> 	 * 
> 	 * @return the value of the 'Incoming' reference list.
> 	 * @see org.eclipse.uml2.uml.UMLPackage#getVertex_Incoming()
>-	 * @model transient="true" volatile="true" derived="true" ordered="false"
>+	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
> 	 * @generated
> 	 */
> 	EList<Transition> getIncomings();
>Index: src/org/eclipse/uml2/uml/CallConcurrencyKind.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/CallConcurrencyKind.java,v
>retrieving revision 1.5
>diff -u -r1.5 CallConcurrencyKind.java
>--- src/org/eclipse/uml2/uml/CallConcurrencyKind.java	14 Dec 2006 15:49:27 -0000	1.5
>+++ src/org/eclipse/uml2/uml/CallConcurrencyKind.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2006, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -81,7 +81,7 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * Multiple invocations of a behavioral feature may occur simultaneously to one instance, but only one is allowed to commence. The others are blocked until the performance of the first behavioral feature is complete. It is the responsibility of the system designer to ensure that deadlocks do not occur due to simultaneous blocks.
>+	 * Multiple invocations of a behavioral feature may occur simultaneously to one instance, but only one is allowed to commence. The others are blocked until the performance of the currently executing behavioral feature is complete. It is the responsibility of the system designer to ensure that deadlocks do not occur due to simultaneous blocks.
> 	 * 
> 	 * @see #GUARDED_LITERAL
> 	 * @model name="guarded"
>Index: src/org/eclipse/uml2/uml/Duration.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Duration.java,v
>retrieving revision 1.8
>diff -u -r1.8 Duration.java
>--- src/org/eclipse/uml2/uml/Duration.java	12 Jun 2007 12:53:17 -0000	1.8
>+++ src/org/eclipse/uml2/uml/Duration.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -41,31 +41,44 @@
> 		extends ValueSpecification {
> 
> 	/**
>-	 * Returns the value of the 'Expr' reference.
>+	 * Returns the value of the 'Expr' containment reference.
> 	 * 
> 	 * 
> 	 * 
> 	 * The value of the Duration.
> 	 * 
>-	 * @return the value of the 'Expr' reference.
>+	 * @return the value of the 'Expr' containment reference.
> 	 * @see #setExpr(ValueSpecification)
> 	 * @see org.eclipse.uml2.uml.UMLPackage#getDuration_Expr()
>-	 * @model ordered="false"
>+	 * @model containment="true" resolveProxies="true" ordered="false"
> 	 * @generated
> 	 */
> 	ValueSpecification getExpr();
> 
> 	/**
>-	 * Sets the value of the '{@link org.eclipse.uml2.uml.Duration#getExpr Expr}' reference.
>+	 * Sets the value of the '{@link org.eclipse.uml2.uml.Duration#getExpr Expr}' containment reference.
> 	 * 
> 	 * 
>-	 * @param value the new value of the 'Expr' reference.
>+	 * @param value the new value of the 'Expr' containment reference.
> 	 * @see #getExpr()
> 	 * @generated
> 	 */
> 	void setExpr(ValueSpecification value);
> 
> 	/**
>+	 * Creates a new {@link org.eclipse.uml2.uml.ValueSpecification}, with the specified 'Name', and 'Type', and sets the 'Expr' containment reference.
>+	 * 
>+	 * 
>+	 * @param name The 'Name' for the new {@link org.eclipse.uml2.uml.ValueSpecification}, or <code>null</code>.
>+	 * @param type The 'Type' for the new {@link org.eclipse.uml2.uml.ValueSpecification}, or <code>null</code>.
>+	 * @param eClass The Ecore class of the {@link org.eclipse.uml2.uml.ValueSpecification} to create.
>+	 * @return The new {@link org.eclipse.uml2.uml.ValueSpecification}.
>+	 * @see #getExpr()
>+	 * @generated
>+	 */
>+	ValueSpecification createExpr(String name, Type type, EClass eClass);
>+
>+	/**
> 	 * Returns the value of the 'Observation' reference list.
> 	 * The list contents are of type {@link org.eclipse.uml2.uml.Observation}.
> 	 * 
>Index: src/org/eclipse/uml2/uml/ActivityParameterNode.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityParameterNode.java,v
>retrieving revision 1.6
>diff -u -r1.6 ActivityParameterNode.java
>--- src/org/eclipse/uml2/uml/ActivityParameterNode.java	25 Apr 2007 17:47:06 -0000	1.6
>+++ src/org/eclipse/uml2/uml/ActivityParameterNode.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -141,4 +141,34 @@
> 	boolean validateNoOutgoingEdges(DiagnosticChain diagnostics,
> 			Map<Object, Object> context);
> 
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * A parameter with direction other than inout must have at most one activity parameter node in an activity.
>+	 * true
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateMaximumOneParameterNode(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * A parameter with direction inout must have at most two activity parameter nodes in an activity, one with incoming flows and one with outgoing flows.
>+	 * true
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateMaximumTwoParameterNodes(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
>+
> } // ActivityParameterNode
>Index: src/org/eclipse/uml2/uml/Generalization.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Generalization.java,v
>retrieving revision 1.14
>diff -u -r1.14 Generalization.java
>--- src/org/eclipse/uml2/uml/Generalization.java	23 Oct 2007 15:54:21 -0000	1.14
>+++ src/org/eclipse/uml2/uml/Generalization.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -47,6 +47,7 @@
> 
> 	/**
> 	 * Returns the value of the 'Is Substitutable' attribute.
>+	 * The default value is <code>"true"</code>.
> 	 * 
> 	 * 
> 	 * 
>@@ -57,7 +58,7 @@
> 	 * @see #unsetIsSubstitutable()
> 	 * @see #setIsSubstitutable(boolean)
> 	 * @see org.eclipse.uml2.uml.UMLPackage#getGeneralization_IsSubstitutable()
>-	 * @model unsettable="true" dataType="org.eclipse.uml2.uml.Boolean" ordered="false"
>+	 * @model default="true" unsettable="true" dataType="org.eclipse.uml2.uml.Boolean" ordered="false"
> 	 * @generated
> 	 */
> 	boolean isSubstitutable();
>Index: src/org/eclipse/uml2/uml/UMLPackage.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLPackage.java,v
>retrieving revision 1.30
>diff -u -r1.30 UMLPackage.java
>--- src/org/eclipse/uml2/uml/UMLPackage.java	21 Apr 2008 13:28:48 -0000	1.30
>+++ src/org/eclipse/uml2/uml/UMLPackage.java	24 Sep 2008 18:40:10 -0000
>@@ -53,7 +53,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	String eNS_URI = "http://www.eclipse.org/uml2/2.1.0/UML"; //$NON-NLS-1$
>+	String eNS_URI = "http://www.eclipse.org/uml2/3.0.0/UML"; //$NON-NLS-1$
> 
> 	/**
> 	 * The package namespace name.
>@@ -1533,7 +1533,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getProfile()
> 	 * @generated
> 	 */
>-	int PROFILE = 71;
>+	int PROFILE = 70;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ClassifierImpl Classifier}' class.
>@@ -1553,7 +1553,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStructuredClassifier()
> 	 * @generated
> 	 */
>-	int STRUCTURED_CLASSIFIER = 65;
>+	int STRUCTURED_CLASSIFIER = 64;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.EncapsulatedClassifierImpl Encapsulated Classifier}' class.
>@@ -1563,7 +1563,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getEncapsulatedClassifier()
> 	 * @generated
> 	 */
>-	int ENCAPSULATED_CLASSIFIER = 64;
>+	int ENCAPSULATED_CLASSIFIER = 63;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ClassImpl Class}' class.
>@@ -1573,7 +1573,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getClass_()
> 	 * @generated
> 	 */
>-	int CLASS = 46;
>+	int CLASS = 45;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.StereotypeImpl Stereotype}' class.
>@@ -1583,7 +1583,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStereotype()
> 	 * @generated
> 	 */
>-	int STEREOTYPE = 69;
>+	int STEREOTYPE = 68;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.BehavioredClassifierImpl Behaviored Classifier}' class.
>@@ -1593,7 +1593,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getBehavioredClassifier()
> 	 * @generated
> 	 */
>-	int BEHAVIORED_CLASSIFIER = 47;
>+	int BEHAVIORED_CLASSIFIER = 46;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.RedefinableElementImpl Redefinable Element}' class.
>@@ -2609,7 +2609,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConnectorEnd()
> 	 * @generated
> 	 */
>-	int CONNECTOR_END = 35;
>+	int CONNECTOR_END = 34;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.StructuralFeatureImpl Structural Feature}' class.
>@@ -2619,7 +2619,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStructuralFeature()
> 	 * @generated
> 	 */
>-	int STRUCTURAL_FEATURE = 76;
>+	int STRUCTURAL_FEATURE = 75;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.PropertyImpl Property}' class.
>@@ -2629,7 +2629,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getProperty()
> 	 * @generated
> 	 */
>-	int PROPERTY = 36;
>+	int PROPERTY = 35;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DeploymentTargetImpl Deployment Target}' class.
>@@ -2639,7 +2639,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDeploymentTarget()
> 	 * @generated
> 	 */
>-	int DEPLOYMENT_TARGET = 37;
>+	int DEPLOYMENT_TARGET = 36;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DeploymentImpl Deployment}' class.
>@@ -2649,7 +2649,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDeployment()
> 	 * @generated
> 	 */
>-	int DEPLOYMENT = 38;
>+	int DEPLOYMENT = 37;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DeployedArtifactImpl Deployed Artifact}' class.
>@@ -2659,7 +2659,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDeployedArtifact()
> 	 * @generated
> 	 */
>-	int DEPLOYED_ARTIFACT = 39;
>+	int DEPLOYED_ARTIFACT = 38;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ArtifactImpl Artifact}' class.
>@@ -2669,7 +2669,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getArtifact()
> 	 * @generated
> 	 */
>-	int ARTIFACT = 41;
>+	int ARTIFACT = 40;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DeploymentSpecificationImpl Deployment Specification}' class.
>@@ -2679,7 +2679,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDeploymentSpecification()
> 	 * @generated
> 	 */
>-	int DEPLOYMENT_SPECIFICATION = 40;
>+	int DEPLOYMENT_SPECIFICATION = 39;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ManifestationImpl Manifestation}' class.
>@@ -2689,7 +2689,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getManifestation()
> 	 * @generated
> 	 */
>-	int MANIFESTATION = 42;
>+	int MANIFESTATION = 41;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.BehavioralFeatureImpl Behavioral Feature}' class.
>@@ -2699,7 +2699,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getBehavioralFeature()
> 	 * @generated
> 	 */
>-	int BEHAVIORAL_FEATURE = 44;
>+	int BEHAVIORAL_FEATURE = 43;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.OperationImpl Operation}' class.
>@@ -2709,7 +2709,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getOperation()
> 	 * @generated
> 	 */
>-	int OPERATION = 43;
>+	int OPERATION = 42;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.BehaviorImpl Behavior}' class.
>@@ -2719,7 +2719,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getBehavior()
> 	 * @generated
> 	 */
>-	int BEHAVIOR = 45;
>+	int BEHAVIOR = 44;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ParameterSetImpl Parameter Set}' class.
>@@ -2729,7 +2729,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getParameterSet()
> 	 * @generated
> 	 */
>-	int PARAMETER_SET = 73;
>+	int PARAMETER_SET = 72;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DataTypeImpl Data Type}' class.
>@@ -2739,7 +2739,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDataType()
> 	 * @generated
> 	 */
>-	int DATA_TYPE = 74;
>+	int DATA_TYPE = 73;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.InterfaceImpl Interface}' class.
>@@ -2749,7 +2749,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInterface()
> 	 * @generated
> 	 */
>-	int INTERFACE = 49;
>+	int INTERFACE = 48;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ReceptionImpl Reception}' class.
>@@ -2759,7 +2759,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReception()
> 	 * @generated
> 	 */
>-	int RECEPTION = 50;
>+	int RECEPTION = 49;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.SignalImpl Signal}' class.
>@@ -2769,7 +2769,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSignal()
> 	 * @generated
> 	 */
>-	int SIGNAL = 51;
>+	int SIGNAL = 50;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.StateMachineImpl State Machine}' class.
>@@ -2779,7 +2779,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStateMachine()
> 	 * @generated
> 	 */
>-	int STATE_MACHINE = 53;
>+	int STATE_MACHINE = 52;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ProtocolStateMachineImpl Protocol State Machine}' class.
>@@ -2789,7 +2789,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getProtocolStateMachine()
> 	 * @generated
> 	 */
>-	int PROTOCOL_STATE_MACHINE = 52;
>+	int PROTOCOL_STATE_MACHINE = 51;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.RegionImpl Region}' class.
>@@ -2799,7 +2799,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getRegion()
> 	 * @generated
> 	 */
>-	int REGION = 54;
>+	int REGION = 53;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.VertexImpl Vertex}' class.
>@@ -2809,7 +2809,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getVertex()
> 	 * @generated
> 	 */
>-	int VERTEX = 55;
>+	int VERTEX = 54;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.TransitionImpl Transition}' class.
>@@ -2819,7 +2819,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTransition()
> 	 * @generated
> 	 */
>-	int TRANSITION = 56;
>+	int TRANSITION = 55;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.TriggerImpl Trigger}' class.
>@@ -2829,7 +2829,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTrigger()
> 	 * @generated
> 	 */
>-	int TRIGGER = 57;
>+	int TRIGGER = 56;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.EventImpl Event}' class.
>@@ -2839,7 +2839,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getEvent()
> 	 * @generated
> 	 */
>-	int EVENT = 58;
>+	int EVENT = 57;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.PortImpl Port}' class.
>@@ -2849,7 +2849,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPort()
> 	 * @generated
> 	 */
>-	int PORT = 59;
>+	int PORT = 58;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.StateImpl State}' class.
>@@ -2859,7 +2859,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getState()
> 	 * @generated
> 	 */
>-	int STATE = 60;
>+	int STATE = 59;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ConnectionPointReferenceImpl Connection Point Reference}' class.
>@@ -2869,7 +2869,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConnectionPointReference()
> 	 * @generated
> 	 */
>-	int CONNECTION_POINT_REFERENCE = 61;
>+	int CONNECTION_POINT_REFERENCE = 60;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.PseudostateImpl Pseudostate}' class.
>@@ -2879,7 +2879,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPseudostate()
> 	 * @generated
> 	 */
>-	int PSEUDOSTATE = 62;
>+	int PSEUDOSTATE = 61;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ProtocolConformanceImpl Protocol Conformance}' class.
>@@ -2889,7 +2889,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getProtocolConformance()
> 	 * @generated
> 	 */
>-	int PROTOCOL_CONFORMANCE = 63;
>+	int PROTOCOL_CONFORMANCE = 62;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.OperationTemplateParameterImpl Operation Template Parameter}' class.
>@@ -2899,7 +2899,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getOperationTemplateParameter()
> 	 * @generated
> 	 */
>-	int OPERATION_TEMPLATE_PARAMETER = 75;
>+	int OPERATION_TEMPLATE_PARAMETER = 74;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.AssociationImpl Association}' class.
>@@ -3866,7 +3866,7 @@
> 	int TEMPLATE_PARAMETER_SUBSTITUTION__FORMAL = ELEMENT_FEATURE_COUNT + 0;
> 
> 	/**
>-	 * The feature id for the 'Actual' reference list.
>+	 * The feature id for the 'Actual' reference.
> 	 * 
> 	 * 
> 	 * @generated
>@@ -3875,7 +3875,7 @@
> 	int TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL = ELEMENT_FEATURE_COUNT + 1;
> 
> 	/**
>-	 * The feature id for the 'Owned Actual' containment reference list.
>+	 * The feature id for the 'Owned Actual' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
>@@ -4314,7 +4314,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConnectableElementTemplateParameter()
> 	 * @generated
> 	 */
>-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER = 34;
>+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER = 76;
> 
> 	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
>@@ -4515,7 +4515,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConnector()
> 	 * @generated
> 	 */
>-	int CONNECTOR = 66;
>+	int CONNECTOR = 65;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.RedefinableTemplateSignatureImpl Redefinable Template Signature}' class.
>@@ -4545,7 +4545,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInterfaceRealization()
> 	 * @generated
> 	 */
>-	int INTERFACE_REALIZATION = 48;
>+	int INTERFACE_REALIZATION = 47;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ExtensionImpl Extension}' class.
>@@ -4555,7 +4555,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExtension()
> 	 * @generated
> 	 */
>-	int EXTENSION = 67;
>+	int EXTENSION = 66;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ExtensionEndImpl Extension End}' class.
>@@ -4565,7 +4565,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExtensionEnd()
> 	 * @generated
> 	 */
>-	int EXTENSION_END = 68;
>+	int EXTENSION_END = 67;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ImageImpl Image}' class.
>@@ -4575,7 +4575,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getImage()
> 	 * @generated
> 	 */
>-	int IMAGE = 70;
>+	int IMAGE = 69;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ExpressionImpl Expression}' class.
>@@ -5165,7 +5165,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCombinedFragment()
> 	 * @generated
> 	 */
>-	int COMBINED_FRAGMENT = 175;
>+	int COMBINED_FRAGMENT = 176;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ContinuationImpl Continuation}' class.
>@@ -5175,7 +5175,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getContinuation()
> 	 * @generated
> 	 */
>-	int CONTINUATION = 176;
>+	int CONTINUATION = 177;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ConsiderIgnoreFragmentImpl Consider Ignore Fragment}' class.
>@@ -5185,7 +5185,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConsiderIgnoreFragment()
> 	 * @generated
> 	 */
>-	int CONSIDER_IGNORE_FRAGMENT = 177;
>+	int CONSIDER_IGNORE_FRAGMENT = 178;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.CallEventImpl Call Event}' class.
>@@ -5235,7 +5235,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCreateObjectAction()
> 	 * @generated
> 	 */
>-	int CREATE_OBJECT_ACTION = 178;
>+	int CREATE_OBJECT_ACTION = 179;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DestroyObjectActionImpl Destroy Object Action}' class.
>@@ -5245,7 +5245,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDestroyObjectAction()
> 	 * @generated
> 	 */
>-	int DESTROY_OBJECT_ACTION = 179;
>+	int DESTROY_OBJECT_ACTION = 180;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.TestIdentityActionImpl Test Identity Action}' class.
>@@ -5255,7 +5255,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTestIdentityAction()
> 	 * @generated
> 	 */
>-	int TEST_IDENTITY_ACTION = 180;
>+	int TEST_IDENTITY_ACTION = 181;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ReadSelfActionImpl Read Self Action}' class.
>@@ -5265,7 +5265,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReadSelfAction()
> 	 * @generated
> 	 */
>-	int READ_SELF_ACTION = 181;
>+	int READ_SELF_ACTION = 182;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.StructuralFeatureActionImpl Structural Feature Action}' class.
>@@ -5275,7 +5275,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStructuralFeatureAction()
> 	 * @generated
> 	 */
>-	int STRUCTURAL_FEATURE_ACTION = 182;
>+	int STRUCTURAL_FEATURE_ACTION = 183;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ReadStructuralFeatureActionImpl Read Structural Feature Action}' class.
>@@ -5285,7 +5285,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReadStructuralFeatureAction()
> 	 * @generated
> 	 */
>-	int READ_STRUCTURAL_FEATURE_ACTION = 183;
>+	int READ_STRUCTURAL_FEATURE_ACTION = 184;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.WriteStructuralFeatureActionImpl Write Structural Feature Action}' class.
>@@ -5295,7 +5295,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getWriteStructuralFeatureAction()
> 	 * @generated
> 	 */
>-	int WRITE_STRUCTURAL_FEATURE_ACTION = 184;
>+	int WRITE_STRUCTURAL_FEATURE_ACTION = 185;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ClearStructuralFeatureActionImpl Clear Structural Feature Action}' class.
>@@ -5305,7 +5305,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getClearStructuralFeatureAction()
> 	 * @generated
> 	 */
>-	int CLEAR_STRUCTURAL_FEATURE_ACTION = 185;
>+	int CLEAR_STRUCTURAL_FEATURE_ACTION = 186;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.RemoveStructuralFeatureValueActionImpl Remove Structural Feature Value Action}' class.
>@@ -5315,7 +5315,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getRemoveStructuralFeatureValueAction()
> 	 * @generated
> 	 */
>-	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION = 186;
>+	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION = 187;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.AddStructuralFeatureValueActionImpl Add Structural Feature Value Action}' class.
>@@ -5325,7 +5325,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getAddStructuralFeatureValueAction()
> 	 * @generated
> 	 */
>-	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION = 187;
>+	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION = 188;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.LinkActionImpl Link Action}' class.
>@@ -5335,7 +5335,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLinkAction()
> 	 * @generated
> 	 */
>-	int LINK_ACTION = 188;
>+	int LINK_ACTION = 189;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.LinkEndDataImpl Link End Data}' class.
>@@ -5345,7 +5345,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLinkEndData()
> 	 * @generated
> 	 */
>-	int LINK_END_DATA = 189;
>+	int LINK_END_DATA = 190;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.QualifierValueImpl Qualifier Value}' class.
>@@ -5355,7 +5355,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getQualifierValue()
> 	 * @generated
> 	 */
>-	int QUALIFIER_VALUE = 190;
>+	int QUALIFIER_VALUE = 191;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ReadLinkActionImpl Read Link Action}' class.
>@@ -5365,7 +5365,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReadLinkAction()
> 	 * @generated
> 	 */
>-	int READ_LINK_ACTION = 191;
>+	int READ_LINK_ACTION = 192;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.LinkEndCreationDataImpl Link End Creation Data}' class.
>@@ -5375,7 +5375,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLinkEndCreationData()
> 	 * @generated
> 	 */
>-	int LINK_END_CREATION_DATA = 192;
>+	int LINK_END_CREATION_DATA = 193;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.WriteLinkActionImpl Write Link Action}' class.
>@@ -5385,7 +5385,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getWriteLinkAction()
> 	 * @generated
> 	 */
>-	int WRITE_LINK_ACTION = 194;
>+	int WRITE_LINK_ACTION = 195;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.CreateLinkActionImpl Create Link Action}' class.
>@@ -5395,7 +5395,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCreateLinkAction()
> 	 * @generated
> 	 */
>-	int CREATE_LINK_ACTION = 193;
>+	int CREATE_LINK_ACTION = 194;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DestroyLinkActionImpl Destroy Link Action}' class.
>@@ -5405,7 +5405,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDestroyLinkAction()
> 	 * @generated
> 	 */
>-	int DESTROY_LINK_ACTION = 195;
>+	int DESTROY_LINK_ACTION = 196;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.LinkEndDestructionDataImpl Link End Destruction Data}' class.
>@@ -5415,7 +5415,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLinkEndDestructionData()
> 	 * @generated
> 	 */
>-	int LINK_END_DESTRUCTION_DATA = 196;
>+	int LINK_END_DESTRUCTION_DATA = 197;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ClearAssociationActionImpl Clear Association Action}' class.
>@@ -5425,7 +5425,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getClearAssociationAction()
> 	 * @generated
> 	 */
>-	int CLEAR_ASSOCIATION_ACTION = 197;
>+	int CLEAR_ASSOCIATION_ACTION = 198;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.InvocationActionImpl Invocation Action}' class.
>@@ -5445,7 +5445,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getBroadcastSignalAction()
> 	 * @generated
> 	 */
>-	int BROADCAST_SIGNAL_ACTION = 198;
>+	int BROADCAST_SIGNAL_ACTION = 199;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.SendObjectActionImpl Send Object Action}' class.
>@@ -5455,7 +5455,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSendObjectAction()
> 	 * @generated
> 	 */
>-	int SEND_OBJECT_ACTION = 199;
>+	int SEND_OBJECT_ACTION = 200;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ValueSpecificationActionImpl Value Specification Action}' class.
>@@ -5465,7 +5465,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getValueSpecificationAction()
> 	 * @generated
> 	 */
>-	int VALUE_SPECIFICATION_ACTION = 200;
>+	int VALUE_SPECIFICATION_ACTION = 201;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.TimeExpressionImpl Time Expression}' class.
>@@ -5475,7 +5475,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTimeExpression()
> 	 * @generated
> 	 */
>-	int TIME_EXPRESSION = 201;
>+	int TIME_EXPRESSION = 202;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DurationImpl Duration}' class.
>@@ -5485,7 +5485,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDuration()
> 	 * @generated
> 	 */
>-	int DURATION = 203;
>+	int DURATION = 204;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ValuePinImpl Value Pin}' class.
>@@ -5505,7 +5505,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInterval()
> 	 * @generated
> 	 */
>-	int INTERVAL = 205;
>+	int INTERVAL = 206;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DurationIntervalImpl Duration Interval}' class.
>@@ -5515,7 +5515,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDurationInterval()
> 	 * @generated
> 	 */
>-	int DURATION_INTERVAL = 204;
>+	int DURATION_INTERVAL = 205;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.IntervalConstraintImpl Interval Constraint}' class.
>@@ -5525,7 +5525,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getIntervalConstraint()
> 	 * @generated
> 	 */
>-	int INTERVAL_CONSTRAINT = 207;
>+	int INTERVAL_CONSTRAINT = 208;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.TimeConstraintImpl Time Constraint}' class.
>@@ -5535,7 +5535,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTimeConstraint()
> 	 * @generated
> 	 */
>-	int TIME_CONSTRAINT = 206;
>+	int TIME_CONSTRAINT = 207;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.TimeIntervalImpl Time Interval}' class.
>@@ -5545,7 +5545,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTimeInterval()
> 	 * @generated
> 	 */
>-	int TIME_INTERVAL = 208;
>+	int TIME_INTERVAL = 209;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DurationConstraintImpl Duration Constraint}' class.
>@@ -5555,7 +5555,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDurationConstraint()
> 	 * @generated
> 	 */
>-	int DURATION_CONSTRAINT = 209;
>+	int DURATION_CONSTRAINT = 210;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.OpaqueActionImpl Opaque Action}' class.
>@@ -5615,7 +5615,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInformationItem()
> 	 * @generated
> 	 */
>-	int INFORMATION_ITEM = 222;
>+	int INFORMATION_ITEM = 223;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.InformationFlowImpl Information Flow}' class.
>@@ -5625,7 +5625,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInformationFlow()
> 	 * @generated
> 	 */
>-	int INFORMATION_FLOW = 223;
>+	int INFORMATION_FLOW = 224;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ModelImpl Model}' class.
>@@ -5635,7 +5635,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getModel()
> 	 * @generated
> 	 */
>-	int MODEL = 72;
>+	int MODEL = 71;
> 
> 	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
>@@ -6661,96 +6661,6 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__EANNOTATIONS = TEMPLATE_PARAMETER__EANNOTATIONS;
>-
>-	/**
>-	 * The feature id for the 'Owned Element' reference list.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_ELEMENT = TEMPLATE_PARAMETER__OWNED_ELEMENT;
>-
>-	/**
>-	 * The feature id for the 'Owner' reference.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNER = TEMPLATE_PARAMETER__OWNER;
>-
>-	/**
>-	 * The feature id for the 'Owned Comment' containment reference list.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_COMMENT = TEMPLATE_PARAMETER__OWNED_COMMENT;
>-
>-	/**
>-	 * The feature id for the 'Signature' container reference.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__SIGNATURE = TEMPLATE_PARAMETER__SIGNATURE;
>-
>-	/**
>-	 * The feature id for the 'Parametered Element' reference.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT = TEMPLATE_PARAMETER__PARAMETERED_ELEMENT;
>-
>-	/**
>-	 * The feature id for the 'Owned Parametered Element' containment reference.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT = TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT;
>-
>-	/**
>-	 * The feature id for the 'Default' reference.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__DEFAULT = TEMPLATE_PARAMETER__DEFAULT;
>-
>-	/**
>-	 * The feature id for the 'Owned Default' containment reference.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_DEFAULT = TEMPLATE_PARAMETER__OWNED_DEFAULT;
>-
>-	/**
>-	 * The number of structural features of the 'Connectable Element Template Parameter' class.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER_FEATURE_COUNT = TEMPLATE_PARAMETER_FEATURE_COUNT + 0;
>-
>-	/**
>-	 * The feature id for the 'EAnnotations' containment reference list.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
> 	int CONNECTOR_END__EANNOTATIONS = MULTIPLICITY_ELEMENT__EANNOTATIONS;
> 
> 	/**
>@@ -6844,22 +6754,22 @@
> 	int CONNECTOR_END__DEFINING_END = MULTIPLICITY_ELEMENT_FEATURE_COUNT + 0;
> 
> 	/**
>-	 * The feature id for the 'Part With Port' reference.
>+	 * The feature id for the 'Role' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int CONNECTOR_END__PART_WITH_PORT = MULTIPLICITY_ELEMENT_FEATURE_COUNT + 1;
>+	int CONNECTOR_END__ROLE = MULTIPLICITY_ELEMENT_FEATURE_COUNT + 1;
> 
> 	/**
>-	 * The feature id for the 'Role' reference.
>+	 * The feature id for the 'Part With Port' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int CONNECTOR_END__ROLE = MULTIPLICITY_ELEMENT_FEATURE_COUNT + 2;
>+	int CONNECTOR_END__PART_WITH_PORT = MULTIPLICITY_ELEMENT_FEATURE_COUNT + 2;
> 
> 	/**
> 	 * The number of structural features of the 'Connector End' class.
>@@ -7339,33 +7249,13 @@
> 	int PROPERTY__DEPLOYED_ELEMENT = STRUCTURAL_FEATURE_FEATURE_COUNT + 4;
> 
> 	/**
>-	 * The feature id for the 'Template Binding' containment reference list.
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int PROPERTY__TEMPLATE_BINDING = STRUCTURAL_FEATURE_FEATURE_COUNT + 5;
>-
>-	/**
>-	 * The feature id for the 'Owned Template Signature' containment reference.
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int PROPERTY__OWNED_TEMPLATE_SIGNATURE = STRUCTURAL_FEATURE_FEATURE_COUNT + 6;
>-
>-	/**
> 	 * The feature id for the 'Class' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__CLASS = STRUCTURAL_FEATURE_FEATURE_COUNT + 7;
>+	int PROPERTY__CLASS = STRUCTURAL_FEATURE_FEATURE_COUNT + 5;
> 
> 	/**
> 	 * The feature id for the 'Datatype' container reference.
>@@ -7374,7 +7264,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__DATATYPE = STRUCTURAL_FEATURE_FEATURE_COUNT + 8;
>+	int PROPERTY__DATATYPE = STRUCTURAL_FEATURE_FEATURE_COUNT + 6;
> 
> 	/**
> 	 * The feature id for the 'Is Derived' attribute.
>@@ -7383,7 +7273,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__IS_DERIVED = STRUCTURAL_FEATURE_FEATURE_COUNT + 9;
>+	int PROPERTY__IS_DERIVED = STRUCTURAL_FEATURE_FEATURE_COUNT + 7;
> 
> 	/**
> 	 * The feature id for the 'Is Derived Union' attribute.
>@@ -7392,7 +7282,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__IS_DERIVED_UNION = STRUCTURAL_FEATURE_FEATURE_COUNT + 10;
>+	int PROPERTY__IS_DERIVED_UNION = STRUCTURAL_FEATURE_FEATURE_COUNT + 8;
> 
> 	/**
> 	 * The feature id for the 'Default' attribute.
>@@ -7401,7 +7291,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__DEFAULT = STRUCTURAL_FEATURE_FEATURE_COUNT + 11;
>+	int PROPERTY__DEFAULT = STRUCTURAL_FEATURE_FEATURE_COUNT + 9;
> 
> 	/**
> 	 * The feature id for the 'Aggregation' attribute.
>@@ -7410,7 +7300,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__AGGREGATION = STRUCTURAL_FEATURE_FEATURE_COUNT + 12;
>+	int PROPERTY__AGGREGATION = STRUCTURAL_FEATURE_FEATURE_COUNT + 10;
> 
> 	/**
> 	 * The feature id for the 'Is Composite' attribute.
>@@ -7419,7 +7309,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__IS_COMPOSITE = STRUCTURAL_FEATURE_FEATURE_COUNT + 13;
>+	int PROPERTY__IS_COMPOSITE = STRUCTURAL_FEATURE_FEATURE_COUNT + 11;
> 
> 	/**
> 	 * The feature id for the 'Redefined Property' reference list.
>@@ -7428,7 +7318,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__REDEFINED_PROPERTY = STRUCTURAL_FEATURE_FEATURE_COUNT + 14;
>+	int PROPERTY__REDEFINED_PROPERTY = STRUCTURAL_FEATURE_FEATURE_COUNT + 12;
> 
> 	/**
> 	 * The feature id for the 'Owning Association' container reference.
>@@ -7437,7 +7327,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__OWNING_ASSOCIATION = STRUCTURAL_FEATURE_FEATURE_COUNT + 15;
>+	int PROPERTY__OWNING_ASSOCIATION = STRUCTURAL_FEATURE_FEATURE_COUNT + 13;
> 
> 	/**
> 	 * The feature id for the 'Default Value' containment reference.
>@@ -7446,7 +7336,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__DEFAULT_VALUE = STRUCTURAL_FEATURE_FEATURE_COUNT + 16;
>+	int PROPERTY__DEFAULT_VALUE = STRUCTURAL_FEATURE_FEATURE_COUNT + 14;
> 
> 	/**
> 	 * The feature id for the 'Opposite' reference.
>@@ -7455,7 +7345,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__OPPOSITE = STRUCTURAL_FEATURE_FEATURE_COUNT + 17;
>+	int PROPERTY__OPPOSITE = STRUCTURAL_FEATURE_FEATURE_COUNT + 15;
> 
> 	/**
> 	 * The feature id for the 'Subsetted Property' reference list.
>@@ -7464,7 +7354,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__SUBSETTED_PROPERTY = STRUCTURAL_FEATURE_FEATURE_COUNT + 18;
>+	int PROPERTY__SUBSETTED_PROPERTY = STRUCTURAL_FEATURE_FEATURE_COUNT + 16;
> 
> 	/**
> 	 * The feature id for the 'Association' reference.
>@@ -7473,7 +7363,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__ASSOCIATION = STRUCTURAL_FEATURE_FEATURE_COUNT + 19;
>+	int PROPERTY__ASSOCIATION = STRUCTURAL_FEATURE_FEATURE_COUNT + 17;
> 
> 	/**
> 	 * The feature id for the 'Qualifier' containment reference list.
>@@ -7482,7 +7372,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__QUALIFIER = STRUCTURAL_FEATURE_FEATURE_COUNT + 20;
>+	int PROPERTY__QUALIFIER = STRUCTURAL_FEATURE_FEATURE_COUNT + 18;
> 
> 	/**
> 	 * The feature id for the 'Association End' container reference.
>@@ -7491,7 +7381,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY__ASSOCIATION_END = STRUCTURAL_FEATURE_FEATURE_COUNT + 21;
>+	int PROPERTY__ASSOCIATION_END = STRUCTURAL_FEATURE_FEATURE_COUNT + 19;
> 
> 	/**
> 	 * The number of structural features of the 'Property' class.
>@@ -7500,7 +7390,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROPERTY_FEATURE_COUNT = STRUCTURAL_FEATURE_FEATURE_COUNT + 22;
>+	int PROPERTY_FEATURE_COUNT = STRUCTURAL_FEATURE_FEATURE_COUNT + 20;
> 
> 	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
>@@ -14406,22 +14296,22 @@
> 	int VERTEX__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
> 
> 	/**
>-	 * The feature id for the 'Incoming' reference list.
>+	 * The feature id for the 'Outgoing' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int VERTEX__INCOMING = NAMED_ELEMENT_FEATURE_COUNT + 0;
>+	int VERTEX__OUTGOING = NAMED_ELEMENT_FEATURE_COUNT + 0;
> 
> 	/**
>-	 * The feature id for the 'Outgoing' reference list.
>+	 * The feature id for the 'Incoming' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int VERTEX__OUTGOING = NAMED_ELEMENT_FEATURE_COUNT + 1;
>+	int VERTEX__INCOMING = NAMED_ELEMENT_FEATURE_COUNT + 1;
> 
> 	/**
> 	 * The feature id for the 'Container' container reference.
>@@ -14631,58 +14521,58 @@
> 	int TRANSITION__CONTAINER = NAMESPACE_FEATURE_COUNT + 4;
> 
> 	/**
>-	 * The feature id for the 'Redefined Transition' reference.
>+	 * The feature id for the 'Source' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int TRANSITION__REDEFINED_TRANSITION = NAMESPACE_FEATURE_COUNT + 5;
>+	int TRANSITION__SOURCE = NAMESPACE_FEATURE_COUNT + 5;
> 
> 	/**
>-	 * The feature id for the 'Guard' reference.
>+	 * The feature id for the 'Target' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int TRANSITION__GUARD = NAMESPACE_FEATURE_COUNT + 6;
>+	int TRANSITION__TARGET = NAMESPACE_FEATURE_COUNT + 6;
> 
> 	/**
>-	 * The feature id for the 'Effect' containment reference.
>+	 * The feature id for the 'Redefined Transition' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int TRANSITION__EFFECT = NAMESPACE_FEATURE_COUNT + 7;
>+	int TRANSITION__REDEFINED_TRANSITION = NAMESPACE_FEATURE_COUNT + 7;
> 
> 	/**
>-	 * The feature id for the 'Trigger' containment reference list.
>+	 * The feature id for the 'Guard' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int TRANSITION__TRIGGER = NAMESPACE_FEATURE_COUNT + 8;
>+	int TRANSITION__GUARD = NAMESPACE_FEATURE_COUNT + 8;
> 
> 	/**
>-	 * The feature id for the 'Target' reference.
>+	 * The feature id for the 'Effect' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int TRANSITION__TARGET = NAMESPACE_FEATURE_COUNT + 9;
>+	int TRANSITION__EFFECT = NAMESPACE_FEATURE_COUNT + 9;
> 
> 	/**
>-	 * The feature id for the 'Source' reference.
>+	 * The feature id for the 'Trigger' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int TRANSITION__SOURCE = NAMESPACE_FEATURE_COUNT + 10;
>+	int TRANSITION__TRIGGER = NAMESPACE_FEATURE_COUNT + 10;
> 
> 	/**
> 	 * The number of structural features of the 'Transition' class.
>@@ -15180,26 +15070,6 @@
> 	int PORT__DEPLOYED_ELEMENT = PROPERTY__DEPLOYED_ELEMENT;
> 
> 	/**
>-	 * The feature id for the 'Template Binding' containment reference list.
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int PORT__TEMPLATE_BINDING = PROPERTY__TEMPLATE_BINDING;
>-
>-	/**
>-	 * The feature id for the 'Owned Template Signature' containment reference.
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int PORT__OWNED_TEMPLATE_SIGNATURE = PROPERTY__OWNED_TEMPLATE_SIGNATURE;
>-
>-	/**
> 	 * The feature id for the 'Class' reference.
> 	 * 
> 	 * 
>@@ -15569,22 +15439,22 @@
> 	int STATE__REDEFINITION_CONTEXT = NAMESPACE_FEATURE_COUNT + 2;
> 
> 	/**
>-	 * The feature id for the 'Incoming' reference list.
>+	 * The feature id for the 'Outgoing' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int STATE__INCOMING = NAMESPACE_FEATURE_COUNT + 3;
>+	int STATE__OUTGOING = NAMESPACE_FEATURE_COUNT + 3;
> 
> 	/**
>-	 * The feature id for the 'Outgoing' reference list.
>+	 * The feature id for the 'Incoming' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int STATE__OUTGOING = NAMESPACE_FEATURE_COUNT + 4;
>+	int STATE__INCOMING = NAMESPACE_FEATURE_COUNT + 4;
> 
> 	/**
> 	 * The feature id for the 'Container' container reference.
>@@ -15821,22 +15691,22 @@
> 	int CONNECTION_POINT_REFERENCE__NAME_EXPRESSION = VERTEX__NAME_EXPRESSION;
> 
> 	/**
>-	 * The feature id for the 'Incoming' reference list.
>+	 * The feature id for the 'Outgoing' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int CONNECTION_POINT_REFERENCE__INCOMING = VERTEX__INCOMING;
>+	int CONNECTION_POINT_REFERENCE__OUTGOING = VERTEX__OUTGOING;
> 
> 	/**
>-	 * The feature id for the 'Outgoing' reference list.
>+	 * The feature id for the 'Incoming' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int CONNECTION_POINT_REFERENCE__OUTGOING = VERTEX__OUTGOING;
>+	int CONNECTION_POINT_REFERENCE__INCOMING = VERTEX__INCOMING;
> 
> 	/**
> 	 * The feature id for the 'Container' container reference.
>@@ -15974,22 +15844,22 @@
> 	int PSEUDOSTATE__NAME_EXPRESSION = VERTEX__NAME_EXPRESSION;
> 
> 	/**
>-	 * The feature id for the 'Incoming' reference list.
>+	 * The feature id for the 'Outgoing' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PSEUDOSTATE__INCOMING = VERTEX__INCOMING;
>+	int PSEUDOSTATE__OUTGOING = VERTEX__OUTGOING;
> 
> 	/**
>-	 * The feature id for the 'Outgoing' reference list.
>+	 * The feature id for the 'Incoming' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PSEUDOSTATE__OUTGOING = VERTEX__OUTGOING;
>+	int PSEUDOSTATE__INCOMING = VERTEX__INCOMING;
> 
> 	/**
> 	 * The feature id for the 'Container' container reference.
>@@ -16982,26 +16852,6 @@
> 	int EXTENSION_END__DEPLOYED_ELEMENT = PROPERTY__DEPLOYED_ELEMENT;
> 
> 	/**
>-	 * The feature id for the 'Template Binding' containment reference list.
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int EXTENSION_END__TEMPLATE_BINDING = PROPERTY__TEMPLATE_BINDING;
>-
>-	/**
>-	 * The feature id for the 'Owned Template Signature' containment reference.
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int EXTENSION_END__OWNED_TEMPLATE_SIGNATURE = PROPERTY__OWNED_TEMPLATE_SIGNATURE;
>-
>-	/**
> 	 * The feature id for the 'Class' reference.
> 	 * 
> 	 * 
>@@ -18799,6 +18649,96 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__EANNOTATIONS = TEMPLATE_PARAMETER__EANNOTATIONS;
>+
>+	/**
>+	 * The feature id for the 'Owned Element' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_ELEMENT = TEMPLATE_PARAMETER__OWNED_ELEMENT;
>+
>+	/**
>+	 * The feature id for the 'Owner' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNER = TEMPLATE_PARAMETER__OWNER;
>+
>+	/**
>+	 * The feature id for the 'Owned Comment' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_COMMENT = TEMPLATE_PARAMETER__OWNED_COMMENT;
>+
>+	/**
>+	 * The feature id for the 'Signature' container reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__SIGNATURE = TEMPLATE_PARAMETER__SIGNATURE;
>+
>+	/**
>+	 * The feature id for the 'Parametered Element' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT = TEMPLATE_PARAMETER__PARAMETERED_ELEMENT;
>+
>+	/**
>+	 * The feature id for the 'Owned Parametered Element' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT = TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT;
>+
>+	/**
>+	 * The feature id for the 'Default' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__DEFAULT = TEMPLATE_PARAMETER__DEFAULT;
>+
>+	/**
>+	 * The feature id for the 'Owned Default' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_DEFAULT = TEMPLATE_PARAMETER__OWNED_DEFAULT;
>+
>+	/**
>+	 * The number of structural features of the 'Connectable Element Template Parameter' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER_FEATURE_COUNT = TEMPLATE_PARAMETER_FEATURE_COUNT + 0;
>+
>+	/**
>+	 * The feature id for the 'EAnnotations' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
> 	int COLLABORATION_USE__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
> 
> 	/**
>@@ -20458,22 +20398,13 @@
> 	int CLASSIFIER_TEMPLATE_PARAMETER__ALLOW_SUBSTITUTABLE = TEMPLATE_PARAMETER_FEATURE_COUNT + 0;
> 
> 	/**
>-	 * The feature id for the 'Default Classifier' reference.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int CLASSIFIER_TEMPLATE_PARAMETER__DEFAULT_CLASSIFIER = TEMPLATE_PARAMETER_FEATURE_COUNT + 1;
>-
>-	/**
>-	 * The feature id for the 'Constraining Classifier' reference.
>+	 * The feature id for the 'Constraining Classifier' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER = TEMPLATE_PARAMETER_FEATURE_COUNT + 2;
>+	int CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER = TEMPLATE_PARAMETER_FEATURE_COUNT + 1;
> 
> 	/**
> 	 * The number of structural features of the 'Classifier Template Parameter' class.
>@@ -20482,7 +20413,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int CLASSIFIER_TEMPLATE_PARAMETER_FEATURE_COUNT = TEMPLATE_PARAMETER_FEATURE_COUNT + 3;
>+	int CLASSIFIER_TEMPLATE_PARAMETER_FEATURE_COUNT = TEMPLATE_PARAMETER_FEATURE_COUNT + 2;
> 
> 	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
>@@ -20816,7 +20747,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getObservation()
> 	 * @generated
> 	 */
>-	int OBSERVATION = 202;
>+	int OBSERVATION = 203;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.TimeObservationImpl Time Observation}' class.
>@@ -20826,7 +20757,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTimeObservation()
> 	 * @generated
> 	 */
>-	int TIME_OBSERVATION = 210;
>+	int TIME_OBSERVATION = 211;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DurationObservationImpl Duration Observation}' class.
>@@ -20836,7 +20767,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDurationObservation()
> 	 * @generated
> 	 */
>-	int DURATION_OBSERVATION = 211;
>+	int DURATION_OBSERVATION = 212;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.VariableActionImpl Variable Action}' class.
>@@ -20846,7 +20777,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getVariableAction()
> 	 * @generated
> 	 */
>-	int VARIABLE_ACTION = 214;
>+	int VARIABLE_ACTION = 215;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ReadVariableActionImpl Read Variable Action}' class.
>@@ -20856,7 +20787,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReadVariableAction()
> 	 * @generated
> 	 */
>-	int READ_VARIABLE_ACTION = 215;
>+	int READ_VARIABLE_ACTION = 216;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.WriteVariableActionImpl Write Variable Action}' class.
>@@ -20866,7 +20797,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getWriteVariableAction()
> 	 * @generated
> 	 */
>-	int WRITE_VARIABLE_ACTION = 216;
>+	int WRITE_VARIABLE_ACTION = 217;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ClearVariableActionImpl Clear Variable Action}' class.
>@@ -20876,7 +20807,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getClearVariableAction()
> 	 * @generated
> 	 */
>-	int CLEAR_VARIABLE_ACTION = 217;
>+	int CLEAR_VARIABLE_ACTION = 218;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.AddVariableValueActionImpl Add Variable Value Action}' class.
>@@ -20886,7 +20817,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getAddVariableValueAction()
> 	 * @generated
> 	 */
>-	int ADD_VARIABLE_VALUE_ACTION = 218;
>+	int ADD_VARIABLE_VALUE_ACTION = 219;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.RemoveVariableValueActionImpl Remove Variable Value Action}' class.
>@@ -20896,7 +20827,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getRemoveVariableValueAction()
> 	 * @generated
> 	 */
>-	int REMOVE_VARIABLE_VALUE_ACTION = 219;
>+	int REMOVE_VARIABLE_VALUE_ACTION = 220;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.RaiseExceptionActionImpl Raise Exception Action}' class.
>@@ -20906,7 +20837,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getRaiseExceptionAction()
> 	 * @generated
> 	 */
>-	int RAISE_EXCEPTION_ACTION = 220;
>+	int RAISE_EXCEPTION_ACTION = 221;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ActionInputPinImpl Action Input Pin}' class.
>@@ -20916,7 +20847,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActionInputPin()
> 	 * @generated
> 	 */
>-	int ACTION_INPUT_PIN = 221;
>+	int ACTION_INPUT_PIN = 222;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ReadExtentActionImpl Read Extent Action}' class.
>@@ -20926,7 +20857,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReadExtentAction()
> 	 * @generated
> 	 */
>-	int READ_EXTENT_ACTION = 224;
>+	int READ_EXTENT_ACTION = 225;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ReclassifyObjectActionImpl Reclassify Object Action}' class.
>@@ -20936,7 +20867,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReclassifyObjectAction()
> 	 * @generated
> 	 */
>-	int RECLASSIFY_OBJECT_ACTION = 225;
>+	int RECLASSIFY_OBJECT_ACTION = 226;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ReadIsClassifiedObjectActionImpl Read Is Classified Object Action}' class.
>@@ -20946,7 +20877,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReadIsClassifiedObjectAction()
> 	 * @generated
> 	 */
>-	int READ_IS_CLASSIFIED_OBJECT_ACTION = 226;
>+	int READ_IS_CLASSIFIED_OBJECT_ACTION = 227;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.StartClassifierBehaviorActionImpl Start Classifier Behavior Action}' class.
>@@ -20956,7 +20887,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStartClassifierBehaviorAction()
> 	 * @generated
> 	 */
>-	int START_CLASSIFIER_BEHAVIOR_ACTION = 227;
>+	int START_CLASSIFIER_BEHAVIOR_ACTION = 228;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ReadLinkObjectEndActionImpl Read Link Object End Action}' class.
>@@ -20966,7 +20897,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReadLinkObjectEndAction()
> 	 * @generated
> 	 */
>-	int READ_LINK_OBJECT_END_ACTION = 228;
>+	int READ_LINK_OBJECT_END_ACTION = 229;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ReadLinkObjectEndQualifierActionImpl Read Link Object End Qualifier Action}' class.
>@@ -20976,7 +20907,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReadLinkObjectEndQualifierAction()
> 	 * @generated
> 	 */
>-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION = 229;
>+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION = 230;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.CreateLinkObjectActionImpl Create Link Object Action}' class.
>@@ -20986,7 +20917,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCreateLinkObjectAction()
> 	 * @generated
> 	 */
>-	int CREATE_LINK_OBJECT_ACTION = 230;
>+	int CREATE_LINK_OBJECT_ACTION = 231;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.AcceptEventActionImpl Accept Event Action}' class.
>@@ -20996,7 +20927,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getAcceptEventAction()
> 	 * @generated
> 	 */
>-	int ACCEPT_EVENT_ACTION = 231;
>+	int ACCEPT_EVENT_ACTION = 232;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.AcceptCallActionImpl Accept Call Action}' class.
>@@ -21006,7 +20937,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getAcceptCallAction()
> 	 * @generated
> 	 */
>-	int ACCEPT_CALL_ACTION = 232;
>+	int ACCEPT_CALL_ACTION = 233;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ReplyActionImpl Reply Action}' class.
>@@ -21016,7 +20947,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReplyAction()
> 	 * @generated
> 	 */
>-	int REPLY_ACTION = 233;
>+	int REPLY_ACTION = 234;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.UnmarshallActionImpl Unmarshall Action}' class.
>@@ -21026,7 +20957,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getUnmarshallAction()
> 	 * @generated
> 	 */
>-	int UNMARSHALL_ACTION = 234;
>+	int UNMARSHALL_ACTION = 235;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ReduceActionImpl Reduce Action}' class.
>@@ -21036,7 +20967,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReduceAction()
> 	 * @generated
> 	 */
>-	int REDUCE_ACTION = 235;
>+	int REDUCE_ACTION = 236;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ControlNodeImpl Control Node}' class.
>@@ -21146,7 +21077,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActivityFinalNode()
> 	 * @generated
> 	 */
>-	int ACTIVITY_FINAL_NODE = 168;
>+	int ACTIVITY_FINAL_NODE = 169;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.JoinNodeImpl Join Node}' class.
>@@ -21156,7 +21087,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getJoinNode()
> 	 * @generated
> 	 */
>-	int JOIN_NODE = 236;
>+	int JOIN_NODE = 238;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DataStoreNodeImpl Data Store Node}' class.
>@@ -21166,7 +21097,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDataStoreNode()
> 	 * @generated
> 	 */
>-	int DATA_STORE_NODE = 237;
>+	int DATA_STORE_NODE = 239;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ObjectFlowImpl Object Flow}' class.
>@@ -21176,7 +21107,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getObjectFlow()
> 	 * @generated
> 	 */
>-	int OBJECT_FLOW = 238;
>+	int OBJECT_FLOW = 168;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.SequenceNodeImpl Sequence Node}' class.
>@@ -38154,470 +38085,801 @@
> 	int DECISION_NODE__DECISION_INPUT = CONTROL_NODE_FEATURE_COUNT + 0;
> 
> 	/**
>-	 * The number of structural features of the 'Decision Node' class.
>+	 * The feature id for the 'Decision Input Flow' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DECISION_NODE_FEATURE_COUNT = CONTROL_NODE_FEATURE_COUNT + 1;
>+	int DECISION_NODE__DECISION_INPUT_FLOW = CONTROL_NODE_FEATURE_COUNT + 1;
> 
> 	/**
>-	 * The feature id for the 'EAnnotations' containment reference list.
>+	 * The number of structural features of the 'Decision Node' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__EANNOTATIONS = FINAL_NODE__EANNOTATIONS;
>+	int DECISION_NODE_FEATURE_COUNT = CONTROL_NODE_FEATURE_COUNT + 2;
> 
> 	/**
>-	 * The feature id for the 'Owned Element' reference list.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ConditionalNodeImpl Conditional Node}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.ConditionalNodeImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConditionalNode()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__OWNED_ELEMENT = FINAL_NODE__OWNED_ELEMENT;
>+	int CONDITIONAL_NODE = 240;
> 
> 	/**
>-	 * The feature id for the 'Owner' reference.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ClauseImpl Clause}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.ClauseImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getClause()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__OWNER = FINAL_NODE__OWNER;
>+	int CLAUSE = 241;
> 
> 	/**
>-	 * The feature id for the 'Owned Comment' containment reference list.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.LoopNodeImpl Loop Node}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.LoopNodeImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLoopNode()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__OWNED_COMMENT = FINAL_NODE__OWNED_COMMENT;
>+	int LOOP_NODE = 242;
> 
> 	/**
>-	 * The feature id for the 'Name' attribute.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ExpansionNodeImpl Expansion Node}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.ExpansionNodeImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExpansionNode()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__NAME = FINAL_NODE__NAME;
>+	int EXPANSION_NODE = 243;
> 
> 	/**
>-	 * The feature id for the 'Visibility' attribute.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ExpansionRegionImpl Expansion Region}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.ExpansionRegionImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExpansionRegion()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__VISIBILITY = FINAL_NODE__VISIBILITY;
>+	int EXPANSION_REGION = 244;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ComponentRealizationImpl Component Realization}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.ComponentRealizationImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getComponentRealization()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__QUALIFIED_NAME = FINAL_NODE__QUALIFIED_NAME;
>+	int COMPONENT_REALIZATION = 170;
> 
> 	/**
>-	 * The feature id for the 'Client Dependency' reference list.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ComponentImpl Component}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.ComponentImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getComponent()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__CLIENT_DEPENDENCY = FINAL_NODE__CLIENT_DEPENDENCY;
>+	int COMPONENT = 171;
> 
> 	/**
>-	 * The feature id for the 'Namespace' reference.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.NodeImpl Node}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.NodeImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getNode()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__NAMESPACE = FINAL_NODE__NAMESPACE;
>+	int NODE = 172;
> 
> 	/**
>-	 * The feature id for the 'Name Expression' containment reference.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DeviceImpl Device}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.DeviceImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDevice()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__NAME_EXPRESSION = FINAL_NODE__NAME_EXPRESSION;
>+	int DEVICE = 174;
> 
> 	/**
>-	 * The feature id for the 'Is Leaf' attribute.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ExecutionEnvironmentImpl Execution Environment}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.ExecutionEnvironmentImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExecutionEnvironment()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__IS_LEAF = FINAL_NODE__IS_LEAF;
>+	int EXECUTION_ENVIRONMENT = 175;
> 
> 	/**
>-	 * The feature id for the 'Redefined Element' reference list.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.CommunicationPathImpl Communication Path}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.CommunicationPathImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCommunicationPath()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__REDEFINED_ELEMENT = FINAL_NODE__REDEFINED_ELEMENT;
>+	int COMMUNICATION_PATH = 173;
> 
> 	/**
>-	 * The feature id for the 'Redefinition Context' reference list.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.FinalStateImpl Final State}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.FinalStateImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getFinalState()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__REDEFINITION_CONTEXT = FINAL_NODE__REDEFINITION_CONTEXT;
>+	int FINAL_STATE = 213;
> 
> 	/**
>-	 * The feature id for the 'In Structured Node' container reference.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.TimeEventImpl Time Event}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.TimeEventImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTimeEvent()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__IN_STRUCTURED_NODE = FINAL_NODE__IN_STRUCTURED_NODE;
>+	int TIME_EVENT = 214;
> 
> 	/**
>-	 * The feature id for the 'Activity' container reference.
>+	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.StartObjectBehaviorActionImpl Start Object Behavior Action}' class.
> 	 * 
> 	 * 
>+	 * @see org.eclipse.uml2.uml.internal.impl.StartObjectBehaviorActionImpl
>+	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStartObjectBehaviorAction()
> 	 * @generated
>-	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__ACTIVITY = FINAL_NODE__ACTIVITY;
>+	int START_OBJECT_BEHAVIOR_ACTION = 237;
> 
> 	/**
>-	 * The feature id for the 'Outgoing' reference list.
>+	 * The feature id for the 'EAnnotations' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__OUTGOING = FINAL_NODE__OUTGOING;
>+	int OBJECT_FLOW__EANNOTATIONS = ACTIVITY_EDGE__EANNOTATIONS;
> 
> 	/**
>-	 * The feature id for the 'Incoming' reference list.
>+	 * The feature id for the 'Owned Element' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__INCOMING = FINAL_NODE__INCOMING;
>+	int OBJECT_FLOW__OWNED_ELEMENT = ACTIVITY_EDGE__OWNED_ELEMENT;
> 
> 	/**
>-	 * The feature id for the 'In Partition' reference list.
>+	 * The feature id for the 'Owner' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__IN_PARTITION = FINAL_NODE__IN_PARTITION;
>+	int OBJECT_FLOW__OWNER = ACTIVITY_EDGE__OWNER;
> 
> 	/**
>-	 * The feature id for the 'In Interruptible Region' reference list.
>+	 * The feature id for the 'Owned Comment' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__IN_INTERRUPTIBLE_REGION = FINAL_NODE__IN_INTERRUPTIBLE_REGION;
>+	int OBJECT_FLOW__OWNED_COMMENT = ACTIVITY_EDGE__OWNED_COMMENT;
> 
> 	/**
>-	 * The feature id for the 'In Group' reference list.
>+	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__IN_GROUP = FINAL_NODE__IN_GROUP;
>+	int OBJECT_FLOW__NAME = ACTIVITY_EDGE__NAME;
> 
> 	/**
>-	 * The feature id for the 'Redefined Node' reference list.
>+	 * The feature id for the 'Visibility' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE__REDEFINED_NODE = FINAL_NODE__REDEFINED_NODE;
>+	int OBJECT_FLOW__VISIBILITY = ACTIVITY_EDGE__VISIBILITY;
> 
> 	/**
>-	 * The number of structural features of the 'Activity Final Node' class.
>+	 * The feature id for the 'Qualified Name' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ACTIVITY_FINAL_NODE_FEATURE_COUNT = FINAL_NODE_FEATURE_COUNT + 0;
>+	int OBJECT_FLOW__QUALIFIED_NAME = ACTIVITY_EDGE__QUALIFIED_NAME;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ConditionalNodeImpl Conditional Node}' class.
>+	 * The feature id for the 'Client Dependency' reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.uml2.uml.internal.impl.ConditionalNodeImpl
>-	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConditionalNode()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int CONDITIONAL_NODE = 239;
>+	int OBJECT_FLOW__CLIENT_DEPENDENCY = ACTIVITY_EDGE__CLIENT_DEPENDENCY;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ClauseImpl Clause}' class.
>+	 * The feature id for the 'Namespace' reference.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.uml2.uml.internal.impl.ClauseImpl
>-	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getClause()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int CLAUSE = 240;
>+	int OBJECT_FLOW__NAMESPACE = ACTIVITY_EDGE__NAMESPACE;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.LoopNodeImpl Loop Node}' class.
>+	 * The feature id for the 'Name Expression' containment reference.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.uml2.uml.internal.impl.LoopNodeImpl
>-	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLoopNode()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int LOOP_NODE = 241;
>+	int OBJECT_FLOW__NAME_EXPRESSION = ACTIVITY_EDGE__NAME_EXPRESSION;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ExpansionNodeImpl Expansion Node}' class.
>+	 * The feature id for the 'Is Leaf' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.uml2.uml.internal.impl.ExpansionNodeImpl
>-	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExpansionNode()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int EXPANSION_NODE = 242;
>+	int OBJECT_FLOW__IS_LEAF = ACTIVITY_EDGE__IS_LEAF;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ExpansionRegionImpl Expansion Region}' class.
>+	 * The feature id for the 'Redefined Element' reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.uml2.uml.internal.impl.ExpansionRegionImpl
>-	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExpansionRegion()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int EXPANSION_REGION = 243;
>+	int OBJECT_FLOW__REDEFINED_ELEMENT = ACTIVITY_EDGE__REDEFINED_ELEMENT;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ComponentRealizationImpl Component Realization}' class.
>+	 * The feature id for the 'Redefinition Context' reference list.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.uml2.uml.internal.impl.ComponentRealizationImpl
>-	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getComponentRealization()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION = 169;
>+	int OBJECT_FLOW__REDEFINITION_CONTEXT = ACTIVITY_EDGE__REDEFINITION_CONTEXT;
> 
> 	/**
>-	 * The feature id for the 'EAnnotations' containment reference list.
>+	 * The feature id for the 'Source' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__EANNOTATIONS = REALIZATION__EANNOTATIONS;
>+	int OBJECT_FLOW__SOURCE = ACTIVITY_EDGE__SOURCE;
> 
> 	/**
>-	 * The feature id for the 'Owned Element' reference list.
>+	 * The feature id for the 'Target' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__OWNED_ELEMENT = REALIZATION__OWNED_ELEMENT;
>+	int OBJECT_FLOW__TARGET = ACTIVITY_EDGE__TARGET;
> 
> 	/**
>-	 * The feature id for the 'Owner' reference.
>+	 * The feature id for the 'Redefined Edge' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__OWNER = REALIZATION__OWNER;
>+	int OBJECT_FLOW__REDEFINED_EDGE = ACTIVITY_EDGE__REDEFINED_EDGE;
> 
> 	/**
>-	 * The feature id for the 'Owned Comment' containment reference list.
>+	 * The feature id for the 'In Partition' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__OWNED_COMMENT = REALIZATION__OWNED_COMMENT;
>+	int OBJECT_FLOW__IN_PARTITION = ACTIVITY_EDGE__IN_PARTITION;
> 
> 	/**
>-	 * The feature id for the 'Name' attribute.
>+	 * The feature id for the 'Guard' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__NAME = REALIZATION__NAME;
>+	int OBJECT_FLOW__GUARD = ACTIVITY_EDGE__GUARD;
> 
> 	/**
>-	 * The feature id for the 'Visibility' attribute.
>+	 * The feature id for the 'Weight' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__VISIBILITY = REALIZATION__VISIBILITY;
>+	int OBJECT_FLOW__WEIGHT = ACTIVITY_EDGE__WEIGHT;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>+	 * The feature id for the 'Interrupts' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__QUALIFIED_NAME = REALIZATION__QUALIFIED_NAME;
>+	int OBJECT_FLOW__INTERRUPTS = ACTIVITY_EDGE__INTERRUPTS;
> 
> 	/**
>-	 * The feature id for the 'Client Dependency' reference list.
>+	 * The feature id for the 'In Structured Node' container reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__CLIENT_DEPENDENCY = REALIZATION__CLIENT_DEPENDENCY;
>+	int OBJECT_FLOW__IN_STRUCTURED_NODE = ACTIVITY_EDGE__IN_STRUCTURED_NODE;
> 
> 	/**
>-	 * The feature id for the 'Namespace' reference.
>+	 * The feature id for the 'In Group' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__NAMESPACE = REALIZATION__NAMESPACE;
>+	int OBJECT_FLOW__IN_GROUP = ACTIVITY_EDGE__IN_GROUP;
> 
> 	/**
>-	 * The feature id for the 'Name Expression' containment reference.
>+	 * The feature id for the 'Activity' container reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__NAME_EXPRESSION = REALIZATION__NAME_EXPRESSION;
>+	int OBJECT_FLOW__ACTIVITY = ACTIVITY_EDGE__ACTIVITY;
> 
> 	/**
>-	 * The feature id for the 'Owning Template Parameter' container reference.
>+	 * The feature id for the 'Is Multicast' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__OWNING_TEMPLATE_PARAMETER = REALIZATION__OWNING_TEMPLATE_PARAMETER;
>+	int OBJECT_FLOW__IS_MULTICAST = ACTIVITY_EDGE_FEATURE_COUNT + 0;
> 
> 	/**
>-	 * The feature id for the 'Template Parameter' reference.
>+	 * The feature id for the 'Is Multireceive' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__TEMPLATE_PARAMETER = REALIZATION__TEMPLATE_PARAMETER;
>+	int OBJECT_FLOW__IS_MULTIRECEIVE = ACTIVITY_EDGE_FEATURE_COUNT + 1;
> 
> 	/**
>-	 * The feature id for the 'Related Element' reference list.
>+	 * The feature id for the 'Transformation' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__RELATED_ELEMENT = REALIZATION__RELATED_ELEMENT;
>+	int OBJECT_FLOW__TRANSFORMATION = ACTIVITY_EDGE_FEATURE_COUNT + 2;
> 
> 	/**
>-	 * The feature id for the 'Source' reference list.
>+	 * The feature id for the 'Selection' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__SOURCE = REALIZATION__SOURCE;
>+	int OBJECT_FLOW__SELECTION = ACTIVITY_EDGE_FEATURE_COUNT + 3;
> 
> 	/**
>-	 * The feature id for the 'Target' reference list.
>+	 * The number of structural features of the 'Object Flow' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__TARGET = REALIZATION__TARGET;
>+	int OBJECT_FLOW_FEATURE_COUNT = ACTIVITY_EDGE_FEATURE_COUNT + 4;
> 
> 	/**
>-	 * The feature id for the 'Supplier' reference list.
>+	 * The feature id for the 'EAnnotations' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__SUPPLIER = REALIZATION__SUPPLIER;
>+	int ACTIVITY_FINAL_NODE__EANNOTATIONS = FINAL_NODE__EANNOTATIONS;
> 
> 	/**
>-	 * The feature id for the 'Client' reference list.
>+	 * The feature id for the 'Owned Element' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__CLIENT = REALIZATION__CLIENT;
>+	int ACTIVITY_FINAL_NODE__OWNED_ELEMENT = FINAL_NODE__OWNED_ELEMENT;
> 
> 	/**
>-	 * The feature id for the 'Mapping' containment reference.
>+	 * The feature id for the 'Owner' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__MAPPING = REALIZATION__MAPPING;
>+	int ACTIVITY_FINAL_NODE__OWNER = FINAL_NODE__OWNER;
> 
> 	/**
>-	 * The feature id for the 'Abstraction' container reference.
>+	 * The feature id for the 'Owned Comment' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__ABSTRACTION = REALIZATION_FEATURE_COUNT + 0;
>+	int ACTIVITY_FINAL_NODE__OWNED_COMMENT = FINAL_NODE__OWNED_COMMENT;
> 
> 	/**
>-	 * The feature id for the 'Realizing Classifier' reference.
>+	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION__REALIZING_CLASSIFIER = REALIZATION_FEATURE_COUNT + 1;
>+	int ACTIVITY_FINAL_NODE__NAME = FINAL_NODE__NAME;
> 
> 	/**
>-	 * The number of structural features of the 'Component Realization' class.
>+	 * The feature id for the 'Visibility' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int COMPONENT_REALIZATION_FEATURE_COUNT = REALIZATION_FEATURE_COUNT + 2;
>+	int ACTIVITY_FINAL_NODE__VISIBILITY = FINAL_NODE__VISIBILITY;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ComponentImpl Component}' class.
>+	 * The feature id for the 'Qualified Name' attribute.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.uml2.uml.internal.impl.ComponentImpl
>-	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getComponent()
> 	 * @generated
>+	 * @ordered
> 	 */
>-	int COMPONENT = 170;
>+	int ACTIVITY_FINAL_NODE__QUALIFIED_NAME = FINAL_NODE__QUALIFIED_NAME;
>+
>+	/**
>+	 * The feature id for the 'Client Dependency' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__CLIENT_DEPENDENCY = FINAL_NODE__CLIENT_DEPENDENCY;
>+
>+	/**
>+	 * The feature id for the 'Namespace' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__NAMESPACE = FINAL_NODE__NAMESPACE;
>+
>+	/**
>+	 * The feature id for the 'Name Expression' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__NAME_EXPRESSION = FINAL_NODE__NAME_EXPRESSION;
>+
>+	/**
>+	 * The feature id for the 'Is Leaf' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__IS_LEAF = FINAL_NODE__IS_LEAF;
>+
>+	/**
>+	 * The feature id for the 'Redefined Element' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__REDEFINED_ELEMENT = FINAL_NODE__REDEFINED_ELEMENT;
>+
>+	/**
>+	 * The feature id for the 'Redefinition Context' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__REDEFINITION_CONTEXT = FINAL_NODE__REDEFINITION_CONTEXT;
>+
>+	/**
>+	 * The feature id for the 'In Structured Node' container reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__IN_STRUCTURED_NODE = FINAL_NODE__IN_STRUCTURED_NODE;
>+
>+	/**
>+	 * The feature id for the 'Activity' container reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__ACTIVITY = FINAL_NODE__ACTIVITY;
>+
>+	/**
>+	 * The feature id for the 'Outgoing' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__OUTGOING = FINAL_NODE__OUTGOING;
>+
>+	/**
>+	 * The feature id for the 'Incoming' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__INCOMING = FINAL_NODE__INCOMING;
>+
>+	/**
>+	 * The feature id for the 'In Partition' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__IN_PARTITION = FINAL_NODE__IN_PARTITION;
>+
>+	/**
>+	 * The feature id for the 'In Interruptible Region' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__IN_INTERRUPTIBLE_REGION = FINAL_NODE__IN_INTERRUPTIBLE_REGION;
>+
>+	/**
>+	 * The feature id for the 'In Group' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__IN_GROUP = FINAL_NODE__IN_GROUP;
>+
>+	/**
>+	 * The feature id for the 'Redefined Node' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE__REDEFINED_NODE = FINAL_NODE__REDEFINED_NODE;
>+
>+	/**
>+	 * The number of structural features of the 'Activity Final Node' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ACTIVITY_FINAL_NODE_FEATURE_COUNT = FINAL_NODE_FEATURE_COUNT + 0;
>+
>+	/**
>+	 * The feature id for the 'EAnnotations' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__EANNOTATIONS = REALIZATION__EANNOTATIONS;
>+
>+	/**
>+	 * The feature id for the 'Owned Element' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__OWNED_ELEMENT = REALIZATION__OWNED_ELEMENT;
>+
>+	/**
>+	 * The feature id for the 'Owner' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__OWNER = REALIZATION__OWNER;
>+
>+	/**
>+	 * The feature id for the 'Owned Comment' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__OWNED_COMMENT = REALIZATION__OWNED_COMMENT;
>+
>+	/**
>+	 * The feature id for the 'Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__NAME = REALIZATION__NAME;
>+
>+	/**
>+	 * The feature id for the 'Visibility' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__VISIBILITY = REALIZATION__VISIBILITY;
>+
>+	/**
>+	 * The feature id for the 'Qualified Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__QUALIFIED_NAME = REALIZATION__QUALIFIED_NAME;
>+
>+	/**
>+	 * The feature id for the 'Client Dependency' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__CLIENT_DEPENDENCY = REALIZATION__CLIENT_DEPENDENCY;
>+
>+	/**
>+	 * The feature id for the 'Namespace' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__NAMESPACE = REALIZATION__NAMESPACE;
>+
>+	/**
>+	 * The feature id for the 'Name Expression' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__NAME_EXPRESSION = REALIZATION__NAME_EXPRESSION;
>+
>+	/**
>+	 * The feature id for the 'Owning Template Parameter' container reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__OWNING_TEMPLATE_PARAMETER = REALIZATION__OWNING_TEMPLATE_PARAMETER;
>+
>+	/**
>+	 * The feature id for the 'Template Parameter' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__TEMPLATE_PARAMETER = REALIZATION__TEMPLATE_PARAMETER;
>+
>+	/**
>+	 * The feature id for the 'Related Element' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__RELATED_ELEMENT = REALIZATION__RELATED_ELEMENT;
>+
>+	/**
>+	 * The feature id for the 'Source' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__SOURCE = REALIZATION__SOURCE;
>+
>+	/**
>+	 * The feature id for the 'Target' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__TARGET = REALIZATION__TARGET;
>+
>+	/**
>+	 * The feature id for the 'Supplier' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__SUPPLIER = REALIZATION__SUPPLIER;
>+
>+	/**
>+	 * The feature id for the 'Client' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__CLIENT = REALIZATION__CLIENT;
>+
>+	/**
>+	 * The feature id for the 'Mapping' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__MAPPING = REALIZATION__MAPPING;
>+
>+	/**
>+	 * The feature id for the 'Abstraction' container reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__ABSTRACTION = REALIZATION_FEATURE_COUNT + 0;
>+
>+	/**
>+	 * The feature id for the 'Realizing Classifier' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION__REALIZING_CLASSIFIER = REALIZATION_FEATURE_COUNT + 1;
>+
>+	/**
>+	 * The number of structural features of the 'Component Realization' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPONENT_REALIZATION_FEATURE_COUNT = REALIZATION_FEATURE_COUNT + 2;
> 
> 	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
>@@ -39142,16 +39404,6 @@
> 	int COMPONENT_FEATURE_COUNT = CLASS_FEATURE_COUNT + 5;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.NodeImpl Node}' class.
>-	 * 
>-	 * 
>-	 * @see org.eclipse.uml2.uml.internal.impl.NodeImpl
>-	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getNode()
>-	 * @generated
>-	 */
>-	int NODE = 171;
>-
>-	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
> 	 * 
> 	 * 
>@@ -39656,36 +39908,6 @@
> 	int NODE_FEATURE_COUNT = CLASS_FEATURE_COUNT + 3;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.DeviceImpl Device}' class.
>-	 * 
>-	 * 
>-	 * @see org.eclipse.uml2.uml.internal.impl.DeviceImpl
>-	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDevice()
>-	 * @generated
>-	 */
>-	int DEVICE = 173;
>-
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.ExecutionEnvironmentImpl Execution Environment}' class.
>-	 * 
>-	 * 
>-	 * @see org.eclipse.uml2.uml.internal.impl.ExecutionEnvironmentImpl
>-	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExecutionEnvironment()
>-	 * @generated
>-	 */
>-	int EXECUTION_ENVIRONMENT = 174;
>-
>-	/**
>-	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.CommunicationPathImpl Communication Path}' class.
>-	 * 
>-	 * 
>-	 * @see org.eclipse.uml2.uml.internal.impl.CommunicationPathImpl
>-	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCommunicationPath()
>-	 * @generated
>-	 */
>-	int COMMUNICATION_PATH = 172;
>-
>-	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
> 	 * 
> 	 * 
>@@ -43475,13 +43697,22 @@
> 	int WRITE_STRUCTURAL_FEATURE_ACTION__VALUE = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 0;
> 
> 	/**
>+	 * The feature id for the 'Result' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int WRITE_STRUCTURAL_FEATURE_ACTION__RESULT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 1;
>+
>+	/**
> 	 * The number of structural features of the 'Write Structural Feature Action' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 1;
>+	int WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 2;
> 
> 	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
>@@ -43745,13 +43976,22 @@
> 	int CLEAR_STRUCTURAL_FEATURE_ACTION__OBJECT = STRUCTURAL_FEATURE_ACTION__OBJECT;
> 
> 	/**
>+	 * The feature id for the 'Result' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 0;
>+
>+	/**
> 	 * The number of structural features of the 'Clear Structural Feature Action' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int CLEAR_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 0;
>+	int CLEAR_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 1;
> 
> 	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
>@@ -44024,6 +44264,15 @@
> 	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__VALUE = WRITE_STRUCTURAL_FEATURE_ACTION__VALUE;
> 
> 	/**
>+	 * The feature id for the 'Result' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__RESULT = WRITE_STRUCTURAL_FEATURE_ACTION__RESULT;
>+
>+	/**
> 	 * The feature id for the 'Is Remove Duplicates' attribute.
> 	 * 
> 	 * 
>@@ -44321,6 +44570,15 @@
> 	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION__VALUE = WRITE_STRUCTURAL_FEATURE_ACTION__VALUE;
> 
> 	/**
>+	 * The feature id for the 'Result' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION__RESULT = WRITE_STRUCTURAL_FEATURE_ACTION__RESULT;
>+
>+	/**
> 	 * The feature id for the 'Is Replace All' attribute.
> 	 * 
> 	 * 
>@@ -47246,7 +47504,7 @@
> 	int TIME_EXPRESSION__TYPE = VALUE_SPECIFICATION__TYPE;
> 
> 	/**
>-	 * The feature id for the 'Expr' reference.
>+	 * The feature id for the 'Expr' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
>@@ -47507,7 +47765,7 @@
> 	int DURATION__TYPE = VALUE_SPECIFICATION__TYPE;
> 
> 	/**
>-	 * The feature id for the 'Expr' reference.
>+	 * The feature id for the 'Expr' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
>@@ -48686,16 +48944,6 @@
> 	int DURATION_OBSERVATION_FEATURE_COUNT = OBSERVATION_FEATURE_COUNT + 2;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.FinalStateImpl Final State}' class.
>-	 * 
>-	 * 
>-	 * @see org.eclipse.uml2.uml.internal.impl.FinalStateImpl
>-	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getFinalState()
>-	 * @generated
>-	 */
>-	int FINAL_STATE = 212;
>-
>-	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
> 	 * 
> 	 * 
>@@ -48867,22 +49115,22 @@
> 	int FINAL_STATE__REDEFINITION_CONTEXT = STATE__REDEFINITION_CONTEXT;
> 
> 	/**
>-	 * The feature id for the 'Incoming' reference list.
>+	 * The feature id for the 'Outgoing' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FINAL_STATE__INCOMING = STATE__INCOMING;
>+	int FINAL_STATE__OUTGOING = STATE__OUTGOING;
> 
> 	/**
>-	 * The feature id for the 'Outgoing' reference list.
>+	 * The feature id for the 'Incoming' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int FINAL_STATE__OUTGOING = STATE__OUTGOING;
>+	int FINAL_STATE__INCOMING = STATE__INCOMING;
> 
> 	/**
> 	 * The feature id for the 'Container' container reference.
>@@ -49029,16 +49277,6 @@
> 	int FINAL_STATE_FEATURE_COUNT = STATE_FEATURE_COUNT + 0;
> 
> 	/**
>-	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.TimeEventImpl Time Event}' class.
>-	 * 
>-	 * 
>-	 * @see org.eclipse.uml2.uml.internal.impl.TimeEventImpl
>-	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTimeEvent()
>-	 * @generated
>-	 */
>-	int TIME_EVENT = 213;
>-
>-	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
> 	 * 
> 	 * 
>@@ -55318,7 +55556,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__EANNOTATIONS = CONTROL_NODE__EANNOTATIONS;
>+	int START_OBJECT_BEHAVIOR_ACTION__EANNOTATIONS = CALL_ACTION__EANNOTATIONS;
> 
> 	/**
> 	 * The feature id for the 'Owned Element' reference list.
>@@ -55327,7 +55565,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__OWNED_ELEMENT = CONTROL_NODE__OWNED_ELEMENT;
>+	int START_OBJECT_BEHAVIOR_ACTION__OWNED_ELEMENT = CALL_ACTION__OWNED_ELEMENT;
> 
> 	/**
> 	 * The feature id for the 'Owner' reference.
>@@ -55336,7 +55574,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__OWNER = CONTROL_NODE__OWNER;
>+	int START_OBJECT_BEHAVIOR_ACTION__OWNER = CALL_ACTION__OWNER;
> 
> 	/**
> 	 * The feature id for the 'Owned Comment' containment reference list.
>@@ -55345,7 +55583,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__OWNED_COMMENT = CONTROL_NODE__OWNED_COMMENT;
>+	int START_OBJECT_BEHAVIOR_ACTION__OWNED_COMMENT = CALL_ACTION__OWNED_COMMENT;
> 
> 	/**
> 	 * The feature id for the 'Name' attribute.
>@@ -55354,7 +55592,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__NAME = CONTROL_NODE__NAME;
>+	int START_OBJECT_BEHAVIOR_ACTION__NAME = CALL_ACTION__NAME;
> 
> 	/**
> 	 * The feature id for the 'Visibility' attribute.
>@@ -55363,7 +55601,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__VISIBILITY = CONTROL_NODE__VISIBILITY;
>+	int START_OBJECT_BEHAVIOR_ACTION__VISIBILITY = CALL_ACTION__VISIBILITY;
> 
> 	/**
> 	 * The feature id for the 'Qualified Name' attribute.
>@@ -55372,7 +55610,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__QUALIFIED_NAME = CONTROL_NODE__QUALIFIED_NAME;
>+	int START_OBJECT_BEHAVIOR_ACTION__QUALIFIED_NAME = CALL_ACTION__QUALIFIED_NAME;
> 
> 	/**
> 	 * The feature id for the 'Client Dependency' reference list.
>@@ -55381,7 +55619,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__CLIENT_DEPENDENCY = CONTROL_NODE__CLIENT_DEPENDENCY;
>+	int START_OBJECT_BEHAVIOR_ACTION__CLIENT_DEPENDENCY = CALL_ACTION__CLIENT_DEPENDENCY;
> 
> 	/**
> 	 * The feature id for the 'Namespace' reference.
>@@ -55390,7 +55628,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__NAMESPACE = CONTROL_NODE__NAMESPACE;
>+	int START_OBJECT_BEHAVIOR_ACTION__NAMESPACE = CALL_ACTION__NAMESPACE;
> 
> 	/**
> 	 * The feature id for the 'Name Expression' containment reference.
>@@ -55399,7 +55637,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__NAME_EXPRESSION = CONTROL_NODE__NAME_EXPRESSION;
>+	int START_OBJECT_BEHAVIOR_ACTION__NAME_EXPRESSION = CALL_ACTION__NAME_EXPRESSION;
> 
> 	/**
> 	 * The feature id for the 'Is Leaf' attribute.
>@@ -55408,7 +55646,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__IS_LEAF = CONTROL_NODE__IS_LEAF;
>+	int START_OBJECT_BEHAVIOR_ACTION__IS_LEAF = CALL_ACTION__IS_LEAF;
> 
> 	/**
> 	 * The feature id for the 'Redefined Element' reference list.
>@@ -55417,7 +55655,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__REDEFINED_ELEMENT = CONTROL_NODE__REDEFINED_ELEMENT;
>+	int START_OBJECT_BEHAVIOR_ACTION__REDEFINED_ELEMENT = CALL_ACTION__REDEFINED_ELEMENT;
> 
> 	/**
> 	 * The feature id for the 'Redefinition Context' reference list.
>@@ -55426,7 +55664,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__REDEFINITION_CONTEXT = CONTROL_NODE__REDEFINITION_CONTEXT;
>+	int START_OBJECT_BEHAVIOR_ACTION__REDEFINITION_CONTEXT = CALL_ACTION__REDEFINITION_CONTEXT;
> 
> 	/**
> 	 * The feature id for the 'In Structured Node' container reference.
>@@ -55435,7 +55673,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__IN_STRUCTURED_NODE = CONTROL_NODE__IN_STRUCTURED_NODE;
>+	int START_OBJECT_BEHAVIOR_ACTION__IN_STRUCTURED_NODE = CALL_ACTION__IN_STRUCTURED_NODE;
> 
> 	/**
> 	 * The feature id for the 'Activity' container reference.
>@@ -55444,7 +55682,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__ACTIVITY = CONTROL_NODE__ACTIVITY;
>+	int START_OBJECT_BEHAVIOR_ACTION__ACTIVITY = CALL_ACTION__ACTIVITY;
> 
> 	/**
> 	 * The feature id for the 'Outgoing' reference list.
>@@ -55453,7 +55691,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__OUTGOING = CONTROL_NODE__OUTGOING;
>+	int START_OBJECT_BEHAVIOR_ACTION__OUTGOING = CALL_ACTION__OUTGOING;
> 
> 	/**
> 	 * The feature id for the 'Incoming' reference list.
>@@ -55462,7 +55700,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__INCOMING = CONTROL_NODE__INCOMING;
>+	int START_OBJECT_BEHAVIOR_ACTION__INCOMING = CALL_ACTION__INCOMING;
> 
> 	/**
> 	 * The feature id for the 'In Partition' reference list.
>@@ -55471,7 +55709,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__IN_PARTITION = CONTROL_NODE__IN_PARTITION;
>+	int START_OBJECT_BEHAVIOR_ACTION__IN_PARTITION = CALL_ACTION__IN_PARTITION;
> 
> 	/**
> 	 * The feature id for the 'In Interruptible Region' reference list.
>@@ -55480,7 +55718,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__IN_INTERRUPTIBLE_REGION = CONTROL_NODE__IN_INTERRUPTIBLE_REGION;
>+	int START_OBJECT_BEHAVIOR_ACTION__IN_INTERRUPTIBLE_REGION = CALL_ACTION__IN_INTERRUPTIBLE_REGION;
> 
> 	/**
> 	 * The feature id for the 'In Group' reference list.
>@@ -55489,7 +55727,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__IN_GROUP = CONTROL_NODE__IN_GROUP;
>+	int START_OBJECT_BEHAVIOR_ACTION__IN_GROUP = CALL_ACTION__IN_GROUP;
> 
> 	/**
> 	 * The feature id for the 'Redefined Node' reference list.
>@@ -55498,286 +55736,331 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__REDEFINED_NODE = CONTROL_NODE__REDEFINED_NODE;
>+	int START_OBJECT_BEHAVIOR_ACTION__REDEFINED_NODE = CALL_ACTION__REDEFINED_NODE;
> 
> 	/**
>-	 * The feature id for the 'Is Combine Duplicate' attribute.
>+	 * The feature id for the 'Handler' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__IS_COMBINE_DUPLICATE = CONTROL_NODE_FEATURE_COUNT + 0;
>+	int START_OBJECT_BEHAVIOR_ACTION__HANDLER = CALL_ACTION__HANDLER;
> 
> 	/**
>-	 * The feature id for the 'Join Spec' containment reference.
>+	 * The feature id for the 'Output' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE__JOIN_SPEC = CONTROL_NODE_FEATURE_COUNT + 1;
>+	int START_OBJECT_BEHAVIOR_ACTION__OUTPUT = CALL_ACTION__OUTPUT;
> 
> 	/**
>-	 * The number of structural features of the 'Join Node' class.
>+	 * The feature id for the 'Input' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int JOIN_NODE_FEATURE_COUNT = CONTROL_NODE_FEATURE_COUNT + 2;
>+	int START_OBJECT_BEHAVIOR_ACTION__INPUT = CALL_ACTION__INPUT;
> 
> 	/**
>-	 * The feature id for the 'EAnnotations' containment reference list.
>+	 * The feature id for the 'Context' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__EANNOTATIONS = CENTRAL_BUFFER_NODE__EANNOTATIONS;
>+	int START_OBJECT_BEHAVIOR_ACTION__CONTEXT = CALL_ACTION__CONTEXT;
> 
> 	/**
>-	 * The feature id for the 'Owned Element' reference list.
>+	 * The feature id for the 'Local Precondition' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__OWNED_ELEMENT = CENTRAL_BUFFER_NODE__OWNED_ELEMENT;
>+	int START_OBJECT_BEHAVIOR_ACTION__LOCAL_PRECONDITION = CALL_ACTION__LOCAL_PRECONDITION;
> 
> 	/**
>-	 * The feature id for the 'Owner' reference.
>+	 * The feature id for the 'Local Postcondition' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__OWNER = CENTRAL_BUFFER_NODE__OWNER;
>+	int START_OBJECT_BEHAVIOR_ACTION__LOCAL_POSTCONDITION = CALL_ACTION__LOCAL_POSTCONDITION;
> 
> 	/**
>-	 * The feature id for the 'Owned Comment' containment reference list.
>+	 * The feature id for the 'Argument' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__OWNED_COMMENT = CENTRAL_BUFFER_NODE__OWNED_COMMENT;
>+	int START_OBJECT_BEHAVIOR_ACTION__ARGUMENT = CALL_ACTION__ARGUMENT;
> 
> 	/**
>-	 * The feature id for the 'Name' attribute.
>+	 * The feature id for the 'On Port' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__NAME = CENTRAL_BUFFER_NODE__NAME;
>+	int START_OBJECT_BEHAVIOR_ACTION__ON_PORT = CALL_ACTION__ON_PORT;
> 
> 	/**
>-	 * The feature id for the 'Visibility' attribute.
>+	 * The feature id for the 'Is Synchronous' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__VISIBILITY = CENTRAL_BUFFER_NODE__VISIBILITY;
>+	int START_OBJECT_BEHAVIOR_ACTION__IS_SYNCHRONOUS = CALL_ACTION__IS_SYNCHRONOUS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>+	 * The feature id for the 'Result' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__QUALIFIED_NAME = CENTRAL_BUFFER_NODE__QUALIFIED_NAME;
>+	int START_OBJECT_BEHAVIOR_ACTION__RESULT = CALL_ACTION__RESULT;
> 
> 	/**
>-	 * The feature id for the 'Client Dependency' reference list.
>+	 * The feature id for the 'Object' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__CLIENT_DEPENDENCY = CENTRAL_BUFFER_NODE__CLIENT_DEPENDENCY;
>+	int START_OBJECT_BEHAVIOR_ACTION__OBJECT = CALL_ACTION_FEATURE_COUNT + 0;
> 
> 	/**
>-	 * The feature id for the 'Namespace' reference.
>+	 * The number of structural features of the 'Start Object Behavior Action' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__NAMESPACE = CENTRAL_BUFFER_NODE__NAMESPACE;
>+	int START_OBJECT_BEHAVIOR_ACTION_FEATURE_COUNT = CALL_ACTION_FEATURE_COUNT + 1;
> 
> 	/**
>-	 * The feature id for the 'Name Expression' containment reference.
>+	 * The feature id for the 'EAnnotations' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__NAME_EXPRESSION = CENTRAL_BUFFER_NODE__NAME_EXPRESSION;
>+	int JOIN_NODE__EANNOTATIONS = CONTROL_NODE__EANNOTATIONS;
> 
> 	/**
>-	 * The feature id for the 'Is Leaf' attribute.
>+	 * The feature id for the 'Owned Element' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__IS_LEAF = CENTRAL_BUFFER_NODE__IS_LEAF;
>+	int JOIN_NODE__OWNED_ELEMENT = CONTROL_NODE__OWNED_ELEMENT;
> 
> 	/**
>-	 * The feature id for the 'Redefined Element' reference list.
>+	 * The feature id for the 'Owner' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__REDEFINED_ELEMENT = CENTRAL_BUFFER_NODE__REDEFINED_ELEMENT;
>+	int JOIN_NODE__OWNER = CONTROL_NODE__OWNER;
> 
> 	/**
>-	 * The feature id for the 'Redefinition Context' reference list.
>+	 * The feature id for the 'Owned Comment' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__REDEFINITION_CONTEXT = CENTRAL_BUFFER_NODE__REDEFINITION_CONTEXT;
>+	int JOIN_NODE__OWNED_COMMENT = CONTROL_NODE__OWNED_COMMENT;
> 
> 	/**
>-	 * The feature id for the 'In Structured Node' container reference.
>+	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__IN_STRUCTURED_NODE = CENTRAL_BUFFER_NODE__IN_STRUCTURED_NODE;
>+	int JOIN_NODE__NAME = CONTROL_NODE__NAME;
> 
> 	/**
>-	 * The feature id for the 'Activity' container reference.
>+	 * The feature id for the 'Visibility' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__ACTIVITY = CENTRAL_BUFFER_NODE__ACTIVITY;
>+	int JOIN_NODE__VISIBILITY = CONTROL_NODE__VISIBILITY;
> 
> 	/**
>-	 * The feature id for the 'Outgoing' reference list.
>+	 * The feature id for the 'Qualified Name' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__OUTGOING = CENTRAL_BUFFER_NODE__OUTGOING;
>+	int JOIN_NODE__QUALIFIED_NAME = CONTROL_NODE__QUALIFIED_NAME;
> 
> 	/**
>-	 * The feature id for the 'Incoming' reference list.
>+	 * The feature id for the 'Client Dependency' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__INCOMING = CENTRAL_BUFFER_NODE__INCOMING;
>+	int JOIN_NODE__CLIENT_DEPENDENCY = CONTROL_NODE__CLIENT_DEPENDENCY;
> 
> 	/**
>-	 * The feature id for the 'In Partition' reference list.
>+	 * The feature id for the 'Namespace' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__IN_PARTITION = CENTRAL_BUFFER_NODE__IN_PARTITION;
>+	int JOIN_NODE__NAMESPACE = CONTROL_NODE__NAMESPACE;
> 
> 	/**
>-	 * The feature id for the 'In Interruptible Region' reference list.
>+	 * The feature id for the 'Name Expression' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__IN_INTERRUPTIBLE_REGION = CENTRAL_BUFFER_NODE__IN_INTERRUPTIBLE_REGION;
>+	int JOIN_NODE__NAME_EXPRESSION = CONTROL_NODE__NAME_EXPRESSION;
> 
> 	/**
>-	 * The feature id for the 'In Group' reference list.
>+	 * The feature id for the 'Is Leaf' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__IN_GROUP = CENTRAL_BUFFER_NODE__IN_GROUP;
>+	int JOIN_NODE__IS_LEAF = CONTROL_NODE__IS_LEAF;
> 
> 	/**
>-	 * The feature id for the 'Redefined Node' reference list.
>+	 * The feature id for the 'Redefined Element' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__REDEFINED_NODE = CENTRAL_BUFFER_NODE__REDEFINED_NODE;
>+	int JOIN_NODE__REDEFINED_ELEMENT = CONTROL_NODE__REDEFINED_ELEMENT;
> 
> 	/**
>-	 * The feature id for the 'Type' reference.
>+	 * The feature id for the 'Redefinition Context' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__TYPE = CENTRAL_BUFFER_NODE__TYPE;
>+	int JOIN_NODE__REDEFINITION_CONTEXT = CONTROL_NODE__REDEFINITION_CONTEXT;
> 
> 	/**
>-	 * The feature id for the 'Ordering' attribute.
>+	 * The feature id for the 'In Structured Node' container reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__ORDERING = CENTRAL_BUFFER_NODE__ORDERING;
>+	int JOIN_NODE__IN_STRUCTURED_NODE = CONTROL_NODE__IN_STRUCTURED_NODE;
> 
> 	/**
>-	 * The feature id for the 'Is Control Type' attribute.
>+	 * The feature id for the 'Activity' container reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__IS_CONTROL_TYPE = CENTRAL_BUFFER_NODE__IS_CONTROL_TYPE;
>+	int JOIN_NODE__ACTIVITY = CONTROL_NODE__ACTIVITY;
> 
> 	/**
>-	 * The feature id for the 'Upper Bound' containment reference.
>+	 * The feature id for the 'Outgoing' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__UPPER_BOUND = CENTRAL_BUFFER_NODE__UPPER_BOUND;
>+	int JOIN_NODE__OUTGOING = CONTROL_NODE__OUTGOING;
> 
> 	/**
>-	 * The feature id for the 'In State' reference list.
>+	 * The feature id for the 'Incoming' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__IN_STATE = CENTRAL_BUFFER_NODE__IN_STATE;
>+	int JOIN_NODE__INCOMING = CONTROL_NODE__INCOMING;
> 
> 	/**
>-	 * The feature id for the 'Selection' reference.
>+	 * The feature id for the 'In Partition' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE__SELECTION = CENTRAL_BUFFER_NODE__SELECTION;
>+	int JOIN_NODE__IN_PARTITION = CONTROL_NODE__IN_PARTITION;
> 
> 	/**
>-	 * The number of structural features of the 'Data Store Node' class.
>+	 * The feature id for the 'In Interruptible Region' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int DATA_STORE_NODE_FEATURE_COUNT = CENTRAL_BUFFER_NODE_FEATURE_COUNT + 0;
>+	int JOIN_NODE__IN_INTERRUPTIBLE_REGION = CONTROL_NODE__IN_INTERRUPTIBLE_REGION;
>+
>+	/**
>+	 * The feature id for the 'In Group' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int JOIN_NODE__IN_GROUP = CONTROL_NODE__IN_GROUP;
>+
>+	/**
>+	 * The feature id for the 'Redefined Node' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int JOIN_NODE__REDEFINED_NODE = CONTROL_NODE__REDEFINED_NODE;
>+
>+	/**
>+	 * The feature id for the 'Is Combine Duplicate' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int JOIN_NODE__IS_COMBINE_DUPLICATE = CONTROL_NODE_FEATURE_COUNT + 0;
>+
>+	/**
>+	 * The feature id for the 'Join Spec' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int JOIN_NODE__JOIN_SPEC = CONTROL_NODE_FEATURE_COUNT + 1;
>+
>+	/**
>+	 * The number of structural features of the 'Join Node' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int JOIN_NODE_FEATURE_COUNT = CONTROL_NODE_FEATURE_COUNT + 2;
> 
> 	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
>@@ -55786,7 +56069,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__EANNOTATIONS = ACTIVITY_EDGE__EANNOTATIONS;
>+	int DATA_STORE_NODE__EANNOTATIONS = CENTRAL_BUFFER_NODE__EANNOTATIONS;
> 
> 	/**
> 	 * The feature id for the 'Owned Element' reference list.
>@@ -55795,7 +56078,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__OWNED_ELEMENT = ACTIVITY_EDGE__OWNED_ELEMENT;
>+	int DATA_STORE_NODE__OWNED_ELEMENT = CENTRAL_BUFFER_NODE__OWNED_ELEMENT;
> 
> 	/**
> 	 * The feature id for the 'Owner' reference.
>@@ -55804,7 +56087,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__OWNER = ACTIVITY_EDGE__OWNER;
>+	int DATA_STORE_NODE__OWNER = CENTRAL_BUFFER_NODE__OWNER;
> 
> 	/**
> 	 * The feature id for the 'Owned Comment' containment reference list.
>@@ -55813,7 +56096,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__OWNED_COMMENT = ACTIVITY_EDGE__OWNED_COMMENT;
>+	int DATA_STORE_NODE__OWNED_COMMENT = CENTRAL_BUFFER_NODE__OWNED_COMMENT;
> 
> 	/**
> 	 * The feature id for the 'Name' attribute.
>@@ -55822,7 +56105,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__NAME = ACTIVITY_EDGE__NAME;
>+	int DATA_STORE_NODE__NAME = CENTRAL_BUFFER_NODE__NAME;
> 
> 	/**
> 	 * The feature id for the 'Visibility' attribute.
>@@ -55831,7 +56114,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__VISIBILITY = ACTIVITY_EDGE__VISIBILITY;
>+	int DATA_STORE_NODE__VISIBILITY = CENTRAL_BUFFER_NODE__VISIBILITY;
> 
> 	/**
> 	 * The feature id for the 'Qualified Name' attribute.
>@@ -55840,7 +56123,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__QUALIFIED_NAME = ACTIVITY_EDGE__QUALIFIED_NAME;
>+	int DATA_STORE_NODE__QUALIFIED_NAME = CENTRAL_BUFFER_NODE__QUALIFIED_NAME;
> 
> 	/**
> 	 * The feature id for the 'Client Dependency' reference list.
>@@ -55849,7 +56132,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__CLIENT_DEPENDENCY = ACTIVITY_EDGE__CLIENT_DEPENDENCY;
>+	int DATA_STORE_NODE__CLIENT_DEPENDENCY = CENTRAL_BUFFER_NODE__CLIENT_DEPENDENCY;
> 
> 	/**
> 	 * The feature id for the 'Namespace' reference.
>@@ -55858,7 +56141,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__NAMESPACE = ACTIVITY_EDGE__NAMESPACE;
>+	int DATA_STORE_NODE__NAMESPACE = CENTRAL_BUFFER_NODE__NAMESPACE;
> 
> 	/**
> 	 * The feature id for the 'Name Expression' containment reference.
>@@ -55867,7 +56150,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__NAME_EXPRESSION = ACTIVITY_EDGE__NAME_EXPRESSION;
>+	int DATA_STORE_NODE__NAME_EXPRESSION = CENTRAL_BUFFER_NODE__NAME_EXPRESSION;
> 
> 	/**
> 	 * The feature id for the 'Is Leaf' attribute.
>@@ -55876,7 +56159,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__IS_LEAF = ACTIVITY_EDGE__IS_LEAF;
>+	int DATA_STORE_NODE__IS_LEAF = CENTRAL_BUFFER_NODE__IS_LEAF;
> 
> 	/**
> 	 * The feature id for the 'Redefined Element' reference list.
>@@ -55885,7 +56168,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__REDEFINED_ELEMENT = ACTIVITY_EDGE__REDEFINED_ELEMENT;
>+	int DATA_STORE_NODE__REDEFINED_ELEMENT = CENTRAL_BUFFER_NODE__REDEFINED_ELEMENT;
> 
> 	/**
> 	 * The feature id for the 'Redefinition Context' reference list.
>@@ -55894,124 +56177,124 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__REDEFINITION_CONTEXT = ACTIVITY_EDGE__REDEFINITION_CONTEXT;
>+	int DATA_STORE_NODE__REDEFINITION_CONTEXT = CENTRAL_BUFFER_NODE__REDEFINITION_CONTEXT;
> 
> 	/**
>-	 * The feature id for the 'Source' reference.
>+	 * The feature id for the 'In Structured Node' container reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__SOURCE = ACTIVITY_EDGE__SOURCE;
>+	int DATA_STORE_NODE__IN_STRUCTURED_NODE = CENTRAL_BUFFER_NODE__IN_STRUCTURED_NODE;
> 
> 	/**
>-	 * The feature id for the 'Target' reference.
>+	 * The feature id for the 'Activity' container reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__TARGET = ACTIVITY_EDGE__TARGET;
>+	int DATA_STORE_NODE__ACTIVITY = CENTRAL_BUFFER_NODE__ACTIVITY;
> 
> 	/**
>-	 * The feature id for the 'Redefined Edge' reference list.
>+	 * The feature id for the 'Outgoing' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__REDEFINED_EDGE = ACTIVITY_EDGE__REDEFINED_EDGE;
>+	int DATA_STORE_NODE__OUTGOING = CENTRAL_BUFFER_NODE__OUTGOING;
> 
> 	/**
>-	 * The feature id for the 'In Partition' reference list.
>+	 * The feature id for the 'Incoming' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__IN_PARTITION = ACTIVITY_EDGE__IN_PARTITION;
>+	int DATA_STORE_NODE__INCOMING = CENTRAL_BUFFER_NODE__INCOMING;
> 
> 	/**
>-	 * The feature id for the 'Guard' containment reference.
>+	 * The feature id for the 'In Partition' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__GUARD = ACTIVITY_EDGE__GUARD;
>+	int DATA_STORE_NODE__IN_PARTITION = CENTRAL_BUFFER_NODE__IN_PARTITION;
> 
> 	/**
>-	 * The feature id for the 'Weight' containment reference.
>+	 * The feature id for the 'In Interruptible Region' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__WEIGHT = ACTIVITY_EDGE__WEIGHT;
>+	int DATA_STORE_NODE__IN_INTERRUPTIBLE_REGION = CENTRAL_BUFFER_NODE__IN_INTERRUPTIBLE_REGION;
> 
> 	/**
>-	 * The feature id for the 'Interrupts' reference.
>+	 * The feature id for the 'In Group' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__INTERRUPTS = ACTIVITY_EDGE__INTERRUPTS;
>+	int DATA_STORE_NODE__IN_GROUP = CENTRAL_BUFFER_NODE__IN_GROUP;
> 
> 	/**
>-	 * The feature id for the 'In Structured Node' container reference.
>+	 * The feature id for the 'Redefined Node' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__IN_STRUCTURED_NODE = ACTIVITY_EDGE__IN_STRUCTURED_NODE;
>+	int DATA_STORE_NODE__REDEFINED_NODE = CENTRAL_BUFFER_NODE__REDEFINED_NODE;
> 
> 	/**
>-	 * The feature id for the 'In Group' reference list.
>+	 * The feature id for the 'Type' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__IN_GROUP = ACTIVITY_EDGE__IN_GROUP;
>+	int DATA_STORE_NODE__TYPE = CENTRAL_BUFFER_NODE__TYPE;
> 
> 	/**
>-	 * The feature id for the 'Activity' container reference.
>+	 * The feature id for the 'Ordering' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__ACTIVITY = ACTIVITY_EDGE__ACTIVITY;
>+	int DATA_STORE_NODE__ORDERING = CENTRAL_BUFFER_NODE__ORDERING;
> 
> 	/**
>-	 * The feature id for the 'Is Multicast' attribute.
>+	 * The feature id for the 'Is Control Type' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__IS_MULTICAST = ACTIVITY_EDGE_FEATURE_COUNT + 0;
>+	int DATA_STORE_NODE__IS_CONTROL_TYPE = CENTRAL_BUFFER_NODE__IS_CONTROL_TYPE;
> 
> 	/**
>-	 * The feature id for the 'Is Multireceive' attribute.
>+	 * The feature id for the 'Upper Bound' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__IS_MULTIRECEIVE = ACTIVITY_EDGE_FEATURE_COUNT + 1;
>+	int DATA_STORE_NODE__UPPER_BOUND = CENTRAL_BUFFER_NODE__UPPER_BOUND;
> 
> 	/**
>-	 * The feature id for the 'Transformation' reference.
>+	 * The feature id for the 'In State' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__TRANSFORMATION = ACTIVITY_EDGE_FEATURE_COUNT + 2;
>+	int DATA_STORE_NODE__IN_STATE = CENTRAL_BUFFER_NODE__IN_STATE;
> 
> 	/**
> 	 * The feature id for the 'Selection' reference.
>@@ -56020,16 +56303,16 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW__SELECTION = ACTIVITY_EDGE_FEATURE_COUNT + 3;
>+	int DATA_STORE_NODE__SELECTION = CENTRAL_BUFFER_NODE__SELECTION;
> 
> 	/**
>-	 * The number of structural features of the 'Object Flow' class.
>+	 * The number of structural features of the 'Data Store Node' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int OBJECT_FLOW_FEATURE_COUNT = ACTIVITY_EDGE_FEATURE_COUNT + 4;
>+	int DATA_STORE_NODE_FEATURE_COUNT = CENTRAL_BUFFER_NODE_FEATURE_COUNT + 0;
> 
> 	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
>@@ -57713,7 +57996,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getProtocolTransition()
> 	 * @generated
> 	 */
>-	int PROTOCOL_TRANSITION = 244;
>+	int PROTOCOL_TRANSITION = 245;
> 
> 	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
>@@ -57905,58 +58188,58 @@
> 	int PROTOCOL_TRANSITION__CONTAINER = TRANSITION__CONTAINER;
> 
> 	/**
>-	 * The feature id for the 'Redefined Transition' reference.
>+	 * The feature id for the 'Source' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROTOCOL_TRANSITION__REDEFINED_TRANSITION = TRANSITION__REDEFINED_TRANSITION;
>+	int PROTOCOL_TRANSITION__SOURCE = TRANSITION__SOURCE;
> 
> 	/**
>-	 * The feature id for the 'Guard' reference.
>+	 * The feature id for the 'Target' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROTOCOL_TRANSITION__GUARD = TRANSITION__GUARD;
>+	int PROTOCOL_TRANSITION__TARGET = TRANSITION__TARGET;
> 
> 	/**
>-	 * The feature id for the 'Effect' containment reference.
>+	 * The feature id for the 'Redefined Transition' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROTOCOL_TRANSITION__EFFECT = TRANSITION__EFFECT;
>+	int PROTOCOL_TRANSITION__REDEFINED_TRANSITION = TRANSITION__REDEFINED_TRANSITION;
> 
> 	/**
>-	 * The feature id for the 'Trigger' containment reference list.
>+	 * The feature id for the 'Guard' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROTOCOL_TRANSITION__TRIGGER = TRANSITION__TRIGGER;
>+	int PROTOCOL_TRANSITION__GUARD = TRANSITION__GUARD;
> 
> 	/**
>-	 * The feature id for the 'Target' reference.
>+	 * The feature id for the 'Effect' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROTOCOL_TRANSITION__TARGET = TRANSITION__TARGET;
>+	int PROTOCOL_TRANSITION__EFFECT = TRANSITION__EFFECT;
> 
> 	/**
>-	 * The feature id for the 'Source' reference.
>+	 * The feature id for the 'Trigger' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PROTOCOL_TRANSITION__SOURCE = TRANSITION__SOURCE;
>+	int PROTOCOL_TRANSITION__TRIGGER = TRANSITION__TRIGGER;
> 
> 	/**
> 	 * The feature id for the 'Post Condition' reference.
>@@ -58002,7 +58285,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getAssociationClass()
> 	 * @generated
> 	 */
>-	int ASSOCIATION_CLASS = 245;
>+	int ASSOCIATION_CLASS = 246;
> 
> 	/**
> 	 * The feature id for the 'EAnnotations' containment reference list.
>@@ -58543,7 +58826,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getVisibilityKind()
> 	 * @generated
> 	 */
>-	int VISIBILITY_KIND = 246;
>+	int VISIBILITY_KIND = 247;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.CallConcurrencyKind Call Concurrency Kind}' enum.
>@@ -58553,7 +58836,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCallConcurrencyKind()
> 	 * @generated
> 	 */
>-	int CALL_CONCURRENCY_KIND = 250;
>+	int CALL_CONCURRENCY_KIND = 251;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.TransitionKind Transition Kind}' enum.
>@@ -58563,7 +58846,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTransitionKind()
> 	 * @generated
> 	 */
>-	int TRANSITION_KIND = 247;
>+	int TRANSITION_KIND = 248;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.PseudostateKind Pseudostate Kind}' enum.
>@@ -58573,7 +58856,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPseudostateKind()
> 	 * @generated
> 	 */
>-	int PSEUDOSTATE_KIND = 248;
>+	int PSEUDOSTATE_KIND = 249;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.AggregationKind Aggregation Kind}' enum.
>@@ -58583,7 +58866,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getAggregationKind()
> 	 * @generated
> 	 */
>-	int AGGREGATION_KIND = 251;
>+	int AGGREGATION_KIND = 252;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.ParameterDirectionKind Parameter Direction Kind}' enum.
>@@ -58593,7 +58876,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getParameterDirectionKind()
> 	 * @generated
> 	 */
>-	int PARAMETER_DIRECTION_KIND = 252;
>+	int PARAMETER_DIRECTION_KIND = 253;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.ParameterEffectKind Parameter Effect Kind}' enum.
>@@ -58603,7 +58886,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getParameterEffectKind()
> 	 * @generated
> 	 */
>-	int PARAMETER_EFFECT_KIND = 253;
>+	int PARAMETER_EFFECT_KIND = 254;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.ConnectorKind Connector Kind}' enum.
>@@ -58613,7 +58896,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConnectorKind()
> 	 * @generated
> 	 */
>-	int CONNECTOR_KIND = 249;
>+	int CONNECTOR_KIND = 250;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.MessageKind Message Kind}' enum.
>@@ -58623,7 +58906,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMessageKind()
> 	 * @generated
> 	 */
>-	int MESSAGE_KIND = 255;
>+	int MESSAGE_KIND = 256;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.MessageSort Message Sort}' enum.
>@@ -58633,7 +58916,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMessageSort()
> 	 * @generated
> 	 */
>-	int MESSAGE_SORT = 256;
>+	int MESSAGE_SORT = 257;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.ObjectNodeOrderingKind Object Node Ordering Kind}' enum.
>@@ -58643,7 +58926,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getObjectNodeOrderingKind()
> 	 * @generated
> 	 */
>-	int OBJECT_NODE_ORDERING_KIND = 254;
>+	int OBJECT_NODE_ORDERING_KIND = 255;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.InteractionOperatorKind Interaction Operator Kind}' enum.
>@@ -58653,7 +58936,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInteractionOperatorKind()
> 	 * @generated
> 	 */
>-	int INTERACTION_OPERATOR_KIND = 257;
>+	int INTERACTION_OPERATOR_KIND = 258;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.uml2.uml.ExpansionKind Expansion Kind}' enum.
>@@ -58663,7 +58946,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExpansionKind()
> 	 * @generated
> 	 */
>-	int EXPANSION_KIND = 258;
>+	int EXPANSION_KIND = 259;
> 
> 	/**
> 	 * The meta object id for the 'Integer' data type.
>@@ -58672,7 +58955,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInteger()
> 	 * @generated
> 	 */
>-	int INTEGER = 259;
>+	int INTEGER = 260;
> 
> 	/**
> 	 * The meta object id for the 'Boolean' data type.
>@@ -58681,7 +58964,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getBoolean()
> 	 * @generated
> 	 */
>-	int BOOLEAN = 260;
>+	int BOOLEAN = 261;
> 
> 	/**
> 	 * The meta object id for the 'String' data type.
>@@ -58691,7 +58974,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getString()
> 	 * @generated
> 	 */
>-	int STRING = 261;
>+	int STRING = 262;
> 
> 	/**
> 	 * The meta object id for the 'Unlimited Natural' data type.
>@@ -58700,7 +58983,7 @@
> 	 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getUnlimitedNatural()
> 	 * @generated
> 	 */
>-	int UNLIMITED_NATURAL = 262;
>+	int UNLIMITED_NATURAL = 263;
> 
> 	/**
> 	 * Returns the meta object for class '{@link org.eclipse.uml2.uml.Comment Comment}'.
>@@ -59226,22 +59509,22 @@
> 	EReference getTemplateParameterSubstitution_Formal();
> 
> 	/**
>-	 * Returns the meta object for the reference list '{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getActuals Actual}'.
>+	 * Returns the meta object for the reference '{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getActual Actual}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the reference list 'Actual'.
>-	 * @see org.eclipse.uml2.uml.TemplateParameterSubstitution#getActuals()
>+	 * @return the meta object for the reference 'Actual'.
>+	 * @see org.eclipse.uml2.uml.TemplateParameterSubstitution#getActual()
> 	 * @see #getTemplateParameterSubstitution()
> 	 * @generated
> 	 */
> 	EReference getTemplateParameterSubstitution_Actual();
> 
> 	/**
>-	 * Returns the meta object for the containment reference list '{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getOwnedActuals Owned Actual}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getOwnedActual Owned Actual}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the containment reference list 'Owned Actual'.
>-	 * @see org.eclipse.uml2.uml.TemplateParameterSubstitution#getOwnedActuals()
>+	 * @return the meta object for the containment reference 'Owned Actual'.
>+	 * @see org.eclipse.uml2.uml.TemplateParameterSubstitution#getOwnedActual()
> 	 * @see #getTemplateParameterSubstitution()
> 	 * @generated
> 	 */
>@@ -62614,22 +62897,11 @@
> 	EAttribute getClassifierTemplateParameter_AllowSubstitutable();
> 
> 	/**
>-	 * Returns the meta object for the reference '{@link org.eclipse.uml2.uml.ClassifierTemplateParameter#getDefaultClassifier Default Classifier}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for the reference 'Default Classifier'.
>-	 * @see org.eclipse.uml2.uml.ClassifierTemplateParameter#getDefaultClassifier()
>-	 * @see #getClassifierTemplateParameter()
>-	 * @generated
>-	 */
>-	EReference getClassifierTemplateParameter_DefaultClassifier();
>-
>-	/**
>-	 * Returns the meta object for the reference '{@link org.eclipse.uml2.uml.ClassifierTemplateParameter#getConstrainingClassifier Constraining Classifier}'.
>+	 * Returns the meta object for the reference list '{@link org.eclipse.uml2.uml.ClassifierTemplateParameter#getConstrainingClassifiers Constraining Classifier}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the reference 'Constraining Classifier'.
>-	 * @see org.eclipse.uml2.uml.ClassifierTemplateParameter#getConstrainingClassifier()
>+	 * @return the meta object for the reference list 'Constraining Classifier'.
>+	 * @see org.eclipse.uml2.uml.ClassifierTemplateParameter#getConstrainingClassifiers()
> 	 * @see #getClassifierTemplateParameter()
> 	 * @generated
> 	 */
>@@ -65111,6 +65383,17 @@
> 	EReference getWriteStructuralFeatureAction_Value();
> 
> 	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#getResult Result}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Result'.
>+	 * @see org.eclipse.uml2.uml.WriteStructuralFeatureAction#getResult()
>+	 * @see #getWriteStructuralFeatureAction()
>+	 * @generated
>+	 */
>+	EReference getWriteStructuralFeatureAction_Result();
>+
>+	/**
> 	 * Returns the meta object for class '{@link org.eclipse.uml2.uml.ClearStructuralFeatureAction Clear Structural Feature Action}'.
> 	 * 
> 	 * 
>@@ -65121,6 +65404,17 @@
> 	EClass getClearStructuralFeatureAction();
> 
> 	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.uml2.uml.ClearStructuralFeatureAction#getResult Result}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Result'.
>+	 * @see org.eclipse.uml2.uml.ClearStructuralFeatureAction#getResult()
>+	 * @see #getClearStructuralFeatureAction()
>+	 * @generated
>+	 */
>+	EReference getClearStructuralFeatureAction_Result();
>+
>+	/**
> 	 * Returns the meta object for class '{@link org.eclipse.uml2.uml.RemoveStructuralFeatureValueAction Remove Structural Feature Value Action}'.
> 	 * 
> 	 * 
>@@ -65566,10 +65860,10 @@
> 	EClass getTimeExpression();
> 
> 	/**
>-	 * Returns the meta object for the reference '{@link org.eclipse.uml2.uml.TimeExpression#getExpr Expr}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.uml2.uml.TimeExpression#getExpr Expr}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the reference 'Expr'.
>+	 * @return the meta object for the containment reference 'Expr'.
> 	 * @see org.eclipse.uml2.uml.TimeExpression#getExpr()
> 	 * @see #getTimeExpression()
> 	 * @generated
>@@ -65608,10 +65902,10 @@
> 	EClass getDuration();
> 
> 	/**
>-	 * Returns the meta object for the reference '{@link org.eclipse.uml2.uml.Duration#getExpr Expr}'.
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.uml2.uml.Duration#getExpr Expr}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the reference 'Expr'.
>+	 * @return the meta object for the containment reference 'Expr'.
> 	 * @see org.eclipse.uml2.uml.Duration#getExpr()
> 	 * @see #getDuration()
> 	 * @generated
>@@ -66770,6 +67064,27 @@
> 	EAttribute getReduceAction_IsOrdered();
> 
> 	/**
>+	 * Returns the meta object for class '{@link org.eclipse.uml2.uml.StartObjectBehaviorAction Start Object Behavior Action}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Start Object Behavior Action'.
>+	 * @see org.eclipse.uml2.uml.StartObjectBehaviorAction
>+	 * @generated
>+	 */
>+	EClass getStartObjectBehaviorAction();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#getObject Object}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Object'.
>+	 * @see org.eclipse.uml2.uml.StartObjectBehaviorAction#getObject()
>+	 * @see #getStartObjectBehaviorAction()
>+	 * @generated
>+	 */
>+	EReference getStartObjectBehaviorAction_Object();
>+
>+	/**
> 	 * Returns the meta object for class '{@link org.eclipse.uml2.uml.ControlNode Control Node}'.
> 	 * 
> 	 * 
>@@ -66892,6 +67207,17 @@
> 	EReference getDecisionNode_DecisionInput();
> 
> 	/**
>+	 * Returns the meta object for the reference '{@link org.eclipse.uml2.uml.DecisionNode#getDecisionInputFlow Decision Input Flow}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the reference 'Decision Input Flow'.
>+	 * @see org.eclipse.uml2.uml.DecisionNode#getDecisionInputFlow()
>+	 * @see #getDecisionNode()
>+	 * @generated
>+	 */
>+	EReference getDecisionNode_DecisionInputFlow();
>+
>+	/**
> 	 * Returns the meta object for class '{@link org.eclipse.uml2.uml.ActivityFinalNode Activity Final Node}'.
> 	 * 
> 	 * 
>@@ -67354,11 +67680,11 @@
> 	EReference getComponentRealization_Abstraction();
> 
> 	/**
>-	 * Returns the meta object for the reference '{@link org.eclipse.uml2.uml.ComponentRealization#getRealizingClassifier Realizing Classifier}'.
>+	 * Returns the meta object for the reference list '{@link org.eclipse.uml2.uml.ComponentRealization#getRealizingClassifiers Realizing Classifier}'.
> 	 * 
> 	 * 
>-	 * @return the meta object for the reference 'Realizing Classifier'.
>-	 * @see org.eclipse.uml2.uml.ComponentRealization#getRealizingClassifier()
>+	 * @return the meta object for the reference list 'Realizing Classifier'.
>+	 * @see org.eclipse.uml2.uml.ComponentRealization#getRealizingClassifiers()
> 	 * @see #getComponentRealization()
> 	 * @generated
> 	 */
>@@ -67831,89 +68157,76 @@
> 		EReference ELEMENT__OWNED_COMMENT = eINSTANCE.getElement_OwnedComment();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.DirectedRelationshipImpl Directed Relationship}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.DirectedRelationshipImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDirectedRelationship()
>-		 * @generated
>-		 */
>-		EClass DIRECTED_RELATIONSHIP = eINSTANCE.getDirectedRelationship();
>-
>-		/**
>-		 * The meta object literal for the 'Source' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.PackageImpl Package}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.PackageImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPackage()
> 		 * @generated
> 		 */
>-		EReference DIRECTED_RELATIONSHIP__SOURCE = eINSTANCE
>-			.getDirectedRelationship_Source();
>+		EClass PACKAGE = eINSTANCE.getPackage();
> 
> 		/**
>-		 * The meta object literal for the 'Target' reference list feature.
>+		 * The meta object literal for the 'Owned Type' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference DIRECTED_RELATIONSHIP__TARGET = eINSTANCE
>-			.getDirectedRelationship_Target();
>+		EReference PACKAGE__OWNED_TYPE = eINSTANCE.getPackage_OwnedType();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.RelationshipImpl Relationship}' class.
>+		 * The meta object literal for the 'Package Merge' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.RelationshipImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getRelationship()
> 		 * @generated
> 		 */
>-		EClass RELATIONSHIP = eINSTANCE.getRelationship();
>+		EReference PACKAGE__PACKAGE_MERGE = eINSTANCE.getPackage_PackageMerge();
> 
> 		/**
>-		 * The meta object literal for the 'Related Element' reference list feature.
>+		 * The meta object literal for the 'Packaged Element' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference RELATIONSHIP__RELATED_ELEMENT = eINSTANCE
>-			.getRelationship_RelatedElement();
>+		EReference PACKAGE__PACKAGED_ELEMENT = eINSTANCE
>+			.getPackage_PackagedElement();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LiteralSpecificationImpl Literal Specification}' class.
>+		 * The meta object literal for the 'Nested Package' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.LiteralSpecificationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLiteralSpecification()
> 		 * @generated
> 		 */
>-		EClass LITERAL_SPECIFICATION = eINSTANCE.getLiteralSpecification();
>+		EReference PACKAGE__NESTED_PACKAGE = eINSTANCE
>+			.getPackage_NestedPackage();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ValueSpecificationImpl Value Specification}' class.
>+		 * The meta object literal for the 'Nesting Package' reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ValueSpecificationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getValueSpecification()
> 		 * @generated
> 		 */
>-		EClass VALUE_SPECIFICATION = eINSTANCE.getValueSpecification();
>+		EReference PACKAGE__NESTING_PACKAGE = eINSTANCE
>+			.getPackage_NestingPackage();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TypedElementImpl Typed Element}' class.
>+		 * The meta object literal for the 'Profile Application' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.TypedElementImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTypedElement()
> 		 * @generated
> 		 */
>-		EClass TYPED_ELEMENT = eINSTANCE.getTypedElement();
>+		EReference PACKAGE__PROFILE_APPLICATION = eINSTANCE
>+			.getPackage_ProfileApplication();
> 
> 		/**
>-		 * The meta object literal for the 'Type' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.PackageableElementImpl Packageable Element}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.PackageableElementImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPackageableElement()
> 		 * @generated
> 		 */
>-		EReference TYPED_ELEMENT__TYPE = eINSTANCE.getTypedElement_Type();
>+		EClass PACKAGEABLE_ELEMENT = eINSTANCE.getPackageableElement();
> 
> 		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.NamedElementImpl Named Element}' class.
>@@ -68005,1395 +68318,1094 @@
> 		EReference DEPENDENCY__CLIENT = eINSTANCE.getDependency_Client();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.PackageableElementImpl Packageable Element}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.DirectedRelationshipImpl Directed Relationship}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.PackageableElementImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPackageableElement()
>+		 * @see org.eclipse.uml2.uml.internal.impl.DirectedRelationshipImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDirectedRelationship()
> 		 * @generated
> 		 */
>-		EClass PACKAGEABLE_ELEMENT = eINSTANCE.getPackageableElement();
>+		EClass DIRECTED_RELATIONSHIP = eINSTANCE.getDirectedRelationship();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ParameterableElementImpl Parameterable Element}' class.
>+		 * The meta object literal for the 'Source' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ParameterableElementImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getParameterableElement()
> 		 * @generated
> 		 */
>-		EClass PARAMETERABLE_ELEMENT = eINSTANCE.getParameterableElement();
>+		EReference DIRECTED_RELATIONSHIP__SOURCE = eINSTANCE
>+			.getDirectedRelationship_Source();
> 
> 		/**
>-		 * The meta object literal for the 'Template Parameter' reference feature.
>+		 * The meta object literal for the 'Target' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PARAMETERABLE_ELEMENT__TEMPLATE_PARAMETER = eINSTANCE
>-			.getParameterableElement_TemplateParameter();
>+		EReference DIRECTED_RELATIONSHIP__TARGET = eINSTANCE
>+			.getDirectedRelationship_Target();
> 
> 		/**
>-		 * The meta object literal for the 'Owning Template Parameter' container reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.RelationshipImpl Relationship}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.RelationshipImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getRelationship()
> 		 * @generated
> 		 */
>-		EReference PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER = eINSTANCE
>-			.getParameterableElement_OwningTemplateParameter();
>+		EClass RELATIONSHIP = eINSTANCE.getRelationship();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TemplateParameterImpl Template Parameter}' class.
>+		 * The meta object literal for the 'Related Element' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.TemplateParameterImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTemplateParameter()
> 		 * @generated
> 		 */
>-		EClass TEMPLATE_PARAMETER = eINSTANCE.getTemplateParameter();
>+		EReference RELATIONSHIP__RELATED_ELEMENT = eINSTANCE
>+			.getRelationship_RelatedElement();
> 
> 		/**
>-		 * The meta object literal for the 'Signature' container reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.NamespaceImpl Namespace}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.NamespaceImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getNamespace()
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_PARAMETER__SIGNATURE = eINSTANCE
>-			.getTemplateParameter_Signature();
>+		EClass NAMESPACE = eINSTANCE.getNamespace();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Parametered Element' containment reference feature.
>+		 * The meta object literal for the 'Element Import' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT = eINSTANCE
>-			.getTemplateParameter_OwnedParameteredElement();
>+		EReference NAMESPACE__ELEMENT_IMPORT = eINSTANCE
>+			.getNamespace_ElementImport();
> 
> 		/**
>-		 * The meta object literal for the 'Default' reference feature.
>+		 * The meta object literal for the 'Package Import' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_PARAMETER__DEFAULT = eINSTANCE
>-			.getTemplateParameter_Default();
>+		EReference NAMESPACE__PACKAGE_IMPORT = eINSTANCE
>+			.getNamespace_PackageImport();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Default' containment reference feature.
>+		 * The meta object literal for the 'Owned Rule' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_PARAMETER__OWNED_DEFAULT = eINSTANCE
>-			.getTemplateParameter_OwnedDefault();
>+		EReference NAMESPACE__OWNED_RULE = eINSTANCE.getNamespace_OwnedRule();
> 
> 		/**
>-		 * The meta object literal for the 'Parametered Element' reference feature.
>+		 * The meta object literal for the 'Member' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_PARAMETER__PARAMETERED_ELEMENT = eINSTANCE
>-			.getTemplateParameter_ParameteredElement();
>+		EReference NAMESPACE__MEMBER = eINSTANCE.getNamespace_Member();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TemplateSignatureImpl Template Signature}' class.
>+		 * The meta object literal for the 'Imported Member' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.TemplateSignatureImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTemplateSignature()
> 		 * @generated
> 		 */
>-		EClass TEMPLATE_SIGNATURE = eINSTANCE.getTemplateSignature();
>+		EReference NAMESPACE__IMPORTED_MEMBER = eINSTANCE
>+			.getNamespace_ImportedMember();
> 
> 		/**
>-		 * The meta object literal for the 'Parameter' reference list feature.
>+		 * The meta object literal for the 'Owned Member' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_SIGNATURE__PARAMETER = eINSTANCE
>-			.getTemplateSignature_Parameter();
>+		EReference NAMESPACE__OWNED_MEMBER = eINSTANCE
>+			.getNamespace_OwnedMember();
> 
> 		/**
>-		 * The meta object literal for the 'Template' container reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ElementImportImpl Element Import}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ElementImportImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getElementImport()
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_SIGNATURE__TEMPLATE = eINSTANCE
>-			.getTemplateSignature_Template();
>+		EClass ELEMENT_IMPORT = eINSTANCE.getElementImport();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Parameter' containment reference list feature.
>+		 * The meta object literal for the 'Visibility' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_SIGNATURE__OWNED_PARAMETER = eINSTANCE
>-			.getTemplateSignature_OwnedParameter();
>+		EAttribute ELEMENT_IMPORT__VISIBILITY = eINSTANCE
>+			.getElementImport_Visibility();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TemplateableElementImpl Templateable Element}' class.
>+		 * The meta object literal for the 'Alias' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.TemplateableElementImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTemplateableElement()
> 		 * @generated
> 		 */
>-		EClass TEMPLATEABLE_ELEMENT = eINSTANCE.getTemplateableElement();
>+		EAttribute ELEMENT_IMPORT__ALIAS = eINSTANCE.getElementImport_Alias();
> 
> 		/**
>-		 * The meta object literal for the 'Template Binding' containment reference list feature.
>+		 * The meta object literal for the 'Imported Element' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATEABLE_ELEMENT__TEMPLATE_BINDING = eINSTANCE
>-			.getTemplateableElement_TemplateBinding();
>+		EReference ELEMENT_IMPORT__IMPORTED_ELEMENT = eINSTANCE
>+			.getElementImport_ImportedElement();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Template Signature' containment reference feature.
>+		 * The meta object literal for the 'Importing Namespace' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE = eINSTANCE
>-			.getTemplateableElement_OwnedTemplateSignature();
>+		EReference ELEMENT_IMPORT__IMPORTING_NAMESPACE = eINSTANCE
>+			.getElementImport_ImportingNamespace();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TemplateBindingImpl Template Binding}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.PackageImportImpl Package Import}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.TemplateBindingImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTemplateBinding()
>+		 * @see org.eclipse.uml2.uml.internal.impl.PackageImportImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPackageImport()
> 		 * @generated
> 		 */
>-		EClass TEMPLATE_BINDING = eINSTANCE.getTemplateBinding();
>+		EClass PACKAGE_IMPORT = eINSTANCE.getPackageImport();
> 
> 		/**
>-		 * The meta object literal for the 'Signature' reference feature.
>+		 * The meta object literal for the 'Visibility' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_BINDING__SIGNATURE = eINSTANCE
>-			.getTemplateBinding_Signature();
>+		EAttribute PACKAGE_IMPORT__VISIBILITY = eINSTANCE
>+			.getPackageImport_Visibility();
> 
> 		/**
>-		 * The meta object literal for the 'Parameter Substitution' containment reference list feature.
>+		 * The meta object literal for the 'Imported Package' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_BINDING__PARAMETER_SUBSTITUTION = eINSTANCE
>-			.getTemplateBinding_ParameterSubstitution();
>+		EReference PACKAGE_IMPORT__IMPORTED_PACKAGE = eINSTANCE
>+			.getPackageImport_ImportedPackage();
> 
> 		/**
>-		 * The meta object literal for the 'Bound Element' container reference feature.
>+		 * The meta object literal for the 'Importing Namespace' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_BINDING__BOUND_ELEMENT = eINSTANCE
>-			.getTemplateBinding_BoundElement();
>+		EReference PACKAGE_IMPORT__IMPORTING_NAMESPACE = eINSTANCE
>+			.getPackageImport_ImportingNamespace();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TemplateParameterSubstitutionImpl Template Parameter Substitution}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ConstraintImpl Constraint}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.TemplateParameterSubstitutionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTemplateParameterSubstitution()
>+		 * @see org.eclipse.uml2.uml.internal.impl.ConstraintImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConstraint()
> 		 * @generated
> 		 */
>-		EClass TEMPLATE_PARAMETER_SUBSTITUTION = eINSTANCE
>-			.getTemplateParameterSubstitution();
>+		EClass CONSTRAINT = eINSTANCE.getConstraint();
> 
> 		/**
>-		 * The meta object literal for the 'Formal' reference feature.
>+		 * The meta object literal for the 'Constrained Element' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_PARAMETER_SUBSTITUTION__FORMAL = eINSTANCE
>-			.getTemplateParameterSubstitution_Formal();
>+		EReference CONSTRAINT__CONSTRAINED_ELEMENT = eINSTANCE
>+			.getConstraint_ConstrainedElement();
> 
> 		/**
>-		 * The meta object literal for the 'Actual' reference list feature.
>+		 * The meta object literal for the 'Specification' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL = eINSTANCE
>-			.getTemplateParameterSubstitution_Actual();
>+		EReference CONSTRAINT__SPECIFICATION = eINSTANCE
>+			.getConstraint_Specification();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Actual' containment reference list feature.
>+		 * The meta object literal for the 'Context' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL = eINSTANCE
>-			.getTemplateParameterSubstitution_OwnedActual();
>+		EReference CONSTRAINT__CONTEXT = eINSTANCE.getConstraint_Context();
> 
> 		/**
>-		 * The meta object literal for the 'Template Binding' container reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ValueSpecificationImpl Value Specification}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ValueSpecificationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getValueSpecification()
> 		 * @generated
> 		 */
>-		EReference TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING = eINSTANCE
>-			.getTemplateParameterSubstitution_TemplateBinding();
>+		EClass VALUE_SPECIFICATION = eINSTANCE.getValueSpecification();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.NamespaceImpl Namespace}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TypedElementImpl Typed Element}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.NamespaceImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getNamespace()
>+		 * @see org.eclipse.uml2.uml.internal.impl.TypedElementImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTypedElement()
> 		 * @generated
> 		 */
>-		EClass NAMESPACE = eINSTANCE.getNamespace();
>+		EClass TYPED_ELEMENT = eINSTANCE.getTypedElement();
> 
> 		/**
>-		 * The meta object literal for the 'Element Import' containment reference list feature.
>+		 * The meta object literal for the 'Type' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference NAMESPACE__ELEMENT_IMPORT = eINSTANCE
>-			.getNamespace_ElementImport();
>+		EReference TYPED_ELEMENT__TYPE = eINSTANCE.getTypedElement_Type();
> 
> 		/**
>-		 * The meta object literal for the 'Package Import' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TypeImpl Type}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.TypeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getType()
> 		 * @generated
> 		 */
>-		EReference NAMESPACE__PACKAGE_IMPORT = eINSTANCE
>-			.getNamespace_PackageImport();
>+		EClass TYPE = eINSTANCE.getType();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Rule' containment reference list feature.
>+		 * The meta object literal for the 'Package' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference NAMESPACE__OWNED_RULE = eINSTANCE.getNamespace_OwnedRule();
>+		EReference TYPE__PACKAGE = eINSTANCE.getType_Package();
> 
> 		/**
>-		 * The meta object literal for the 'Member' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.AssociationImpl Association}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.AssociationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getAssociation()
> 		 * @generated
> 		 */
>-		EReference NAMESPACE__MEMBER = eINSTANCE.getNamespace_Member();
>+		EClass ASSOCIATION = eINSTANCE.getAssociation();
> 
> 		/**
>-		 * The meta object literal for the 'Imported Member' reference list feature.
>+		 * The meta object literal for the 'Owned End' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference NAMESPACE__IMPORTED_MEMBER = eINSTANCE
>-			.getNamespace_ImportedMember();
>+		EReference ASSOCIATION__OWNED_END = eINSTANCE.getAssociation_OwnedEnd();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Member' reference list feature.
>+		 * The meta object literal for the 'Member End' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference NAMESPACE__OWNED_MEMBER = eINSTANCE
>-			.getNamespace_OwnedMember();
>+		EReference ASSOCIATION__MEMBER_END = eINSTANCE
>+			.getAssociation_MemberEnd();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ElementImportImpl Element Import}' class.
>+		 * The meta object literal for the 'Is Derived' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ElementImportImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getElementImport()
> 		 * @generated
> 		 */
>-		EClass ELEMENT_IMPORT = eINSTANCE.getElementImport();
>+		EAttribute ASSOCIATION__IS_DERIVED = eINSTANCE
>+			.getAssociation_IsDerived();
> 
> 		/**
>-		 * The meta object literal for the 'Visibility' attribute feature.
>+		 * The meta object literal for the 'End Type' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute ELEMENT_IMPORT__VISIBILITY = eINSTANCE
>-			.getElementImport_Visibility();
>+		EReference ASSOCIATION__END_TYPE = eINSTANCE.getAssociation_EndType();
> 
> 		/**
>-		 * The meta object literal for the 'Alias' attribute feature.
>+		 * The meta object literal for the 'Navigable Owned End' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute ELEMENT_IMPORT__ALIAS = eINSTANCE.getElementImport_Alias();
>+		EReference ASSOCIATION__NAVIGABLE_OWNED_END = eINSTANCE
>+			.getAssociation_NavigableOwnedEnd();
> 
> 		/**
>-		 * The meta object literal for the 'Imported Element' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ClassifierImpl Classifier}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ClassifierImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getClassifier()
> 		 * @generated
> 		 */
>-		EReference ELEMENT_IMPORT__IMPORTED_ELEMENT = eINSTANCE
>-			.getElementImport_ImportedElement();
>+		EClass CLASSIFIER = eINSTANCE.getClassifier();
> 
> 		/**
>-		 * The meta object literal for the 'Importing Namespace' container reference feature.
>+		 * The meta object literal for the 'Is Abstract' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ELEMENT_IMPORT__IMPORTING_NAMESPACE = eINSTANCE
>-			.getElementImport_ImportingNamespace();
>+		EAttribute CLASSIFIER__IS_ABSTRACT = eINSTANCE
>+			.getClassifier_IsAbstract();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.PackageImportImpl Package Import}' class.
>+		 * The meta object literal for the 'Generalization' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.PackageImportImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPackageImport()
> 		 * @generated
> 		 */
>-		EClass PACKAGE_IMPORT = eINSTANCE.getPackageImport();
>+		EReference CLASSIFIER__GENERALIZATION = eINSTANCE
>+			.getClassifier_Generalization();
> 
> 		/**
>-		 * The meta object literal for the 'Visibility' attribute feature.
>+		 * The meta object literal for the 'Powertype Extent' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute PACKAGE_IMPORT__VISIBILITY = eINSTANCE
>-			.getPackageImport_Visibility();
>+		EReference CLASSIFIER__POWERTYPE_EXTENT = eINSTANCE
>+			.getClassifier_PowertypeExtent();
> 
> 		/**
>-		 * The meta object literal for the 'Imported Package' reference feature.
>+		 * The meta object literal for the 'Feature' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PACKAGE_IMPORT__IMPORTED_PACKAGE = eINSTANCE
>-			.getPackageImport_ImportedPackage();
>+		EReference CLASSIFIER__FEATURE = eINSTANCE.getClassifier_Feature();
> 
> 		/**
>-		 * The meta object literal for the 'Importing Namespace' container reference feature.
>+		 * The meta object literal for the 'Inherited Member' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PACKAGE_IMPORT__IMPORTING_NAMESPACE = eINSTANCE
>-			.getPackageImport_ImportingNamespace();
>+		EReference CLASSIFIER__INHERITED_MEMBER = eINSTANCE
>+			.getClassifier_InheritedMember();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.PackageImpl Package}' class.
>+		 * The meta object literal for the 'Redefined Classifier' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.PackageImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPackage()
> 		 * @generated
> 		 */
>-		EClass PACKAGE = eINSTANCE.getPackage();
>+		EReference CLASSIFIER__REDEFINED_CLASSIFIER = eINSTANCE
>+			.getClassifier_RedefinedClassifier();
> 
> 		/**
>-		 * The meta object literal for the 'Package Merge' containment reference list feature.
>+		 * The meta object literal for the 'General' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PACKAGE__PACKAGE_MERGE = eINSTANCE.getPackage_PackageMerge();
>+		EReference CLASSIFIER__GENERAL = eINSTANCE.getClassifier_General();
> 
> 		/**
>-		 * The meta object literal for the 'Packaged Element' containment reference list feature.
>+		 * The meta object literal for the 'Substitution' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PACKAGE__PACKAGED_ELEMENT = eINSTANCE
>-			.getPackage_PackagedElement();
>+		EReference CLASSIFIER__SUBSTITUTION = eINSTANCE
>+			.getClassifier_Substitution();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Type' reference list feature.
>+		 * The meta object literal for the 'Attribute' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PACKAGE__OWNED_TYPE = eINSTANCE.getPackage_OwnedType();
>+		EReference CLASSIFIER__ATTRIBUTE = eINSTANCE.getClassifier_Attribute();
> 
> 		/**
>-		 * The meta object literal for the 'Nested Package' reference list feature.
>+		 * The meta object literal for the 'Representation' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PACKAGE__NESTED_PACKAGE = eINSTANCE
>-			.getPackage_NestedPackage();
>+		EReference CLASSIFIER__REPRESENTATION = eINSTANCE
>+			.getClassifier_Representation();
> 
> 		/**
>-		 * The meta object literal for the 'Nesting Package' reference feature.
>+		 * The meta object literal for the 'Collaboration Use' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PACKAGE__NESTING_PACKAGE = eINSTANCE
>-			.getPackage_NestingPackage();
>+		EReference CLASSIFIER__COLLABORATION_USE = eINSTANCE
>+			.getClassifier_CollaborationUse();
> 
> 		/**
>-		 * The meta object literal for the 'Profile Application' containment reference list feature.
>+		 * The meta object literal for the 'Owned Use Case' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PACKAGE__PROFILE_APPLICATION = eINSTANCE
>-			.getPackage_ProfileApplication();
>+		EReference CLASSIFIER__OWNED_USE_CASE = eINSTANCE
>+			.getClassifier_OwnedUseCase();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.PackageMergeImpl Package Merge}' class.
>+		 * The meta object literal for the 'Use Case' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.PackageMergeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPackageMerge()
> 		 * @generated
> 		 */
>-		EClass PACKAGE_MERGE = eINSTANCE.getPackageMerge();
>+		EReference CLASSIFIER__USE_CASE = eINSTANCE.getClassifier_UseCase();
> 
> 		/**
>-		 * The meta object literal for the 'Merged Package' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.RedefinableElementImpl Redefinable Element}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.RedefinableElementImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getRedefinableElement()
> 		 * @generated
> 		 */
>-		EReference PACKAGE_MERGE__MERGED_PACKAGE = eINSTANCE
>-			.getPackageMerge_MergedPackage();
>+		EClass REDEFINABLE_ELEMENT = eINSTANCE.getRedefinableElement();
> 
> 		/**
>-		 * The meta object literal for the 'Receiving Package' container reference feature.
>+		 * The meta object literal for the 'Is Leaf' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PACKAGE_MERGE__RECEIVING_PACKAGE = eINSTANCE
>-			.getPackageMerge_ReceivingPackage();
>+		EAttribute REDEFINABLE_ELEMENT__IS_LEAF = eINSTANCE
>+			.getRedefinableElement_IsLeaf();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TypeImpl Type}' class.
>+		 * The meta object literal for the 'Redefined Element' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.TypeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getType()
> 		 * @generated
> 		 */
>-		EClass TYPE = eINSTANCE.getType();
>+		EReference REDEFINABLE_ELEMENT__REDEFINED_ELEMENT = eINSTANCE
>+			.getRedefinableElement_RedefinedElement();
> 
> 		/**
>-		 * The meta object literal for the 'Package' reference feature.
>+		 * The meta object literal for the 'Redefinition Context' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference TYPE__PACKAGE = eINSTANCE.getType_Package();
>+		EReference REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT = eINSTANCE
>+			.getRedefinableElement_RedefinitionContext();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ProfileApplicationImpl Profile Application}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TemplateableElementImpl Templateable Element}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ProfileApplicationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getProfileApplication()
>+		 * @see org.eclipse.uml2.uml.internal.impl.TemplateableElementImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTemplateableElement()
> 		 * @generated
> 		 */
>-		EClass PROFILE_APPLICATION = eINSTANCE.getProfileApplication();
>+		EClass TEMPLATEABLE_ELEMENT = eINSTANCE.getTemplateableElement();
> 
> 		/**
>-		 * The meta object literal for the 'Applied Profile' reference feature.
>+		 * The meta object literal for the 'Template Binding' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PROFILE_APPLICATION__APPLIED_PROFILE = eINSTANCE
>-			.getProfileApplication_AppliedProfile();
>+		EReference TEMPLATEABLE_ELEMENT__TEMPLATE_BINDING = eINSTANCE
>+			.getTemplateableElement_TemplateBinding();
> 
> 		/**
>-		 * The meta object literal for the 'Is Strict' attribute feature.
>+		 * The meta object literal for the 'Owned Template Signature' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute PROFILE_APPLICATION__IS_STRICT = eINSTANCE
>-			.getProfileApplication_IsStrict();
>+		EReference TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE = eINSTANCE
>+			.getTemplateableElement_OwnedTemplateSignature();
> 
> 		/**
>-		 * The meta object literal for the 'Applying Package' container reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TemplateBindingImpl Template Binding}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.TemplateBindingImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTemplateBinding()
> 		 * @generated
> 		 */
>-		EReference PROFILE_APPLICATION__APPLYING_PACKAGE = eINSTANCE
>-			.getProfileApplication_ApplyingPackage();
>+		EClass TEMPLATE_BINDING = eINSTANCE.getTemplateBinding();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ProfileImpl Profile}' class.
>+		 * The meta object literal for the 'Signature' reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ProfileImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getProfile()
> 		 * @generated
> 		 */
>-		EClass PROFILE = eINSTANCE.getProfile();
>+		EReference TEMPLATE_BINDING__SIGNATURE = eINSTANCE
>+			.getTemplateBinding_Signature();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Stereotype' reference list feature.
>+		 * The meta object literal for the 'Parameter Substitution' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PROFILE__OWNED_STEREOTYPE = eINSTANCE
>-			.getProfile_OwnedStereotype();
>+		EReference TEMPLATE_BINDING__PARAMETER_SUBSTITUTION = eINSTANCE
>+			.getTemplateBinding_ParameterSubstitution();
> 
> 		/**
>-		 * The meta object literal for the 'Metaclass Reference' reference list feature.
>+		 * The meta object literal for the 'Bound Element' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PROFILE__METACLASS_REFERENCE = eINSTANCE
>-			.getProfile_MetaclassReference();
>+		EReference TEMPLATE_BINDING__BOUND_ELEMENT = eINSTANCE
>+			.getTemplateBinding_BoundElement();
> 
> 		/**
>-		 * The meta object literal for the 'Metamodel Reference' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TemplateSignatureImpl Template Signature}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.TemplateSignatureImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTemplateSignature()
> 		 * @generated
> 		 */
>-		EReference PROFILE__METAMODEL_REFERENCE = eINSTANCE
>-			.getProfile_MetamodelReference();
>+		EClass TEMPLATE_SIGNATURE = eINSTANCE.getTemplateSignature();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.StereotypeImpl Stereotype}' class.
>+		 * The meta object literal for the 'Parameter' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.StereotypeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStereotype()
> 		 * @generated
> 		 */
>-		EClass STEREOTYPE = eINSTANCE.getStereotype();
>+		EReference TEMPLATE_SIGNATURE__PARAMETER = eINSTANCE
>+			.getTemplateSignature_Parameter();
> 
> 		/**
>-		 * The meta object literal for the 'Icon' containment reference list feature.
>+		 * The meta object literal for the 'Owned Parameter' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference STEREOTYPE__ICON = eINSTANCE.getStereotype_Icon();
>+		EReference TEMPLATE_SIGNATURE__OWNED_PARAMETER = eINSTANCE
>+			.getTemplateSignature_OwnedParameter();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ClassImpl Class}' class.
>+		 * The meta object literal for the 'Template' container reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ClassImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getClass_()
> 		 * @generated
> 		 */
>-		EClass CLASS = eINSTANCE.getClass_();
>+		EReference TEMPLATE_SIGNATURE__TEMPLATE = eINSTANCE
>+			.getTemplateSignature_Template();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Operation' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TemplateParameterImpl Template Parameter}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.TemplateParameterImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTemplateParameter()
> 		 * @generated
> 		 */
>-		EReference CLASS__OWNED_OPERATION = eINSTANCE.getClass_OwnedOperation();
>+		EClass TEMPLATE_PARAMETER = eINSTANCE.getTemplateParameter();
> 
> 		/**
>-		 * The meta object literal for the 'Nested Classifier' containment reference list feature.
>+		 * The meta object literal for the 'Signature' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASS__NESTED_CLASSIFIER = eINSTANCE
>-			.getClass_NestedClassifier();
>+		EReference TEMPLATE_PARAMETER__SIGNATURE = eINSTANCE
>+			.getTemplateParameter_Signature();
> 
> 		/**
>-		 * The meta object literal for the 'Super Class' reference list feature.
>+		 * The meta object literal for the 'Parametered Element' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASS__SUPER_CLASS = eINSTANCE.getClass_SuperClass();
>+		EReference TEMPLATE_PARAMETER__PARAMETERED_ELEMENT = eINSTANCE
>+			.getTemplateParameter_ParameteredElement();
> 
> 		/**
>-		 * The meta object literal for the 'Is Active' attribute feature.
>+		 * The meta object literal for the 'Owned Parametered Element' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute CLASS__IS_ACTIVE = eINSTANCE.getClass_IsActive();
>+		EReference TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT = eINSTANCE
>+			.getTemplateParameter_OwnedParameteredElement();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Reception' containment reference list feature.
>+		 * The meta object literal for the 'Default' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASS__OWNED_RECEPTION = eINSTANCE.getClass_OwnedReception();
>+		EReference TEMPLATE_PARAMETER__DEFAULT = eINSTANCE
>+			.getTemplateParameter_Default();
> 
> 		/**
>-		 * The meta object literal for the 'Extension' reference list feature.
>+		 * The meta object literal for the 'Owned Default' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASS__EXTENSION = eINSTANCE.getClass_Extension();
>+		EReference TEMPLATE_PARAMETER__OWNED_DEFAULT = eINSTANCE
>+			.getTemplateParameter_OwnedDefault();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.BehavioredClassifierImpl Behaviored Classifier}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ParameterableElementImpl Parameterable Element}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.BehavioredClassifierImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getBehavioredClassifier()
>+		 * @see org.eclipse.uml2.uml.internal.impl.ParameterableElementImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getParameterableElement()
> 		 * @generated
> 		 */
>-		EClass BEHAVIORED_CLASSIFIER = eINSTANCE.getBehavioredClassifier();
>+		EClass PARAMETERABLE_ELEMENT = eINSTANCE.getParameterableElement();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Behavior' containment reference list feature.
>+		 * The meta object literal for the 'Owning Template Parameter' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference BEHAVIORED_CLASSIFIER__OWNED_BEHAVIOR = eINSTANCE
>-			.getBehavioredClassifier_OwnedBehavior();
>+		EReference PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER = eINSTANCE
>+			.getParameterableElement_OwningTemplateParameter();
> 
> 		/**
>-		 * The meta object literal for the 'Classifier Behavior' reference feature.
>+		 * The meta object literal for the 'Template Parameter' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference BEHAVIORED_CLASSIFIER__CLASSIFIER_BEHAVIOR = eINSTANCE
>-			.getBehavioredClassifier_ClassifierBehavior();
>+		EReference PARAMETERABLE_ELEMENT__TEMPLATE_PARAMETER = eINSTANCE
>+			.getParameterableElement_TemplateParameter();
> 
> 		/**
>-		 * The meta object literal for the 'Interface Realization' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TemplateParameterSubstitutionImpl Template Parameter Substitution}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.TemplateParameterSubstitutionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTemplateParameterSubstitution()
> 		 * @generated
> 		 */
>-		EReference BEHAVIORED_CLASSIFIER__INTERFACE_REALIZATION = eINSTANCE
>-			.getBehavioredClassifier_InterfaceRealization();
>+		EClass TEMPLATE_PARAMETER_SUBSTITUTION = eINSTANCE
>+			.getTemplateParameterSubstitution();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Trigger' containment reference list feature.
>+		 * The meta object literal for the 'Formal' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference BEHAVIORED_CLASSIFIER__OWNED_TRIGGER = eINSTANCE
>-			.getBehavioredClassifier_OwnedTrigger();
>+		EReference TEMPLATE_PARAMETER_SUBSTITUTION__FORMAL = eINSTANCE
>+			.getTemplateParameterSubstitution_Formal();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ClassifierImpl Classifier}' class.
>+		 * The meta object literal for the 'Actual' reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ClassifierImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getClassifier()
> 		 * @generated
> 		 */
>-		EClass CLASSIFIER = eINSTANCE.getClassifier();
>+		EReference TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL = eINSTANCE
>+			.getTemplateParameterSubstitution_Actual();
> 
> 		/**
>-		 * The meta object literal for the 'Is Abstract' attribute feature.
>+		 * The meta object literal for the 'Owned Actual' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute CLASSIFIER__IS_ABSTRACT = eINSTANCE
>-			.getClassifier_IsAbstract();
>+		EReference TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL = eINSTANCE
>+			.getTemplateParameterSubstitution_OwnedActual();
> 
> 		/**
>-		 * The meta object literal for the 'Generalization' containment reference list feature.
>+		 * The meta object literal for the 'Template Binding' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER__GENERALIZATION = eINSTANCE
>-			.getClassifier_Generalization();
>+		EReference TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING = eINSTANCE
>+			.getTemplateParameterSubstitution_TemplateBinding();
> 
> 		/**
>-		 * The meta object literal for the 'Powertype Extent' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.GeneralizationImpl Generalization}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.GeneralizationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getGeneralization()
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER__POWERTYPE_EXTENT = eINSTANCE
>-			.getClassifier_PowertypeExtent();
>+		EClass GENERALIZATION = eINSTANCE.getGeneralization();
> 
> 		/**
>-		 * The meta object literal for the 'Feature' reference list feature.
>+		 * The meta object literal for the 'Is Substitutable' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER__FEATURE = eINSTANCE.getClassifier_Feature();
>+		EAttribute GENERALIZATION__IS_SUBSTITUTABLE = eINSTANCE
>+			.getGeneralization_IsSubstitutable();
> 
> 		/**
>-		 * The meta object literal for the 'Inherited Member' reference list feature.
>+		 * The meta object literal for the 'General' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER__INHERITED_MEMBER = eINSTANCE
>-			.getClassifier_InheritedMember();
>+		EReference GENERALIZATION__GENERAL = eINSTANCE
>+			.getGeneralization_General();
> 
> 		/**
>-		 * The meta object literal for the 'Redefined Classifier' reference list feature.
>+		 * The meta object literal for the 'Generalization Set' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER__REDEFINED_CLASSIFIER = eINSTANCE
>-			.getClassifier_RedefinedClassifier();
>+		EReference GENERALIZATION__GENERALIZATION_SET = eINSTANCE
>+			.getGeneralization_GeneralizationSet();
> 
> 		/**
>-		 * The meta object literal for the 'General' reference list feature.
>+		 * The meta object literal for the 'Specific' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER__GENERAL = eINSTANCE.getClassifier_General();
>+		EReference GENERALIZATION__SPECIFIC = eINSTANCE
>+			.getGeneralization_Specific();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Use Case' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.GeneralizationSetImpl Generalization Set}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.GeneralizationSetImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getGeneralizationSet()
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER__OWNED_USE_CASE = eINSTANCE
>-			.getClassifier_OwnedUseCase();
>+		EClass GENERALIZATION_SET = eINSTANCE.getGeneralizationSet();
> 
> 		/**
>-		 * The meta object literal for the 'Use Case' reference list feature.
>+		 * The meta object literal for the 'Is Covering' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER__USE_CASE = eINSTANCE.getClassifier_UseCase();
>+		EAttribute GENERALIZATION_SET__IS_COVERING = eINSTANCE
>+			.getGeneralizationSet_IsCovering();
> 
> 		/**
>-		 * The meta object literal for the 'Substitution' containment reference list feature.
>+		 * The meta object literal for the 'Is Disjoint' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER__SUBSTITUTION = eINSTANCE
>-			.getClassifier_Substitution();
>+		EAttribute GENERALIZATION_SET__IS_DISJOINT = eINSTANCE
>+			.getGeneralizationSet_IsDisjoint();
> 
> 		/**
>-		 * The meta object literal for the 'Attribute' reference list feature.
>+		 * The meta object literal for the 'Powertype' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER__ATTRIBUTE = eINSTANCE.getClassifier_Attribute();
>+		EReference GENERALIZATION_SET__POWERTYPE = eINSTANCE
>+			.getGeneralizationSet_Powertype();
> 
> 		/**
>-		 * The meta object literal for the 'Representation' reference feature.
>+		 * The meta object literal for the 'Generalization' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER__REPRESENTATION = eINSTANCE
>-			.getClassifier_Representation();
>+		EReference GENERALIZATION_SET__GENERALIZATION = eINSTANCE
>+			.getGeneralizationSet_Generalization();
> 
> 		/**
>-		 * The meta object literal for the 'Collaboration Use' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.FeatureImpl Feature}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.FeatureImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getFeature()
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER__COLLABORATION_USE = eINSTANCE
>-			.getClassifier_CollaborationUse();
>+		EClass FEATURE = eINSTANCE.getFeature();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.RedefinableElementImpl Redefinable Element}' class.
>+		 * The meta object literal for the 'Is Static' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.RedefinableElementImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getRedefinableElement()
> 		 * @generated
> 		 */
>-		EClass REDEFINABLE_ELEMENT = eINSTANCE.getRedefinableElement();
>+		EAttribute FEATURE__IS_STATIC = eINSTANCE.getFeature_IsStatic();
> 
> 		/**
>-		 * The meta object literal for the 'Is Leaf' attribute feature.
>+		 * The meta object literal for the 'Featuring Classifier' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute REDEFINABLE_ELEMENT__IS_LEAF = eINSTANCE
>-			.getRedefinableElement_IsLeaf();
>+		EReference FEATURE__FEATURING_CLASSIFIER = eINSTANCE
>+			.getFeature_FeaturingClassifier();
> 
> 		/**
>-		 * The meta object literal for the 'Redefined Element' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SubstitutionImpl Substitution}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.SubstitutionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSubstitution()
> 		 * @generated
> 		 */
>-		EReference REDEFINABLE_ELEMENT__REDEFINED_ELEMENT = eINSTANCE
>-			.getRedefinableElement_RedefinedElement();
>+		EClass SUBSTITUTION = eINSTANCE.getSubstitution();
> 
> 		/**
>-		 * The meta object literal for the 'Redefinition Context' reference list feature.
>+		 * The meta object literal for the 'Contract' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT = eINSTANCE
>-			.getRedefinableElement_RedefinitionContext();
>+		EReference SUBSTITUTION__CONTRACT = eINSTANCE
>+			.getSubstitution_Contract();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.GeneralizationImpl Generalization}' class.
>+		 * The meta object literal for the 'Substituting Classifier' container reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.GeneralizationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getGeneralization()
> 		 * @generated
> 		 */
>-		EClass GENERALIZATION = eINSTANCE.getGeneralization();
>+		EReference SUBSTITUTION__SUBSTITUTING_CLASSIFIER = eINSTANCE
>+			.getSubstitution_SubstitutingClassifier();
> 
> 		/**
>-		 * The meta object literal for the 'Is Substitutable' attribute feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.RealizationImpl Realization}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.RealizationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getRealization()
> 		 * @generated
> 		 */
>-		EAttribute GENERALIZATION__IS_SUBSTITUTABLE = eINSTANCE
>-			.getGeneralization_IsSubstitutable();
>+		EClass REALIZATION = eINSTANCE.getRealization();
> 
> 		/**
>-		 * The meta object literal for the 'General' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.AbstractionImpl Abstraction}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.AbstractionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getAbstraction()
> 		 * @generated
> 		 */
>-		EReference GENERALIZATION__GENERAL = eINSTANCE
>-			.getGeneralization_General();
>+		EClass ABSTRACTION = eINSTANCE.getAbstraction();
> 
> 		/**
>-		 * The meta object literal for the 'Generalization Set' reference list feature.
>+		 * The meta object literal for the 'Mapping' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference GENERALIZATION__GENERALIZATION_SET = eINSTANCE
>-			.getGeneralization_GeneralizationSet();
>+		EReference ABSTRACTION__MAPPING = eINSTANCE.getAbstraction_Mapping();
> 
> 		/**
>-		 * The meta object literal for the 'Specific' container reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.OpaqueExpressionImpl Opaque Expression}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.OpaqueExpressionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getOpaqueExpression()
> 		 * @generated
> 		 */
>-		EReference GENERALIZATION__SPECIFIC = eINSTANCE
>-			.getGeneralization_Specific();
>+		EClass OPAQUE_EXPRESSION = eINSTANCE.getOpaqueExpression();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.GeneralizationSetImpl Generalization Set}' class.
>+		 * The meta object literal for the 'Body' attribute list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.GeneralizationSetImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getGeneralizationSet()
> 		 * @generated
> 		 */
>-		EClass GENERALIZATION_SET = eINSTANCE.getGeneralizationSet();
>+		EAttribute OPAQUE_EXPRESSION__BODY = eINSTANCE
>+			.getOpaqueExpression_Body();
> 
> 		/**
>-		 * The meta object literal for the 'Is Covering' attribute feature.
>+		 * The meta object literal for the 'Language' attribute list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute GENERALIZATION_SET__IS_COVERING = eINSTANCE
>-			.getGeneralizationSet_IsCovering();
>+		EAttribute OPAQUE_EXPRESSION__LANGUAGE = eINSTANCE
>+			.getOpaqueExpression_Language();
> 
> 		/**
>-		 * The meta object literal for the 'Is Disjoint' attribute feature.
>+		 * The meta object literal for the 'Result' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute GENERALIZATION_SET__IS_DISJOINT = eINSTANCE
>-			.getGeneralizationSet_IsDisjoint();
>+		EReference OPAQUE_EXPRESSION__RESULT = eINSTANCE
>+			.getOpaqueExpression_Result();
> 
> 		/**
>-		 * The meta object literal for the 'Powertype' reference feature.
>+		 * The meta object literal for the 'Behavior' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference GENERALIZATION_SET__POWERTYPE = eINSTANCE
>-			.getGeneralizationSet_Powertype();
>+		EReference OPAQUE_EXPRESSION__BEHAVIOR = eINSTANCE
>+			.getOpaqueExpression_Behavior();
> 
> 		/**
>-		 * The meta object literal for the 'Generalization' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ParameterImpl Parameter}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ParameterImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getParameter()
> 		 * @generated
> 		 */
>-		EReference GENERALIZATION_SET__GENERALIZATION = eINSTANCE
>-			.getGeneralizationSet_Generalization();
>+		EClass PARAMETER = eINSTANCE.getParameter();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.FeatureImpl Feature}' class.
>+		 * The meta object literal for the 'Parameter Set' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.FeatureImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getFeature()
> 		 * @generated
> 		 */
>-		EClass FEATURE = eINSTANCE.getFeature();
>+		EReference PARAMETER__PARAMETER_SET = eINSTANCE
>+			.getParameter_ParameterSet();
> 
> 		/**
>-		 * The meta object literal for the 'Is Static' attribute feature.
>+		 * The meta object literal for the 'Operation' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute FEATURE__IS_STATIC = eINSTANCE.getFeature_IsStatic();
>+		EReference PARAMETER__OPERATION = eINSTANCE.getParameter_Operation();
> 
> 		/**
>-		 * The meta object literal for the 'Featuring Classifier' reference list feature.
>+		 * The meta object literal for the 'Direction' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference FEATURE__FEATURING_CLASSIFIER = eINSTANCE
>-			.getFeature_FeaturingClassifier();
>+		EAttribute PARAMETER__DIRECTION = eINSTANCE.getParameter_Direction();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.UseCaseImpl Use Case}' class.
>+		 * The meta object literal for the 'Default' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.UseCaseImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getUseCase()
> 		 * @generated
> 		 */
>-		EClass USE_CASE = eINSTANCE.getUseCase();
>+		EAttribute PARAMETER__DEFAULT = eINSTANCE.getParameter_Default();
> 
> 		/**
>-		 * The meta object literal for the 'Include' containment reference list feature.
>+		 * The meta object literal for the 'Default Value' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference USE_CASE__INCLUDE = eINSTANCE.getUseCase_Include();
>+		EReference PARAMETER__DEFAULT_VALUE = eINSTANCE
>+			.getParameter_DefaultValue();
> 
> 		/**
>-		 * The meta object literal for the 'Extend' containment reference list feature.
>+		 * The meta object literal for the 'Is Exception' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference USE_CASE__EXTEND = eINSTANCE.getUseCase_Extend();
>+		EAttribute PARAMETER__IS_EXCEPTION = eINSTANCE
>+			.getParameter_IsException();
> 
> 		/**
>-		 * The meta object literal for the 'Extension Point' containment reference list feature.
>+		 * The meta object literal for the 'Is Stream' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference USE_CASE__EXTENSION_POINT = eINSTANCE
>-			.getUseCase_ExtensionPoint();
>+		EAttribute PARAMETER__IS_STREAM = eINSTANCE.getParameter_IsStream();
> 
> 		/**
>-		 * The meta object literal for the 'Subject' reference list feature.
>+		 * The meta object literal for the 'Effect' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference USE_CASE__SUBJECT = eINSTANCE.getUseCase_Subject();
>+		EAttribute PARAMETER__EFFECT = eINSTANCE.getParameter_Effect();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.IncludeImpl Include}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.MultiplicityElementImpl Multiplicity Element}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.IncludeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInclude()
>+		 * @see org.eclipse.uml2.uml.internal.impl.MultiplicityElementImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMultiplicityElement()
> 		 * @generated
> 		 */
>-		EClass INCLUDE = eINSTANCE.getInclude();
>+		EClass MULTIPLICITY_ELEMENT = eINSTANCE.getMultiplicityElement();
> 
> 		/**
>-		 * The meta object literal for the 'Addition' reference feature.
>+		 * The meta object literal for the 'Is Ordered' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference INCLUDE__ADDITION = eINSTANCE.getInclude_Addition();
>+		EAttribute MULTIPLICITY_ELEMENT__IS_ORDERED = eINSTANCE
>+			.getMultiplicityElement_IsOrdered();
> 
> 		/**
>-		 * The meta object literal for the 'Including Case' container reference feature.
>+		 * The meta object literal for the 'Is Unique' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference INCLUDE__INCLUDING_CASE = eINSTANCE
>-			.getInclude_IncludingCase();
>+		EAttribute MULTIPLICITY_ELEMENT__IS_UNIQUE = eINSTANCE
>+			.getMultiplicityElement_IsUnique();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExtendImpl Extend}' class.
>+		 * The meta object literal for the 'Upper' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ExtendImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExtend()
> 		 * @generated
> 		 */
>-		EClass EXTEND = eINSTANCE.getExtend();
>+		EAttribute MULTIPLICITY_ELEMENT__UPPER = eINSTANCE
>+			.getMultiplicityElement_Upper();
> 
> 		/**
>-		 * The meta object literal for the 'Extended Case' reference feature.
>+		 * The meta object literal for the 'Lower' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference EXTEND__EXTENDED_CASE = eINSTANCE.getExtend_ExtendedCase();
>+		EAttribute MULTIPLICITY_ELEMENT__LOWER = eINSTANCE
>+			.getMultiplicityElement_Lower();
> 
> 		/**
>-		 * The meta object literal for the 'Condition' containment reference feature.
>+		 * The meta object literal for the 'Upper Value' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference EXTEND__CONDITION = eINSTANCE.getExtend_Condition();
>+		EReference MULTIPLICITY_ELEMENT__UPPER_VALUE = eINSTANCE
>+			.getMultiplicityElement_UpperValue();
> 
> 		/**
>-		 * The meta object literal for the 'Extension Location' reference list feature.
>+		 * The meta object literal for the 'Lower Value' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference EXTEND__EXTENSION_LOCATION = eINSTANCE
>-			.getExtend_ExtensionLocation();
>+		EReference MULTIPLICITY_ELEMENT__LOWER_VALUE = eINSTANCE
>+			.getMultiplicityElement_LowerValue();
> 
> 		/**
>-		 * The meta object literal for the 'Extension' container reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ConnectableElementImpl Connectable Element}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ConnectableElementImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConnectableElement()
> 		 * @generated
> 		 */
>-		EReference EXTEND__EXTENSION = eINSTANCE.getExtend_Extension();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ConstraintImpl Constraint}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ConstraintImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConstraint()
>-		 * @generated
>-		 */
>-		EClass CONSTRAINT = eINSTANCE.getConstraint();
>-
>-		/**
>-		 * The meta object literal for the 'Constrained Element' reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference CONSTRAINT__CONSTRAINED_ELEMENT = eINSTANCE
>-			.getConstraint_ConstrainedElement();
>-
>-		/**
>-		 * The meta object literal for the 'Specification' containment reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference CONSTRAINT__SPECIFICATION = eINSTANCE
>-			.getConstraint_Specification();
>-
>-		/**
>-		 * The meta object literal for the 'Context' container reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference CONSTRAINT__CONTEXT = eINSTANCE.getConstraint_Context();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExtensionPointImpl Extension Point}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ExtensionPointImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExtensionPoint()
>-		 * @generated
>-		 */
>-		EClass EXTENSION_POINT = eINSTANCE.getExtensionPoint();
>-
>-		/**
>-		 * The meta object literal for the 'Use Case' container reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference EXTENSION_POINT__USE_CASE = eINSTANCE
>-			.getExtensionPoint_UseCase();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SubstitutionImpl Substitution}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.SubstitutionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSubstitution()
>-		 * @generated
>-		 */
>-		EClass SUBSTITUTION = eINSTANCE.getSubstitution();
>-
>-		/**
>-		 * The meta object literal for the 'Contract' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference SUBSTITUTION__CONTRACT = eINSTANCE
>-			.getSubstitution_Contract();
>-
>-		/**
>-		 * The meta object literal for the 'Substituting Classifier' container reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference SUBSTITUTION__SUBSTITUTING_CLASSIFIER = eINSTANCE
>-			.getSubstitution_SubstitutingClassifier();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.RealizationImpl Realization}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.RealizationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getRealization()
>-		 * @generated
>-		 */
>-		EClass REALIZATION = eINSTANCE.getRealization();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.AbstractionImpl Abstraction}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.AbstractionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getAbstraction()
>-		 * @generated
>-		 */
>-		EClass ABSTRACTION = eINSTANCE.getAbstraction();
>-
>-		/**
>-		 * The meta object literal for the 'Mapping' containment reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference ABSTRACTION__MAPPING = eINSTANCE.getAbstraction_Mapping();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.OpaqueExpressionImpl Opaque Expression}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.OpaqueExpressionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getOpaqueExpression()
>-		 * @generated
>-		 */
>-		EClass OPAQUE_EXPRESSION = eINSTANCE.getOpaqueExpression();
>-
>-		/**
>-		 * The meta object literal for the 'Body' attribute list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute OPAQUE_EXPRESSION__BODY = eINSTANCE
>-			.getOpaqueExpression_Body();
>-
>-		/**
>-		 * The meta object literal for the 'Language' attribute list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute OPAQUE_EXPRESSION__LANGUAGE = eINSTANCE
>-			.getOpaqueExpression_Language();
>-
>-		/**
>-		 * The meta object literal for the 'Result' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference OPAQUE_EXPRESSION__RESULT = eINSTANCE
>-			.getOpaqueExpression_Result();
>-
>-		/**
>-		 * The meta object literal for the 'Behavior' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference OPAQUE_EXPRESSION__BEHAVIOR = eINSTANCE
>-			.getOpaqueExpression_Behavior();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ParameterImpl Parameter}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ParameterImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getParameter()
>-		 * @generated
>-		 */
>-		EClass PARAMETER = eINSTANCE.getParameter();
>-
>-		/**
>-		 * The meta object literal for the 'Parameter Set' reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference PARAMETER__PARAMETER_SET = eINSTANCE
>-			.getParameter_ParameterSet();
>-
>-		/**
>-		 * The meta object literal for the 'Operation' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference PARAMETER__OPERATION = eINSTANCE.getParameter_Operation();
>-
>-		/**
>-		 * The meta object literal for the 'Direction' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute PARAMETER__DIRECTION = eINSTANCE.getParameter_Direction();
>-
>-		/**
>-		 * The meta object literal for the 'Default' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute PARAMETER__DEFAULT = eINSTANCE.getParameter_Default();
>-
>-		/**
>-		 * The meta object literal for the 'Default Value' containment reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference PARAMETER__DEFAULT_VALUE = eINSTANCE
>-			.getParameter_DefaultValue();
>-
>-		/**
>-		 * The meta object literal for the 'Is Exception' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute PARAMETER__IS_EXCEPTION = eINSTANCE
>-			.getParameter_IsException();
>-
>-		/**
>-		 * The meta object literal for the 'Is Stream' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute PARAMETER__IS_STREAM = eINSTANCE.getParameter_IsStream();
>-
>-		/**
>-		 * The meta object literal for the 'Effect' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute PARAMETER__EFFECT = eINSTANCE.getParameter_Effect();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.MultiplicityElementImpl Multiplicity Element}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.MultiplicityElementImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMultiplicityElement()
>-		 * @generated
>-		 */
>-		EClass MULTIPLICITY_ELEMENT = eINSTANCE.getMultiplicityElement();
>-
>-		/**
>-		 * The meta object literal for the 'Is Ordered' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute MULTIPLICITY_ELEMENT__IS_ORDERED = eINSTANCE
>-			.getMultiplicityElement_IsOrdered();
>-
>-		/**
>-		 * The meta object literal for the 'Is Unique' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute MULTIPLICITY_ELEMENT__IS_UNIQUE = eINSTANCE
>-			.getMultiplicityElement_IsUnique();
>-
>-		/**
>-		 * The meta object literal for the 'Upper' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute MULTIPLICITY_ELEMENT__UPPER = eINSTANCE
>-			.getMultiplicityElement_Upper();
>-
>-		/**
>-		 * The meta object literal for the 'Lower' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute MULTIPLICITY_ELEMENT__LOWER = eINSTANCE
>-			.getMultiplicityElement_Lower();
>-
>-		/**
>-		 * The meta object literal for the 'Upper Value' containment reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference MULTIPLICITY_ELEMENT__UPPER_VALUE = eINSTANCE
>-			.getMultiplicityElement_UpperValue();
>-
>-		/**
>-		 * The meta object literal for the 'Lower Value' containment reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference MULTIPLICITY_ELEMENT__LOWER_VALUE = eINSTANCE
>-			.getMultiplicityElement_LowerValue();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ConnectableElementImpl Connectable Element}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ConnectableElementImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConnectableElement()
>-		 * @generated
>-		 */
>-		EClass CONNECTABLE_ELEMENT = eINSTANCE.getConnectableElement();
>+		EClass CONNECTABLE_ELEMENT = eINSTANCE.getConnectableElement();
> 
> 		/**
> 		 * The meta object literal for the 'End' reference list feature.
>@@ -69526,14 +69538,6 @@
> 			.getProperty_OwningAssociation();
> 
> 		/**
>-		 * The meta object literal for the 'Association' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference PROPERTY__ASSOCIATION = eINSTANCE.getProperty_Association();
>-
>-		/**
> 		 * The meta object literal for the 'Default Value' containment reference feature.
> 		 * 
> 		 * 
>@@ -69560,6 +69564,14 @@
> 			.getProperty_SubsettedProperty();
> 
> 		/**
>+		 * The meta object literal for the 'Association' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference PROPERTY__ASSOCIATION = eINSTANCE.getProperty_Association();
>+
>+		/**
> 		 * The meta object literal for the 'Qualifier' containment reference list feature.
> 		 * 
> 		 * 
>@@ -69772,6 +69784,22 @@
> 		EClass OPERATION = eINSTANCE.getOperation();
> 
> 		/**
>+		 * The meta object literal for the 'Interface' container reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference OPERATION__INTERFACE = eINSTANCE.getOperation_Interface();
>+
>+		/**
>+		 * The meta object literal for the 'Class' container reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference OPERATION__CLASS = eINSTANCE.getOperation_Class();
>+
>+		/**
> 		 * The meta object literal for the 'Is Query' attribute feature.
> 		 * 
> 		 * 
>@@ -69864,22 +69892,6 @@
> 		EReference OPERATION__TYPE = eINSTANCE.getOperation_Type();
> 
> 		/**
>-		 * The meta object literal for the 'Interface' container reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference OPERATION__INTERFACE = eINSTANCE.getOperation_Interface();
>-
>-		/**
>-		 * The meta object literal for the 'Class' container reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference OPERATION__CLASS = eINSTANCE.getOperation_Class();
>-
>-		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.BehavioralFeatureImpl Behavioral Feature}' class.
> 		 * 
> 		 * 
>@@ -70024,60 +70036,137 @@
> 			.getBehavior_Specification();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ParameterSetImpl Parameter Set}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ClassImpl Class}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ParameterSetImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getParameterSet()
>+		 * @see org.eclipse.uml2.uml.internal.impl.ClassImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getClass_()
> 		 * @generated
> 		 */
>-		EClass PARAMETER_SET = eINSTANCE.getParameterSet();
>+		EClass CLASS = eINSTANCE.getClass_();
> 
> 		/**
>-		 * The meta object literal for the 'Parameter' reference list feature.
>+		 * The meta object literal for the 'Nested Classifier' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PARAMETER_SET__PARAMETER = eINSTANCE
>-			.getParameterSet_Parameter();
>+		EReference CLASS__NESTED_CLASSIFIER = eINSTANCE
>+			.getClass_NestedClassifier();
> 
> 		/**
>-		 * The meta object literal for the 'Condition' containment reference list feature.
>+		 * The meta object literal for the 'Owned Operation' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference PARAMETER_SET__CONDITION = eINSTANCE
>-			.getParameterSet_Condition();
>+		EReference CLASS__OWNED_OPERATION = eINSTANCE.getClass_OwnedOperation();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.DataTypeImpl Data Type}' class.
>+		 * The meta object literal for the 'Super Class' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.DataTypeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDataType()
> 		 * @generated
> 		 */
>-		EClass DATA_TYPE = eINSTANCE.getDataType();
>+		EReference CLASS__SUPER_CLASS = eINSTANCE.getClass_SuperClass();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Attribute' containment reference list feature.
>+		 * The meta object literal for the 'Is Active' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference DATA_TYPE__OWNED_ATTRIBUTE = eINSTANCE
>-			.getDataType_OwnedAttribute();
>+		EAttribute CLASS__IS_ACTIVE = eINSTANCE.getClass_IsActive();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Operation' containment reference list feature.
>+		 * The meta object literal for the 'Owned Reception' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference DATA_TYPE__OWNED_OPERATION = eINSTANCE
>-			.getDataType_OwnedOperation();
>+		EReference CLASS__OWNED_RECEPTION = eINSTANCE.getClass_OwnedReception();
>+
>+		/**
>+		 * The meta object literal for the 'Extension' reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference CLASS__EXTENSION = eINSTANCE.getClass_Extension();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.BehavioredClassifierImpl Behaviored Classifier}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.BehavioredClassifierImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getBehavioredClassifier()
>+		 * @generated
>+		 */
>+		EClass BEHAVIORED_CLASSIFIER = eINSTANCE.getBehavioredClassifier();
>+
>+		/**
>+		 * The meta object literal for the 'Owned Behavior' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference BEHAVIORED_CLASSIFIER__OWNED_BEHAVIOR = eINSTANCE
>+			.getBehavioredClassifier_OwnedBehavior();
>+
>+		/**
>+		 * The meta object literal for the 'Classifier Behavior' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference BEHAVIORED_CLASSIFIER__CLASSIFIER_BEHAVIOR = eINSTANCE
>+			.getBehavioredClassifier_ClassifierBehavior();
>+
>+		/**
>+		 * The meta object literal for the 'Interface Realization' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference BEHAVIORED_CLASSIFIER__INTERFACE_REALIZATION = eINSTANCE
>+			.getBehavioredClassifier_InterfaceRealization();
>+
>+		/**
>+		 * The meta object literal for the 'Owned Trigger' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference BEHAVIORED_CLASSIFIER__OWNED_TRIGGER = eINSTANCE
>+			.getBehavioredClassifier_OwnedTrigger();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InterfaceRealizationImpl Interface Realization}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.InterfaceRealizationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInterfaceRealization()
>+		 * @generated
>+		 */
>+		EClass INTERFACE_REALIZATION = eINSTANCE.getInterfaceRealization();
>+
>+		/**
>+		 * The meta object literal for the 'Contract' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERFACE_REALIZATION__CONTRACT = eINSTANCE
>+			.getInterfaceRealization_Contract();
>+
>+		/**
>+		 * The meta object literal for the 'Implementing Classifier' container reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERFACE_REALIZATION__IMPLEMENTING_CLASSIFIER = eINSTANCE
>+			.getInterfaceRealization_ImplementingClassifier();
> 
> 		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InterfaceImpl Interface}' class.
>@@ -70099,6 +70188,15 @@
> 			.getInterface_OwnedAttribute();
> 
> 		/**
>+		 * The meta object literal for the 'Owned Operation' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERFACE__OWNED_OPERATION = eINSTANCE
>+			.getInterface_OwnedOperation();
>+
>+		/**
> 		 * The meta object literal for the 'Nested Classifier' containment reference list feature.
> 		 * 
> 		 * 
>@@ -70134,15 +70232,6 @@
> 		EReference INTERFACE__PROTOCOL = eINSTANCE.getInterface_Protocol();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Operation' containment reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference INTERFACE__OWNED_OPERATION = eINSTANCE
>-			.getInterface_OwnedOperation();
>-
>-		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ReceptionImpl Reception}' class.
> 		 * 
> 		 * 
>@@ -70724,1065 +70813,1049 @@
> 			.getProtocolConformance_SpecificMachine();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.OperationTemplateParameterImpl Operation Template Parameter}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.EncapsulatedClassifierImpl Encapsulated Classifier}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.OperationTemplateParameterImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getOperationTemplateParameter()
>+		 * @see org.eclipse.uml2.uml.internal.impl.EncapsulatedClassifierImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getEncapsulatedClassifier()
> 		 * @generated
> 		 */
>-		EClass OPERATION_TEMPLATE_PARAMETER = eINSTANCE
>-			.getOperationTemplateParameter();
>+		EClass ENCAPSULATED_CLASSIFIER = eINSTANCE.getEncapsulatedClassifier();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.StructuralFeatureImpl Structural Feature}' class.
>+		 * The meta object literal for the 'Owned Port' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.StructuralFeatureImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStructuralFeature()
> 		 * @generated
> 		 */
>-		EClass STRUCTURAL_FEATURE = eINSTANCE.getStructuralFeature();
>+		EReference ENCAPSULATED_CLASSIFIER__OWNED_PORT = eINSTANCE
>+			.getEncapsulatedClassifier_OwnedPort();
> 
> 		/**
>-		 * The meta object literal for the 'Is Read Only' attribute feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.StructuredClassifierImpl Structured Classifier}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.StructuredClassifierImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStructuredClassifier()
> 		 * @generated
> 		 */
>-		EAttribute STRUCTURAL_FEATURE__IS_READ_ONLY = eINSTANCE
>-			.getStructuralFeature_IsReadOnly();
>+		EClass STRUCTURED_CLASSIFIER = eINSTANCE.getStructuredClassifier();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.AssociationImpl Association}' class.
>+		 * The meta object literal for the 'Owned Attribute' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.AssociationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getAssociation()
> 		 * @generated
> 		 */
>-		EClass ASSOCIATION = eINSTANCE.getAssociation();
>+		EReference STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE = eINSTANCE
>+			.getStructuredClassifier_OwnedAttribute();
> 
> 		/**
>-		 * The meta object literal for the 'Is Derived' attribute feature.
>+		 * The meta object literal for the 'Part' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute ASSOCIATION__IS_DERIVED = eINSTANCE
>-			.getAssociation_IsDerived();
>+		EReference STRUCTURED_CLASSIFIER__PART = eINSTANCE
>+			.getStructuredClassifier_Part();
> 
> 		/**
>-		 * The meta object literal for the 'End Type' reference list feature.
>+		 * The meta object literal for the 'Role' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ASSOCIATION__END_TYPE = eINSTANCE.getAssociation_EndType();
>+		EReference STRUCTURED_CLASSIFIER__ROLE = eINSTANCE
>+			.getStructuredClassifier_Role();
> 
> 		/**
>-		 * The meta object literal for the 'Member End' reference list feature.
>+		 * The meta object literal for the 'Owned Connector' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ASSOCIATION__MEMBER_END = eINSTANCE
>-			.getAssociation_MemberEnd();
>+		EReference STRUCTURED_CLASSIFIER__OWNED_CONNECTOR = eINSTANCE
>+			.getStructuredClassifier_OwnedConnector();
> 
> 		/**
>-		 * The meta object literal for the 'Navigable Owned End' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ConnectorImpl Connector}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ConnectorImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConnector()
> 		 * @generated
> 		 */
>-		EReference ASSOCIATION__NAVIGABLE_OWNED_END = eINSTANCE
>-			.getAssociation_NavigableOwnedEnd();
>+		EClass CONNECTOR = eINSTANCE.getConnector();
> 
> 		/**
>-		 * The meta object literal for the 'Owned End' containment reference list feature.
>+		 * The meta object literal for the 'Type' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ASSOCIATION__OWNED_END = eINSTANCE.getAssociation_OwnedEnd();
>+		EReference CONNECTOR__TYPE = eINSTANCE.getConnector_Type();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ConnectableElementTemplateParameterImpl Connectable Element Template Parameter}' class.
>+		 * The meta object literal for the 'Redefined Connector' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ConnectableElementTemplateParameterImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConnectableElementTemplateParameter()
> 		 * @generated
> 		 */
>-		EClass CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER = eINSTANCE
>-			.getConnectableElementTemplateParameter();
>+		EReference CONNECTOR__REDEFINED_CONNECTOR = eINSTANCE
>+			.getConnector_RedefinedConnector();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CollaborationUseImpl Collaboration Use}' class.
>+		 * The meta object literal for the 'End' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.CollaborationUseImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCollaborationUse()
> 		 * @generated
> 		 */
>-		EClass COLLABORATION_USE = eINSTANCE.getCollaborationUse();
>+		EReference CONNECTOR__END = eINSTANCE.getConnector_End();
> 
> 		/**
>-		 * The meta object literal for the 'Type' reference feature.
>+		 * The meta object literal for the 'Kind' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference COLLABORATION_USE__TYPE = eINSTANCE
>-			.getCollaborationUse_Type();
>+		EAttribute CONNECTOR__KIND = eINSTANCE.getConnector_Kind();
> 
> 		/**
>-		 * The meta object literal for the 'Role Binding' containment reference list feature.
>+		 * The meta object literal for the 'Contract' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference COLLABORATION_USE__ROLE_BINDING = eINSTANCE
>-			.getCollaborationUse_RoleBinding();
>+		EReference CONNECTOR__CONTRACT = eINSTANCE.getConnector_Contract();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CollaborationImpl Collaboration}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExtensionImpl Extension}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.CollaborationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCollaboration()
>+		 * @see org.eclipse.uml2.uml.internal.impl.ExtensionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExtension()
> 		 * @generated
> 		 */
>-		EClass COLLABORATION = eINSTANCE.getCollaboration();
>+		EClass EXTENSION = eINSTANCE.getExtension();
> 
> 		/**
>-		 * The meta object literal for the 'Collaboration Role' reference list feature.
>+		 * The meta object literal for the 'Is Required' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference COLLABORATION__COLLABORATION_ROLE = eINSTANCE
>-			.getCollaboration_CollaborationRole();
>+		EAttribute EXTENSION__IS_REQUIRED = eINSTANCE.getExtension_IsRequired();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.StructuredClassifierImpl Structured Classifier}' class.
>+		 * The meta object literal for the 'Metaclass' reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.StructuredClassifierImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStructuredClassifier()
> 		 * @generated
> 		 */
>-		EClass STRUCTURED_CLASSIFIER = eINSTANCE.getStructuredClassifier();
>+		EReference EXTENSION__METACLASS = eINSTANCE.getExtension_Metaclass();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Attribute' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExtensionEndImpl Extension End}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ExtensionEndImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExtensionEnd()
> 		 * @generated
> 		 */
>-		EReference STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE = eINSTANCE
>-			.getStructuredClassifier_OwnedAttribute();
>+		EClass EXTENSION_END = eINSTANCE.getExtensionEnd();
> 
> 		/**
>-		 * The meta object literal for the 'Part' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.StereotypeImpl Stereotype}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.StereotypeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStereotype()
> 		 * @generated
> 		 */
>-		EReference STRUCTURED_CLASSIFIER__PART = eINSTANCE
>-			.getStructuredClassifier_Part();
>+		EClass STEREOTYPE = eINSTANCE.getStereotype();
> 
> 		/**
>-		 * The meta object literal for the 'Role' reference list feature.
>+		 * The meta object literal for the 'Icon' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference STRUCTURED_CLASSIFIER__ROLE = eINSTANCE
>-			.getStructuredClassifier_Role();
>+		EReference STEREOTYPE__ICON = eINSTANCE.getStereotype_Icon();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Connector' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ImageImpl Image}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ImageImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getImage()
> 		 * @generated
> 		 */
>-		EReference STRUCTURED_CLASSIFIER__OWNED_CONNECTOR = eINSTANCE
>-			.getStructuredClassifier_OwnedConnector();
>+		EClass IMAGE = eINSTANCE.getImage();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ConnectorImpl Connector}' class.
>+		 * The meta object literal for the 'Content' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ConnectorImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConnector()
> 		 * @generated
> 		 */
>-		EClass CONNECTOR = eINSTANCE.getConnector();
>+		EAttribute IMAGE__CONTENT = eINSTANCE.getImage_Content();
> 
> 		/**
>-		 * The meta object literal for the 'Type' reference feature.
>+		 * The meta object literal for the 'Location' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CONNECTOR__TYPE = eINSTANCE.getConnector_Type();
>+		EAttribute IMAGE__LOCATION = eINSTANCE.getImage_Location();
> 
> 		/**
>-		 * The meta object literal for the 'Redefined Connector' reference list feature.
>+		 * The meta object literal for the 'Format' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CONNECTOR__REDEFINED_CONNECTOR = eINSTANCE
>-			.getConnector_RedefinedConnector();
>+		EAttribute IMAGE__FORMAT = eINSTANCE.getImage_Format();
> 
> 		/**
>-		 * The meta object literal for the 'End' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ProfileImpl Profile}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ProfileImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getProfile()
> 		 * @generated
> 		 */
>-		EReference CONNECTOR__END = eINSTANCE.getConnector_End();
>+		EClass PROFILE = eINSTANCE.getProfile();
> 
> 		/**
>-		 * The meta object literal for the 'Kind' attribute feature.
>+		 * The meta object literal for the 'Owned Stereotype' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute CONNECTOR__KIND = eINSTANCE.getConnector_Kind();
>+		EReference PROFILE__OWNED_STEREOTYPE = eINSTANCE
>+			.getProfile_OwnedStereotype();
> 
> 		/**
>-		 * The meta object literal for the 'Contract' reference list feature.
>+		 * The meta object literal for the 'Metaclass Reference' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CONNECTOR__CONTRACT = eINSTANCE.getConnector_Contract();
>+		EReference PROFILE__METACLASS_REFERENCE = eINSTANCE
>+			.getProfile_MetaclassReference();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.RedefinableTemplateSignatureImpl Redefinable Template Signature}' class.
>+		 * The meta object literal for the 'Metamodel Reference' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.RedefinableTemplateSignatureImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getRedefinableTemplateSignature()
> 		 * @generated
> 		 */
>-		EClass REDEFINABLE_TEMPLATE_SIGNATURE = eINSTANCE
>-			.getRedefinableTemplateSignature();
>+		EReference PROFILE__METAMODEL_REFERENCE = eINSTANCE
>+			.getProfile_MetamodelReference();
> 
> 		/**
>-		 * The meta object literal for the 'Extended Signature' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ModelImpl Model}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ModelImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getModel()
> 		 * @generated
> 		 */
>-		EReference REDEFINABLE_TEMPLATE_SIGNATURE__EXTENDED_SIGNATURE = eINSTANCE
>-			.getRedefinableTemplateSignature_ExtendedSignature();
>+		EClass MODEL = eINSTANCE.getModel();
> 
> 		/**
>-		 * The meta object literal for the 'Inherited Parameter' reference list feature.
>+		 * The meta object literal for the 'Viewpoint' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference REDEFINABLE_TEMPLATE_SIGNATURE__INHERITED_PARAMETER = eINSTANCE
>-			.getRedefinableTemplateSignature_InheritedParameter();
>+		EAttribute MODEL__VIEWPOINT = eINSTANCE.getModel_Viewpoint();
> 
> 		/**
>-		 * The meta object literal for the 'Classifier' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ParameterSetImpl Parameter Set}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ParameterSetImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getParameterSet()
> 		 * @generated
> 		 */
>-		EReference REDEFINABLE_TEMPLATE_SIGNATURE__CLASSIFIER = eINSTANCE
>-			.getRedefinableTemplateSignature_Classifier();
>+		EClass PARAMETER_SET = eINSTANCE.getParameterSet();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ClassifierTemplateParameterImpl Classifier Template Parameter}' class.
>+		 * The meta object literal for the 'Parameter' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ClassifierTemplateParameterImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getClassifierTemplateParameter()
> 		 * @generated
> 		 */
>-		EClass CLASSIFIER_TEMPLATE_PARAMETER = eINSTANCE
>-			.getClassifierTemplateParameter();
>+		EReference PARAMETER_SET__PARAMETER = eINSTANCE
>+			.getParameterSet_Parameter();
> 
> 		/**
>-		 * The meta object literal for the 'Allow Substitutable' attribute feature.
>+		 * The meta object literal for the 'Condition' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute CLASSIFIER_TEMPLATE_PARAMETER__ALLOW_SUBSTITUTABLE = eINSTANCE
>-			.getClassifierTemplateParameter_AllowSubstitutable();
>+		EReference PARAMETER_SET__CONDITION = eINSTANCE
>+			.getParameterSet_Condition();
> 
> 		/**
>-		 * The meta object literal for the 'Default Classifier' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.DataTypeImpl Data Type}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.DataTypeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDataType()
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER_TEMPLATE_PARAMETER__DEFAULT_CLASSIFIER = eINSTANCE
>-			.getClassifierTemplateParameter_DefaultClassifier();
>+		EClass DATA_TYPE = eINSTANCE.getDataType();
> 
> 		/**
>-		 * The meta object literal for the 'Constraining Classifier' reference feature.
>+		 * The meta object literal for the 'Owned Attribute' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER = eINSTANCE
>-			.getClassifierTemplateParameter_ConstrainingClassifier();
>+		EReference DATA_TYPE__OWNED_ATTRIBUTE = eINSTANCE
>+			.getDataType_OwnedAttribute();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InterfaceRealizationImpl Interface Realization}' class.
>+		 * The meta object literal for the 'Owned Operation' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.InterfaceRealizationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInterfaceRealization()
> 		 * @generated
> 		 */
>-		EClass INTERFACE_REALIZATION = eINSTANCE.getInterfaceRealization();
>+		EReference DATA_TYPE__OWNED_OPERATION = eINSTANCE
>+			.getDataType_OwnedOperation();
> 
> 		/**
>-		 * The meta object literal for the 'Contract' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.OperationTemplateParameterImpl Operation Template Parameter}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.OperationTemplateParameterImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getOperationTemplateParameter()
> 		 * @generated
> 		 */
>-		EReference INTERFACE_REALIZATION__CONTRACT = eINSTANCE
>-			.getInterfaceRealization_Contract();
>+		EClass OPERATION_TEMPLATE_PARAMETER = eINSTANCE
>+			.getOperationTemplateParameter();
> 
> 		/**
>-		 * The meta object literal for the 'Implementing Classifier' container reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.StructuralFeatureImpl Structural Feature}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.StructuralFeatureImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStructuralFeature()
> 		 * @generated
> 		 */
>-		EReference INTERFACE_REALIZATION__IMPLEMENTING_CLASSIFIER = eINSTANCE
>-			.getInterfaceRealization_ImplementingClassifier();
>+		EClass STRUCTURAL_FEATURE = eINSTANCE.getStructuralFeature();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.EncapsulatedClassifierImpl Encapsulated Classifier}' class.
>+		 * The meta object literal for the 'Is Read Only' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.EncapsulatedClassifierImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getEncapsulatedClassifier()
> 		 * @generated
> 		 */
>-		EClass ENCAPSULATED_CLASSIFIER = eINSTANCE.getEncapsulatedClassifier();
>+		EAttribute STRUCTURAL_FEATURE__IS_READ_ONLY = eINSTANCE
>+			.getStructuralFeature_IsReadOnly();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Port' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ConnectableElementTemplateParameterImpl Connectable Element Template Parameter}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ConnectableElementTemplateParameterImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConnectableElementTemplateParameter()
> 		 * @generated
> 		 */
>-		EReference ENCAPSULATED_CLASSIFIER__OWNED_PORT = eINSTANCE
>-			.getEncapsulatedClassifier_OwnedPort();
>+		EClass CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER = eINSTANCE
>+			.getConnectableElementTemplateParameter();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExtensionImpl Extension}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CollaborationUseImpl Collaboration Use}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ExtensionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExtension()
>+		 * @see org.eclipse.uml2.uml.internal.impl.CollaborationUseImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCollaborationUse()
> 		 * @generated
> 		 */
>-		EClass EXTENSION = eINSTANCE.getExtension();
>+		EClass COLLABORATION_USE = eINSTANCE.getCollaborationUse();
> 
> 		/**
>-		 * The meta object literal for the 'Is Required' attribute feature.
>+		 * The meta object literal for the 'Type' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute EXTENSION__IS_REQUIRED = eINSTANCE.getExtension_IsRequired();
>+		EReference COLLABORATION_USE__TYPE = eINSTANCE
>+			.getCollaborationUse_Type();
> 
> 		/**
>-		 * The meta object literal for the 'Metaclass' reference feature.
>+		 * The meta object literal for the 'Role Binding' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference EXTENSION__METACLASS = eINSTANCE.getExtension_Metaclass();
>+		EReference COLLABORATION_USE__ROLE_BINDING = eINSTANCE
>+			.getCollaborationUse_RoleBinding();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExtensionEndImpl Extension End}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CollaborationImpl Collaboration}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ExtensionEndImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExtensionEnd()
>+		 * @see org.eclipse.uml2.uml.internal.impl.CollaborationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCollaboration()
> 		 * @generated
> 		 */
>-		EClass EXTENSION_END = eINSTANCE.getExtensionEnd();
>+		EClass COLLABORATION = eINSTANCE.getCollaboration();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ImageImpl Image}' class.
>+		 * The meta object literal for the 'Collaboration Role' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ImageImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getImage()
> 		 * @generated
> 		 */
>-		EClass IMAGE = eINSTANCE.getImage();
>+		EReference COLLABORATION__COLLABORATION_ROLE = eINSTANCE
>+			.getCollaboration_CollaborationRole();
> 
> 		/**
>-		 * The meta object literal for the 'Content' attribute feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.UseCaseImpl Use Case}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.UseCaseImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getUseCase()
> 		 * @generated
> 		 */
>-		EAttribute IMAGE__CONTENT = eINSTANCE.getImage_Content();
>+		EClass USE_CASE = eINSTANCE.getUseCase();
> 
> 		/**
>-		 * The meta object literal for the 'Location' attribute feature.
>+		 * The meta object literal for the 'Include' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute IMAGE__LOCATION = eINSTANCE.getImage_Location();
>+		EReference USE_CASE__INCLUDE = eINSTANCE.getUseCase_Include();
> 
> 		/**
>-		 * The meta object literal for the 'Format' attribute feature.
>+		 * The meta object literal for the 'Extend' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute IMAGE__FORMAT = eINSTANCE.getImage_Format();
>+		EReference USE_CASE__EXTEND = eINSTANCE.getUseCase_Extend();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.StringExpressionImpl String Expression}' class.
>+		 * The meta object literal for the 'Extension Point' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.StringExpressionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStringExpression()
> 		 * @generated
> 		 */
>-		EClass STRING_EXPRESSION = eINSTANCE.getStringExpression();
>+		EReference USE_CASE__EXTENSION_POINT = eINSTANCE
>+			.getUseCase_ExtensionPoint();
> 
> 		/**
>-		 * The meta object literal for the 'Sub Expression' containment reference list feature.
>+		 * The meta object literal for the 'Subject' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference STRING_EXPRESSION__SUB_EXPRESSION = eINSTANCE
>-			.getStringExpression_SubExpression();
>+		EReference USE_CASE__SUBJECT = eINSTANCE.getUseCase_Subject();
> 
> 		/**
>-		 * The meta object literal for the 'Owning Expression' container reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.IncludeImpl Include}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.IncludeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInclude()
> 		 * @generated
> 		 */
>-		EReference STRING_EXPRESSION__OWNING_EXPRESSION = eINSTANCE
>-			.getStringExpression_OwningExpression();
>+		EClass INCLUDE = eINSTANCE.getInclude();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExpressionImpl Expression}' class.
>+		 * The meta object literal for the 'Addition' reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ExpressionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExpression()
> 		 * @generated
> 		 */
>-		EClass EXPRESSION = eINSTANCE.getExpression();
>+		EReference INCLUDE__ADDITION = eINSTANCE.getInclude_Addition();
> 
> 		/**
>-		 * The meta object literal for the 'Symbol' attribute feature.
>+		 * The meta object literal for the 'Including Case' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute EXPRESSION__SYMBOL = eINSTANCE.getExpression_Symbol();
>+		EReference INCLUDE__INCLUDING_CASE = eINSTANCE
>+			.getInclude_IncludingCase();
> 
> 		/**
>-		 * The meta object literal for the 'Operand' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExtendImpl Extend}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ExtendImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExtend()
> 		 * @generated
> 		 */
>-		EReference EXPRESSION__OPERAND = eINSTANCE.getExpression_Operand();
>+		EClass EXTEND = eINSTANCE.getExtend();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LiteralIntegerImpl Literal Integer}' class.
>+		 * The meta object literal for the 'Extended Case' reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.LiteralIntegerImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLiteralInteger()
> 		 * @generated
> 		 */
>-		EClass LITERAL_INTEGER = eINSTANCE.getLiteralInteger();
>+		EReference EXTEND__EXTENDED_CASE = eINSTANCE.getExtend_ExtendedCase();
> 
> 		/**
>-		 * The meta object literal for the 'Value' attribute feature.
>+		 * The meta object literal for the 'Condition' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute LITERAL_INTEGER__VALUE = eINSTANCE.getLiteralInteger_Value();
>+		EReference EXTEND__CONDITION = eINSTANCE.getExtend_Condition();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LiteralStringImpl Literal String}' class.
>+		 * The meta object literal for the 'Extension Location' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.LiteralStringImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLiteralString()
> 		 * @generated
> 		 */
>-		EClass LITERAL_STRING = eINSTANCE.getLiteralString();
>+		EReference EXTEND__EXTENSION_LOCATION = eINSTANCE
>+			.getExtend_ExtensionLocation();
> 
> 		/**
>-		 * The meta object literal for the 'Value' attribute feature.
>+		 * The meta object literal for the 'Extension' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute LITERAL_STRING__VALUE = eINSTANCE.getLiteralString_Value();
>+		EReference EXTEND__EXTENSION = eINSTANCE.getExtend_Extension();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LiteralBooleanImpl Literal Boolean}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExtensionPointImpl Extension Point}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.LiteralBooleanImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLiteralBoolean()
>+		 * @see org.eclipse.uml2.uml.internal.impl.ExtensionPointImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExtensionPoint()
> 		 * @generated
> 		 */
>-		EClass LITERAL_BOOLEAN = eINSTANCE.getLiteralBoolean();
>+		EClass EXTENSION_POINT = eINSTANCE.getExtensionPoint();
> 
> 		/**
>-		 * The meta object literal for the 'Value' attribute feature.
>+		 * The meta object literal for the 'Use Case' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute LITERAL_BOOLEAN__VALUE = eINSTANCE.getLiteralBoolean_Value();
>+		EReference EXTENSION_POINT__USE_CASE = eINSTANCE
>+			.getExtensionPoint_UseCase();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LiteralNullImpl Literal Null}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.RedefinableTemplateSignatureImpl Redefinable Template Signature}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.LiteralNullImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLiteralNull()
>+		 * @see org.eclipse.uml2.uml.internal.impl.RedefinableTemplateSignatureImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getRedefinableTemplateSignature()
> 		 * @generated
> 		 */
>-		EClass LITERAL_NULL = eINSTANCE.getLiteralNull();
>+		EClass REDEFINABLE_TEMPLATE_SIGNATURE = eINSTANCE
>+			.getRedefinableTemplateSignature();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SlotImpl Slot}' class.
>+		 * The meta object literal for the 'Extended Signature' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.SlotImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSlot()
> 		 * @generated
> 		 */
>-		EClass SLOT = eINSTANCE.getSlot();
>+		EReference REDEFINABLE_TEMPLATE_SIGNATURE__EXTENDED_SIGNATURE = eINSTANCE
>+			.getRedefinableTemplateSignature_ExtendedSignature();
> 
> 		/**
>-		 * The meta object literal for the 'Owning Instance' container reference feature.
>+		 * The meta object literal for the 'Inherited Parameter' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SLOT__OWNING_INSTANCE = eINSTANCE.getSlot_OwningInstance();
>+		EReference REDEFINABLE_TEMPLATE_SIGNATURE__INHERITED_PARAMETER = eINSTANCE
>+			.getRedefinableTemplateSignature_InheritedParameter();
> 
> 		/**
>-		 * The meta object literal for the 'Defining Feature' reference feature.
>+		 * The meta object literal for the 'Classifier' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SLOT__DEFINING_FEATURE = eINSTANCE.getSlot_DefiningFeature();
>+		EReference REDEFINABLE_TEMPLATE_SIGNATURE__CLASSIFIER = eINSTANCE
>+			.getRedefinableTemplateSignature_Classifier();
> 
> 		/**
>-		 * The meta object literal for the 'Value' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ClassifierTemplateParameterImpl Classifier Template Parameter}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ClassifierTemplateParameterImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getClassifierTemplateParameter()
> 		 * @generated
> 		 */
>-		EReference SLOT__VALUE = eINSTANCE.getSlot_Value();
>+		EClass CLASSIFIER_TEMPLATE_PARAMETER = eINSTANCE
>+			.getClassifierTemplateParameter();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InstanceSpecificationImpl Instance Specification}' class.
>+		 * The meta object literal for the 'Allow Substitutable' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.InstanceSpecificationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInstanceSpecification()
> 		 * @generated
> 		 */
>-		EClass INSTANCE_SPECIFICATION = eINSTANCE.getInstanceSpecification();
>+		EAttribute CLASSIFIER_TEMPLATE_PARAMETER__ALLOW_SUBSTITUTABLE = eINSTANCE
>+			.getClassifierTemplateParameter_AllowSubstitutable();
> 
> 		/**
>-		 * The meta object literal for the 'Classifier' reference list feature.
>+		 * The meta object literal for the 'Constraining Classifier' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference INSTANCE_SPECIFICATION__CLASSIFIER = eINSTANCE
>-			.getInstanceSpecification_Classifier();
>+		EReference CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER = eINSTANCE
>+			.getClassifierTemplateParameter_ConstrainingClassifier();
> 
> 		/**
>-		 * The meta object literal for the 'Specification' containment reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.StringExpressionImpl String Expression}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.StringExpressionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStringExpression()
> 		 * @generated
> 		 */
>-		EReference INSTANCE_SPECIFICATION__SPECIFICATION = eINSTANCE
>-			.getInstanceSpecification_Specification();
>+		EClass STRING_EXPRESSION = eINSTANCE.getStringExpression();
> 
> 		/**
>-		 * The meta object literal for the 'Slot' containment reference list feature.
>+		 * The meta object literal for the 'Sub Expression' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference INSTANCE_SPECIFICATION__SLOT = eINSTANCE
>-			.getInstanceSpecification_Slot();
>+		EReference STRING_EXPRESSION__SUB_EXPRESSION = eINSTANCE
>+			.getStringExpression_SubExpression();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.EnumerationImpl Enumeration}' class.
>+		 * The meta object literal for the 'Owning Expression' container reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.EnumerationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getEnumeration()
> 		 * @generated
> 		 */
>-		EClass ENUMERATION = eINSTANCE.getEnumeration();
>+		EReference STRING_EXPRESSION__OWNING_EXPRESSION = eINSTANCE
>+			.getStringExpression_OwningExpression();
> 
> 		/**
>-		 * The meta object literal for the 'Owned Literal' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExpressionImpl Expression}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ExpressionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExpression()
> 		 * @generated
> 		 */
>-		EReference ENUMERATION__OWNED_LITERAL = eINSTANCE
>-			.getEnumeration_OwnedLiteral();
>+		EClass EXPRESSION = eINSTANCE.getExpression();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.EnumerationLiteralImpl Enumeration Literal}' class.
>+		 * The meta object literal for the 'Symbol' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.EnumerationLiteralImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getEnumerationLiteral()
> 		 * @generated
> 		 */
>-		EClass ENUMERATION_LITERAL = eINSTANCE.getEnumerationLiteral();
>+		EAttribute EXPRESSION__SYMBOL = eINSTANCE.getExpression_Symbol();
> 
> 		/**
>-		 * The meta object literal for the 'Enumeration' container reference feature.
>+		 * The meta object literal for the 'Operand' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ENUMERATION_LITERAL__ENUMERATION = eINSTANCE
>-			.getEnumerationLiteral_Enumeration();
>+		EReference EXPRESSION__OPERAND = eINSTANCE.getExpression_Operand();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.PrimitiveTypeImpl Primitive Type}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.UsageImpl Usage}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.PrimitiveTypeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPrimitiveType()
>+		 * @see org.eclipse.uml2.uml.internal.impl.UsageImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getUsage()
> 		 * @generated
> 		 */
>-		EClass PRIMITIVE_TYPE = eINSTANCE.getPrimitiveType();
>+		EClass USAGE = eINSTANCE.getUsage();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InstanceValueImpl Instance Value}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.PackageMergeImpl Package Merge}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.InstanceValueImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInstanceValue()
>+		 * @see org.eclipse.uml2.uml.internal.impl.PackageMergeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPackageMerge()
> 		 * @generated
> 		 */
>-		EClass INSTANCE_VALUE = eINSTANCE.getInstanceValue();
>+		EClass PACKAGE_MERGE = eINSTANCE.getPackageMerge();
> 
> 		/**
>-		 * The meta object literal for the 'Instance' reference feature.
>+		 * The meta object literal for the 'Merged Package' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference INSTANCE_VALUE__INSTANCE = eINSTANCE
>-			.getInstanceValue_Instance();
>+		EReference PACKAGE_MERGE__MERGED_PACKAGE = eINSTANCE
>+			.getPackageMerge_MergedPackage();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LiteralUnlimitedNaturalImpl Literal Unlimited Natural}' class.
>+		 * The meta object literal for the 'Receiving Package' container reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.LiteralUnlimitedNaturalImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLiteralUnlimitedNatural()
> 		 * @generated
> 		 */
>-		EClass LITERAL_UNLIMITED_NATURAL = eINSTANCE
>-			.getLiteralUnlimitedNatural();
>+		EReference PACKAGE_MERGE__RECEIVING_PACKAGE = eINSTANCE
>+			.getPackageMerge_ReceivingPackage();
> 
> 		/**
>-		 * The meta object literal for the 'Value' attribute feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ProfileApplicationImpl Profile Application}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ProfileApplicationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getProfileApplication()
> 		 * @generated
> 		 */
>-		EAttribute LITERAL_UNLIMITED_NATURAL__VALUE = eINSTANCE
>-			.getLiteralUnlimitedNatural_Value();
>+		EClass PROFILE_APPLICATION = eINSTANCE.getProfileApplication();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.OpaqueBehaviorImpl Opaque Behavior}' class.
>+		 * The meta object literal for the 'Applied Profile' reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.OpaqueBehaviorImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getOpaqueBehavior()
> 		 * @generated
> 		 */
>-		EClass OPAQUE_BEHAVIOR = eINSTANCE.getOpaqueBehavior();
>+		EReference PROFILE_APPLICATION__APPLIED_PROFILE = eINSTANCE
>+			.getProfileApplication_AppliedProfile();
> 
> 		/**
>-		 * The meta object literal for the 'Body' attribute list feature.
>+		 * The meta object literal for the 'Is Strict' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute OPAQUE_BEHAVIOR__BODY = eINSTANCE.getOpaqueBehavior_Body();
>+		EAttribute PROFILE_APPLICATION__IS_STRICT = eINSTANCE
>+			.getProfileApplication_IsStrict();
> 
> 		/**
>-		 * The meta object literal for the 'Language' attribute list feature.
>+		 * The meta object literal for the 'Applying Package' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute OPAQUE_BEHAVIOR__LANGUAGE = eINSTANCE
>-			.getOpaqueBehavior_Language();
>+		EReference PROFILE_APPLICATION__APPLYING_PACKAGE = eINSTANCE
>+			.getProfileApplication_ApplyingPackage();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.FunctionBehaviorImpl Function Behavior}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.EnumerationImpl Enumeration}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.FunctionBehaviorImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getFunctionBehavior()
>+		 * @see org.eclipse.uml2.uml.internal.impl.EnumerationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getEnumeration()
> 		 * @generated
> 		 */
>-		EClass FUNCTION_BEHAVIOR = eINSTANCE.getFunctionBehavior();
>+		EClass ENUMERATION = eINSTANCE.getEnumeration();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActorImpl Actor}' class.
>+		 * The meta object literal for the 'Owned Literal' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ActorImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActor()
> 		 * @generated
> 		 */
>-		EClass ACTOR = eINSTANCE.getActor();
>+		EReference ENUMERATION__OWNED_LITERAL = eINSTANCE
>+			.getEnumeration_OwnedLiteral();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.UsageImpl Usage}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.EnumerationLiteralImpl Enumeration Literal}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.UsageImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getUsage()
>+		 * @see org.eclipse.uml2.uml.internal.impl.EnumerationLiteralImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getEnumerationLiteral()
> 		 * @generated
> 		 */
>-		EClass USAGE = eINSTANCE.getUsage();
>+		EClass ENUMERATION_LITERAL = eINSTANCE.getEnumerationLiteral();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.MessageImpl Message}' class.
>+		 * The meta object literal for the 'Enumeration' container reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.MessageImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMessage()
> 		 * @generated
> 		 */
>-		EClass MESSAGE = eINSTANCE.getMessage();
>+		EReference ENUMERATION_LITERAL__ENUMERATION = eINSTANCE
>+			.getEnumerationLiteral_Enumeration();
> 
> 		/**
>-		 * The meta object literal for the 'Message Kind' attribute feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InstanceSpecificationImpl Instance Specification}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.InstanceSpecificationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInstanceSpecification()
> 		 * @generated
> 		 */
>-		EAttribute MESSAGE__MESSAGE_KIND = eINSTANCE.getMessage_MessageKind();
>-
>-		/**
>-		 * The meta object literal for the 'Message Sort' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute MESSAGE__MESSAGE_SORT = eINSTANCE.getMessage_MessageSort();
>-
>-		/**
>-		 * The meta object literal for the 'Receive Event' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference MESSAGE__RECEIVE_EVENT = eINSTANCE.getMessage_ReceiveEvent();
>-
>-		/**
>-		 * The meta object literal for the 'Send Event' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference MESSAGE__SEND_EVENT = eINSTANCE.getMessage_SendEvent();
>+		EClass INSTANCE_SPECIFICATION = eINSTANCE.getInstanceSpecification();
> 
> 		/**
>-		 * The meta object literal for the 'Connector' reference feature.
>+		 * The meta object literal for the 'Classifier' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference MESSAGE__CONNECTOR = eINSTANCE.getMessage_Connector();
>+		EReference INSTANCE_SPECIFICATION__CLASSIFIER = eINSTANCE
>+			.getInstanceSpecification_Classifier();
> 
> 		/**
>-		 * The meta object literal for the 'Interaction' container reference feature.
>+		 * The meta object literal for the 'Slot' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference MESSAGE__INTERACTION = eINSTANCE.getMessage_Interaction();
>+		EReference INSTANCE_SPECIFICATION__SLOT = eINSTANCE
>+			.getInstanceSpecification_Slot();
> 
> 		/**
>-		 * The meta object literal for the 'Argument' containment reference list feature.
>+		 * The meta object literal for the 'Specification' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference MESSAGE__ARGUMENT = eINSTANCE.getMessage_Argument();
>+		EReference INSTANCE_SPECIFICATION__SPECIFICATION = eINSTANCE
>+			.getInstanceSpecification_Specification();
> 
> 		/**
>-		 * The meta object literal for the 'Signature' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SlotImpl Slot}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.SlotImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSlot()
> 		 * @generated
> 		 */
>-		EReference MESSAGE__SIGNATURE = eINSTANCE.getMessage_Signature();
>+		EClass SLOT = eINSTANCE.getSlot();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.MessageEndImpl Message End}' class.
>+		 * The meta object literal for the 'Defining Feature' reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.MessageEndImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMessageEnd()
> 		 * @generated
> 		 */
>-		EClass MESSAGE_END = eINSTANCE.getMessageEnd();
>+		EReference SLOT__DEFINING_FEATURE = eINSTANCE.getSlot_DefiningFeature();
> 
> 		/**
>-		 * The meta object literal for the 'Message' reference feature.
>+		 * The meta object literal for the 'Value' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference MESSAGE_END__MESSAGE = eINSTANCE.getMessageEnd_Message();
>+		EReference SLOT__VALUE = eINSTANCE.getSlot_Value();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InteractionImpl Interaction}' class.
>+		 * The meta object literal for the 'Owning Instance' container reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.InteractionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInteraction()
> 		 * @generated
> 		 */
>-		EClass INTERACTION = eINSTANCE.getInteraction();
>+		EReference SLOT__OWNING_INSTANCE = eINSTANCE.getSlot_OwningInstance();
> 
> 		/**
>-		 * The meta object literal for the 'Lifeline' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.PrimitiveTypeImpl Primitive Type}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.PrimitiveTypeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPrimitiveType()
> 		 * @generated
> 		 */
>-		EReference INTERACTION__LIFELINE = eINSTANCE.getInteraction_Lifeline();
>+		EClass PRIMITIVE_TYPE = eINSTANCE.getPrimitiveType();
> 
> 		/**
>-		 * The meta object literal for the 'Fragment' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LiteralSpecificationImpl Literal Specification}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.LiteralSpecificationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLiteralSpecification()
> 		 * @generated
> 		 */
>-		EReference INTERACTION__FRAGMENT = eINSTANCE.getInteraction_Fragment();
>+		EClass LITERAL_SPECIFICATION = eINSTANCE.getLiteralSpecification();
> 
> 		/**
>-		 * The meta object literal for the 'Action' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LiteralIntegerImpl Literal Integer}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.LiteralIntegerImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLiteralInteger()
> 		 * @generated
> 		 */
>-		EReference INTERACTION__ACTION = eINSTANCE.getInteraction_Action();
>+		EClass LITERAL_INTEGER = eINSTANCE.getLiteralInteger();
> 
> 		/**
>-		 * The meta object literal for the 'Formal Gate' containment reference list feature.
>+		 * The meta object literal for the 'Value' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference INTERACTION__FORMAL_GATE = eINSTANCE
>-			.getInteraction_FormalGate();
>+		EAttribute LITERAL_INTEGER__VALUE = eINSTANCE.getLiteralInteger_Value();
> 
> 		/**
>-		 * The meta object literal for the 'Message' containment reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LiteralStringImpl Literal String}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.LiteralStringImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLiteralString()
> 		 * @generated
> 		 */
>-		EReference INTERACTION__MESSAGE = eINSTANCE.getInteraction_Message();
>+		EClass LITERAL_STRING = eINSTANCE.getLiteralString();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InteractionFragmentImpl Interaction Fragment}' class.
>+		 * The meta object literal for the 'Value' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.InteractionFragmentImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInteractionFragment()
> 		 * @generated
> 		 */
>-		EClass INTERACTION_FRAGMENT = eINSTANCE.getInteractionFragment();
>+		EAttribute LITERAL_STRING__VALUE = eINSTANCE.getLiteralString_Value();
> 
> 		/**
>-		 * The meta object literal for the 'Covered' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LiteralBooleanImpl Literal Boolean}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.LiteralBooleanImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLiteralBoolean()
> 		 * @generated
> 		 */
>-		EReference INTERACTION_FRAGMENT__COVERED = eINSTANCE
>-			.getInteractionFragment_Covered();
>+		EClass LITERAL_BOOLEAN = eINSTANCE.getLiteralBoolean();
> 
> 		/**
>-		 * The meta object literal for the 'General Ordering' containment reference list feature.
>+		 * The meta object literal for the 'Value' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference INTERACTION_FRAGMENT__GENERAL_ORDERING = eINSTANCE
>-			.getInteractionFragment_GeneralOrdering();
>+		EAttribute LITERAL_BOOLEAN__VALUE = eINSTANCE.getLiteralBoolean_Value();
> 
> 		/**
>-		 * The meta object literal for the 'Enclosing Interaction' container reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LiteralNullImpl Literal Null}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.LiteralNullImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLiteralNull()
> 		 * @generated
> 		 */
>-		EReference INTERACTION_FRAGMENT__ENCLOSING_INTERACTION = eINSTANCE
>-			.getInteractionFragment_EnclosingInteraction();
>+		EClass LITERAL_NULL = eINSTANCE.getLiteralNull();
> 
> 		/**
>-		 * The meta object literal for the 'Enclosing Operand' container reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InstanceValueImpl Instance Value}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.InstanceValueImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInstanceValue()
> 		 * @generated
> 		 */
>-		EReference INTERACTION_FRAGMENT__ENCLOSING_OPERAND = eINSTANCE
>-			.getInteractionFragment_EnclosingOperand();
>+		EClass INSTANCE_VALUE = eINSTANCE.getInstanceValue();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LifelineImpl Lifeline}' class.
>+		 * The meta object literal for the 'Instance' reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.LifelineImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLifeline()
> 		 * @generated
> 		 */
>-		EClass LIFELINE = eINSTANCE.getLifeline();
>+		EReference INSTANCE_VALUE__INSTANCE = eINSTANCE
>+			.getInstanceValue_Instance();
> 
> 		/**
>-		 * The meta object literal for the 'Represents' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LiteralUnlimitedNaturalImpl Literal Unlimited Natural}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.LiteralUnlimitedNaturalImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLiteralUnlimitedNatural()
> 		 * @generated
> 		 */
>-		EReference LIFELINE__REPRESENTS = eINSTANCE.getLifeline_Represents();
>+		EClass LITERAL_UNLIMITED_NATURAL = eINSTANCE
>+			.getLiteralUnlimitedNatural();
> 
> 		/**
>-		 * The meta object literal for the 'Interaction' container reference feature.
>+		 * The meta object literal for the 'Value' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference LIFELINE__INTERACTION = eINSTANCE.getLifeline_Interaction();
>+		EAttribute LITERAL_UNLIMITED_NATURAL__VALUE = eINSTANCE
>+			.getLiteralUnlimitedNatural_Value();
> 
> 		/**
>-		 * The meta object literal for the 'Selector' containment reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.OpaqueBehaviorImpl Opaque Behavior}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.OpaqueBehaviorImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getOpaqueBehavior()
> 		 * @generated
> 		 */
>-		EReference LIFELINE__SELECTOR = eINSTANCE.getLifeline_Selector();
>+		EClass OPAQUE_BEHAVIOR = eINSTANCE.getOpaqueBehavior();
> 
> 		/**
>-		 * The meta object literal for the 'Decomposed As' reference feature.
>+		 * The meta object literal for the 'Body' attribute list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference LIFELINE__DECOMPOSED_AS = eINSTANCE
>-			.getLifeline_DecomposedAs();
>+		EAttribute OPAQUE_BEHAVIOR__BODY = eINSTANCE.getOpaqueBehavior_Body();
> 
> 		/**
>-		 * The meta object literal for the 'Covered By' reference list feature.
>+		 * The meta object literal for the 'Language' attribute list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference LIFELINE__COVERED_BY = eINSTANCE.getLifeline_CoveredBy();
>+		EAttribute OPAQUE_BEHAVIOR__LANGUAGE = eINSTANCE
>+			.getOpaqueBehavior_Language();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.PartDecompositionImpl Part Decomposition}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.FunctionBehaviorImpl Function Behavior}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.PartDecompositionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPartDecomposition()
>+		 * @see org.eclipse.uml2.uml.internal.impl.FunctionBehaviorImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getFunctionBehavior()
> 		 * @generated
> 		 */
>-		EClass PART_DECOMPOSITION = eINSTANCE.getPartDecomposition();
>+		EClass FUNCTION_BEHAVIOR = eINSTANCE.getFunctionBehavior();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InteractionUseImpl Interaction Use}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.OpaqueActionImpl Opaque Action}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.InteractionUseImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInteractionUse()
>+		 * @see org.eclipse.uml2.uml.internal.impl.OpaqueActionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getOpaqueAction()
> 		 * @generated
> 		 */
>-		EClass INTERACTION_USE = eINSTANCE.getInteractionUse();
>+		EClass OPAQUE_ACTION = eINSTANCE.getOpaqueAction();
> 
> 		/**
>-		 * The meta object literal for the 'Refers To' reference feature.
>+		 * The meta object literal for the 'Body' attribute list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference INTERACTION_USE__REFERS_TO = eINSTANCE
>-			.getInteractionUse_RefersTo();
>+		EAttribute OPAQUE_ACTION__BODY = eINSTANCE.getOpaqueAction_Body();
> 
> 		/**
>-		 * The meta object literal for the 'Actual Gate' containment reference list feature.
>+		 * The meta object literal for the 'Language' attribute list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference INTERACTION_USE__ACTUAL_GATE = eINSTANCE
>-			.getInteractionUse_ActualGate();
>+		EAttribute OPAQUE_ACTION__LANGUAGE = eINSTANCE
>+			.getOpaqueAction_Language();
> 
> 		/**
>-		 * The meta object literal for the 'Argument' containment reference list feature.
>+		 * The meta object literal for the 'Input Value' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference INTERACTION_USE__ARGUMENT = eINSTANCE
>-			.getInteractionUse_Argument();
>+		EReference OPAQUE_ACTION__INPUT_VALUE = eINSTANCE
>+			.getOpaqueAction_InputValue();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.GateImpl Gate}' class.
>+		 * The meta object literal for the 'Output Value' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.GateImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getGate()
> 		 * @generated
> 		 */
>-		EClass GATE = eINSTANCE.getGate();
>+		EReference OPAQUE_ACTION__OUTPUT_VALUE = eINSTANCE
>+			.getOpaqueAction_OutputValue();
> 
> 		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActionImpl Action}' class.
>@@ -71866,67 +71939,67 @@
> 		EClass ACTIVITY_NODE = eINSTANCE.getActivityNode();
> 
> 		/**
>-		 * The meta object literal for the 'Outgoing' reference list feature.
>+		 * The meta object literal for the 'In Structured Node' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_NODE__OUTGOING = eINSTANCE
>-			.getActivityNode_Outgoing();
>+		EReference ACTIVITY_NODE__IN_STRUCTURED_NODE = eINSTANCE
>+			.getActivityNode_InStructuredNode();
> 
> 		/**
>-		 * The meta object literal for the 'In Group' reference list feature.
>+		 * The meta object literal for the 'Activity' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_NODE__IN_GROUP = eINSTANCE
>-			.getActivityNode_InGroup();
>+		EReference ACTIVITY_NODE__ACTIVITY = eINSTANCE
>+			.getActivityNode_Activity();
> 
> 		/**
>-		 * The meta object literal for the 'In Partition' reference list feature.
>+		 * The meta object literal for the 'Outgoing' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_NODE__IN_PARTITION = eINSTANCE
>-			.getActivityNode_InPartition();
>+		EReference ACTIVITY_NODE__OUTGOING = eINSTANCE
>+			.getActivityNode_Outgoing();
> 
> 		/**
>-		 * The meta object literal for the 'In Structured Node' container reference feature.
>+		 * The meta object literal for the 'Incoming' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_NODE__IN_STRUCTURED_NODE = eINSTANCE
>-			.getActivityNode_InStructuredNode();
>+		EReference ACTIVITY_NODE__INCOMING = eINSTANCE
>+			.getActivityNode_Incoming();
> 
> 		/**
>-		 * The meta object literal for the 'Activity' container reference feature.
>+		 * The meta object literal for the 'In Partition' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_NODE__ACTIVITY = eINSTANCE
>-			.getActivityNode_Activity();
>+		EReference ACTIVITY_NODE__IN_PARTITION = eINSTANCE
>+			.getActivityNode_InPartition();
> 
> 		/**
>-		 * The meta object literal for the 'Incoming' reference list feature.
>+		 * The meta object literal for the 'In Interruptible Region' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_NODE__INCOMING = eINSTANCE
>-			.getActivityNode_Incoming();
>+		EReference ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION = eINSTANCE
>+			.getActivityNode_InInterruptibleRegion();
> 
> 		/**
>-		 * The meta object literal for the 'In Interruptible Region' reference list feature.
>+		 * The meta object literal for the 'In Group' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION = eINSTANCE
>-			.getActivityNode_InInterruptibleRegion();
>+		EReference ACTIVITY_NODE__IN_GROUP = eINSTANCE
>+			.getActivityNode_InGroup();
> 
> 		/**
> 		 * The meta object literal for the 'Redefined Node' reference list feature.
>@@ -71938,100 +72011,105 @@
> 			.getActivityNode_RedefinedNode();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActivityEdgeImpl Activity Edge}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.StructuredActivityNodeImpl Structured Activity Node}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ActivityEdgeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActivityEdge()
>+		 * @see org.eclipse.uml2.uml.internal.impl.StructuredActivityNodeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStructuredActivityNode()
> 		 * @generated
> 		 */
>-		EClass ACTIVITY_EDGE = eINSTANCE.getActivityEdge();
>+		EClass STRUCTURED_ACTIVITY_NODE = eINSTANCE.getStructuredActivityNode();
> 
> 		/**
>-		 * The meta object literal for the 'Activity' container reference feature.
>+		 * The meta object literal for the 'Variable' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_EDGE__ACTIVITY = eINSTANCE
>-			.getActivityEdge_Activity();
>+		EReference STRUCTURED_ACTIVITY_NODE__VARIABLE = eINSTANCE
>+			.getStructuredActivityNode_Variable();
> 
> 		/**
>-		 * The meta object literal for the 'In Group' reference list feature.
>+		 * The meta object literal for the 'Edge' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_EDGE__IN_GROUP = eINSTANCE
>-			.getActivityEdge_InGroup();
>+		EReference STRUCTURED_ACTIVITY_NODE__EDGE = eINSTANCE
>+			.getStructuredActivityNode_Edge();
> 
> 		/**
>-		 * The meta object literal for the 'In Partition' reference list feature.
>+		 * The meta object literal for the 'Must Isolate' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_EDGE__IN_PARTITION = eINSTANCE
>-			.getActivityEdge_InPartition();
>+		EAttribute STRUCTURED_ACTIVITY_NODE__MUST_ISOLATE = eINSTANCE
>+			.getStructuredActivityNode_MustIsolate();
> 
> 		/**
>-		 * The meta object literal for the 'In Structured Node' container reference feature.
>+		 * The meta object literal for the 'Node' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_EDGE__IN_STRUCTURED_NODE = eINSTANCE
>-			.getActivityEdge_InStructuredNode();
>+		EReference STRUCTURED_ACTIVITY_NODE__NODE = eINSTANCE
>+			.getStructuredActivityNode_Node();
> 
> 		/**
>-		 * The meta object literal for the 'Target' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActivityGroupImpl Activity Group}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ActivityGroupImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActivityGroup()
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_EDGE__TARGET = eINSTANCE.getActivityEdge_Target();
>+		EClass ACTIVITY_GROUP = eINSTANCE.getActivityGroup();
> 
> 		/**
>-		 * The meta object literal for the 'Redefined Edge' reference list feature.
>+		 * The meta object literal for the 'Subgroup' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_EDGE__REDEFINED_EDGE = eINSTANCE
>-			.getActivityEdge_RedefinedEdge();
>+		EReference ACTIVITY_GROUP__SUBGROUP = eINSTANCE
>+			.getActivityGroup_Subgroup();
> 
> 		/**
>-		 * The meta object literal for the 'Guard' containment reference feature.
>+		 * The meta object literal for the 'Super Group' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_EDGE__GUARD = eINSTANCE.getActivityEdge_Guard();
>+		EReference ACTIVITY_GROUP__SUPER_GROUP = eINSTANCE
>+			.getActivityGroup_SuperGroup();
> 
> 		/**
>-		 * The meta object literal for the 'Weight' containment reference feature.
>+		 * The meta object literal for the 'In Activity' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_EDGE__WEIGHT = eINSTANCE.getActivityEdge_Weight();
>+		EReference ACTIVITY_GROUP__IN_ACTIVITY = eINSTANCE
>+			.getActivityGroup_InActivity();
> 
> 		/**
>-		 * The meta object literal for the 'Interrupts' reference feature.
>+		 * The meta object literal for the 'Contained Edge' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_EDGE__INTERRUPTS = eINSTANCE
>-			.getActivityEdge_Interrupts();
>+		EReference ACTIVITY_GROUP__CONTAINED_EDGE = eINSTANCE
>+			.getActivityGroup_ContainedEdge();
> 
> 		/**
>-		 * The meta object literal for the 'Source' reference feature.
>+		 * The meta object literal for the 'Contained Node' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_EDGE__SOURCE = eINSTANCE.getActivityEdge_Source();
>+		EReference ACTIVITY_GROUP__CONTAINED_NODE = eINSTANCE
>+			.getActivityGroup_ContainedNode();
> 
> 		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActivityImpl Activity}' class.
>@@ -72044,271 +72122,266 @@
> 		EClass ACTIVITY = eINSTANCE.getActivity();
> 
> 		/**
>-		 * The meta object literal for the 'Is Read Only' attribute feature.
>+		 * The meta object literal for the 'Structured Node' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute ACTIVITY__IS_READ_ONLY = eINSTANCE.getActivity_IsReadOnly();
>+		EReference ACTIVITY__STRUCTURED_NODE = eINSTANCE
>+			.getActivity_StructuredNode();
> 
> 		/**
>-		 * The meta object literal for the 'Partition' reference list feature.
>+		 * The meta object literal for the 'Variable' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY__PARTITION = eINSTANCE.getActivity_Partition();
>+		EReference ACTIVITY__VARIABLE = eINSTANCE.getActivity_Variable();
> 
> 		/**
>-		 * The meta object literal for the 'Group' containment reference list feature.
>+		 * The meta object literal for the 'Node' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY__GROUP = eINSTANCE.getActivity_Group();
>+		EReference ACTIVITY__NODE = eINSTANCE.getActivity_Node();
> 
> 		/**
>-		 * The meta object literal for the 'Is Single Execution' attribute feature.
>+		 * The meta object literal for the 'Is Read Only' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute ACTIVITY__IS_SINGLE_EXECUTION = eINSTANCE
>-			.getActivity_IsSingleExecution();
>+		EAttribute ACTIVITY__IS_READ_ONLY = eINSTANCE.getActivity_IsReadOnly();
> 
> 		/**
>-		 * The meta object literal for the 'Structured Node' reference list feature.
>+		 * The meta object literal for the 'Edge' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY__STRUCTURED_NODE = eINSTANCE
>-			.getActivity_StructuredNode();
>+		EReference ACTIVITY__EDGE = eINSTANCE.getActivity_Edge();
> 
> 		/**
>-		 * The meta object literal for the 'Variable' containment reference list feature.
>+		 * The meta object literal for the 'Partition' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY__VARIABLE = eINSTANCE.getActivity_Variable();
>+		EReference ACTIVITY__PARTITION = eINSTANCE.getActivity_Partition();
> 
> 		/**
>-		 * The meta object literal for the 'Node' containment reference list feature.
>+		 * The meta object literal for the 'Is Single Execution' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY__NODE = eINSTANCE.getActivity_Node();
>+		EAttribute ACTIVITY__IS_SINGLE_EXECUTION = eINSTANCE
>+			.getActivity_IsSingleExecution();
> 
> 		/**
>-		 * The meta object literal for the 'Edge' containment reference list feature.
>+		 * The meta object literal for the 'Group' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY__EDGE = eINSTANCE.getActivity_Edge();
>+		EReference ACTIVITY__GROUP = eINSTANCE.getActivity_Group();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActivityPartitionImpl Activity Partition}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.VariableImpl Variable}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ActivityPartitionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActivityPartition()
>+		 * @see org.eclipse.uml2.uml.internal.impl.VariableImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getVariable()
> 		 * @generated
> 		 */
>-		EClass ACTIVITY_PARTITION = eINSTANCE.getActivityPartition();
>+		EClass VARIABLE = eINSTANCE.getVariable();
> 
> 		/**
>-		 * The meta object literal for the 'Is Dimension' attribute feature.
>+		 * The meta object literal for the 'Scope' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute ACTIVITY_PARTITION__IS_DIMENSION = eINSTANCE
>-			.getActivityPartition_IsDimension();
>+		EReference VARIABLE__SCOPE = eINSTANCE.getVariable_Scope();
> 
> 		/**
>-		 * The meta object literal for the 'Is External' attribute feature.
>+		 * The meta object literal for the 'Activity Scope' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute ACTIVITY_PARTITION__IS_EXTERNAL = eINSTANCE
>-			.getActivityPartition_IsExternal();
>+		EReference VARIABLE__ACTIVITY_SCOPE = eINSTANCE
>+			.getVariable_ActivityScope();
> 
> 		/**
>-		 * The meta object literal for the 'Edge' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActivityEdgeImpl Activity Edge}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ActivityEdgeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActivityEdge()
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_PARTITION__EDGE = eINSTANCE
>-			.getActivityPartition_Edge();
>+		EClass ACTIVITY_EDGE = eINSTANCE.getActivityEdge();
> 
> 		/**
>-		 * The meta object literal for the 'Node' reference list feature.
>+		 * The meta object literal for the 'Source' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_PARTITION__NODE = eINSTANCE
>-			.getActivityPartition_Node();
>+		EReference ACTIVITY_EDGE__SOURCE = eINSTANCE.getActivityEdge_Source();
> 
> 		/**
>-		 * The meta object literal for the 'Subpartition' containment reference list feature.
>+		 * The meta object literal for the 'Target' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_PARTITION__SUBPARTITION = eINSTANCE
>-			.getActivityPartition_Subpartition();
>+		EReference ACTIVITY_EDGE__TARGET = eINSTANCE.getActivityEdge_Target();
> 
> 		/**
>-		 * The meta object literal for the 'Super Partition' container reference feature.
>+		 * The meta object literal for the 'Redefined Edge' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_PARTITION__SUPER_PARTITION = eINSTANCE
>-			.getActivityPartition_SuperPartition();
>+		EReference ACTIVITY_EDGE__REDEFINED_EDGE = eINSTANCE
>+			.getActivityEdge_RedefinedEdge();
> 
> 		/**
>-		 * The meta object literal for the 'Represents' reference feature.
>+		 * The meta object literal for the 'In Partition' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_PARTITION__REPRESENTS = eINSTANCE
>-			.getActivityPartition_Represents();
>+		EReference ACTIVITY_EDGE__IN_PARTITION = eINSTANCE
>+			.getActivityEdge_InPartition();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActivityGroupImpl Activity Group}' class.
>+		 * The meta object literal for the 'Guard' containment reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ActivityGroupImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActivityGroup()
> 		 * @generated
> 		 */
>-		EClass ACTIVITY_GROUP = eINSTANCE.getActivityGroup();
>+		EReference ACTIVITY_EDGE__GUARD = eINSTANCE.getActivityEdge_Guard();
> 
> 		/**
>-		 * The meta object literal for the 'Subgroup' reference list feature.
>+		 * The meta object literal for the 'Weight' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_GROUP__SUBGROUP = eINSTANCE
>-			.getActivityGroup_Subgroup();
>+		EReference ACTIVITY_EDGE__WEIGHT = eINSTANCE.getActivityEdge_Weight();
> 
> 		/**
>-		 * The meta object literal for the 'Super Group' reference feature.
>+		 * The meta object literal for the 'Interrupts' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_GROUP__SUPER_GROUP = eINSTANCE
>-			.getActivityGroup_SuperGroup();
>+		EReference ACTIVITY_EDGE__INTERRUPTS = eINSTANCE
>+			.getActivityEdge_Interrupts();
> 
> 		/**
>-		 * The meta object literal for the 'Contained Node' reference list feature.
>+		 * The meta object literal for the 'In Structured Node' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_GROUP__CONTAINED_NODE = eINSTANCE
>-			.getActivityGroup_ContainedNode();
>+		EReference ACTIVITY_EDGE__IN_STRUCTURED_NODE = eINSTANCE
>+			.getActivityEdge_InStructuredNode();
> 
> 		/**
>-		 * The meta object literal for the 'In Activity' container reference feature.
>+		 * The meta object literal for the 'In Group' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_GROUP__IN_ACTIVITY = eINSTANCE
>-			.getActivityGroup_InActivity();
>+		EReference ACTIVITY_EDGE__IN_GROUP = eINSTANCE
>+			.getActivityEdge_InGroup();
> 
> 		/**
>-		 * The meta object literal for the 'Contained Edge' reference list feature.
>+		 * The meta object literal for the 'Activity' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference ACTIVITY_GROUP__CONTAINED_EDGE = eINSTANCE
>-			.getActivityGroup_ContainedEdge();
>+		EReference ACTIVITY_EDGE__ACTIVITY = eINSTANCE
>+			.getActivityEdge_Activity();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.StructuredActivityNodeImpl Structured Activity Node}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActivityPartitionImpl Activity Partition}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.StructuredActivityNodeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStructuredActivityNode()
>+		 * @see org.eclipse.uml2.uml.internal.impl.ActivityPartitionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActivityPartition()
> 		 * @generated
> 		 */
>-		EClass STRUCTURED_ACTIVITY_NODE = eINSTANCE.getStructuredActivityNode();
>+		EClass ACTIVITY_PARTITION = eINSTANCE.getActivityPartition();
> 
> 		/**
>-		 * The meta object literal for the 'Variable' containment reference list feature.
>+		 * The meta object literal for the 'Is Dimension' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference STRUCTURED_ACTIVITY_NODE__VARIABLE = eINSTANCE
>-			.getStructuredActivityNode_Variable();
>+		EAttribute ACTIVITY_PARTITION__IS_DIMENSION = eINSTANCE
>+			.getActivityPartition_IsDimension();
> 
> 		/**
>-		 * The meta object literal for the 'Node' containment reference list feature.
>+		 * The meta object literal for the 'Is External' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference STRUCTURED_ACTIVITY_NODE__NODE = eINSTANCE
>-			.getStructuredActivityNode_Node();
>+		EAttribute ACTIVITY_PARTITION__IS_EXTERNAL = eINSTANCE
>+			.getActivityPartition_IsExternal();
> 
> 		/**
>-		 * The meta object literal for the 'Must Isolate' attribute feature.
>+		 * The meta object literal for the 'Node' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute STRUCTURED_ACTIVITY_NODE__MUST_ISOLATE = eINSTANCE
>-			.getStructuredActivityNode_MustIsolate();
>+		EReference ACTIVITY_PARTITION__NODE = eINSTANCE
>+			.getActivityPartition_Node();
> 
> 		/**
>-		 * The meta object literal for the 'Edge' containment reference list feature.
>+		 * The meta object literal for the 'Subpartition' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference STRUCTURED_ACTIVITY_NODE__EDGE = eINSTANCE
>-			.getStructuredActivityNode_Edge();
>+		EReference ACTIVITY_PARTITION__SUBPARTITION = eINSTANCE
>+			.getActivityPartition_Subpartition();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.VariableImpl Variable}' class.
>+		 * The meta object literal for the 'Super Partition' container reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.VariableImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getVariable()
> 		 * @generated
> 		 */
>-		EClass VARIABLE = eINSTANCE.getVariable();
>+		EReference ACTIVITY_PARTITION__SUPER_PARTITION = eINSTANCE
>+			.getActivityPartition_SuperPartition();
> 
> 		/**
>-		 * The meta object literal for the 'Activity Scope' container reference feature.
>+		 * The meta object literal for the 'Represents' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference VARIABLE__ACTIVITY_SCOPE = eINSTANCE
>-			.getVariable_ActivityScope();
>+		EReference ACTIVITY_PARTITION__REPRESENTS = eINSTANCE
>+			.getActivityPartition_Represents();
> 
> 		/**
>-		 * The meta object literal for the 'Scope' container reference feature.
>+		 * The meta object literal for the 'Edge' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference VARIABLE__SCOPE = eINSTANCE.getVariable_Scope();
>+		EReference ACTIVITY_PARTITION__EDGE = eINSTANCE
>+			.getActivityPartition_Edge();
> 
> 		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InterruptibleActivityRegionImpl Interruptible Activity Region}' class.
>@@ -72476,60 +72549,573 @@
> 		EClass INPUT_PIN = eINSTANCE.getInputPin();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.GeneralOrderingImpl General Ordering}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CallActionImpl Call Action}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.GeneralOrderingImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getGeneralOrdering()
>+		 * @see org.eclipse.uml2.uml.internal.impl.CallActionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCallAction()
> 		 * @generated
> 		 */
>-		EClass GENERAL_ORDERING = eINSTANCE.getGeneralOrdering();
>+		EClass CALL_ACTION = eINSTANCE.getCallAction();
> 
> 		/**
>-		 * The meta object literal for the 'Before' reference feature.
>+		 * The meta object literal for the 'Is Synchronous' attribute feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference GENERAL_ORDERING__BEFORE = eINSTANCE
>-			.getGeneralOrdering_Before();
>+		EAttribute CALL_ACTION__IS_SYNCHRONOUS = eINSTANCE
>+			.getCallAction_IsSynchronous();
> 
> 		/**
>-		 * The meta object literal for the 'After' reference feature.
>+		 * The meta object literal for the 'Result' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference GENERAL_ORDERING__AFTER = eINSTANCE
>-			.getGeneralOrdering_After();
>+		EReference CALL_ACTION__RESULT = eINSTANCE.getCallAction_Result();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.OccurrenceSpecificationImpl Occurrence Specification}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InvocationActionImpl Invocation Action}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.OccurrenceSpecificationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getOccurrenceSpecification()
>+		 * @see org.eclipse.uml2.uml.internal.impl.InvocationActionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInvocationAction()
> 		 * @generated
> 		 */
>-		EClass OCCURRENCE_SPECIFICATION = eINSTANCE
>-			.getOccurrenceSpecification();
>+		EClass INVOCATION_ACTION = eINSTANCE.getInvocationAction();
> 
> 		/**
>-		 * The meta object literal for the 'To Before' reference list feature.
>+		 * The meta object literal for the 'Argument' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference OCCURRENCE_SPECIFICATION__TO_BEFORE = eINSTANCE
>-			.getOccurrenceSpecification_ToBefore();
>+		EReference INVOCATION_ACTION__ARGUMENT = eINSTANCE
>+			.getInvocationAction_Argument();
> 
> 		/**
>-		 * The meta object literal for the 'Event' reference feature.
>+		 * The meta object literal for the 'On Port' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference OCCURRENCE_SPECIFICATION__EVENT = eINSTANCE
>+		EReference INVOCATION_ACTION__ON_PORT = eINSTANCE
>+			.getInvocationAction_OnPort();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SendSignalActionImpl Send Signal Action}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.SendSignalActionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSendSignalAction()
>+		 * @generated
>+		 */
>+		EClass SEND_SIGNAL_ACTION = eINSTANCE.getSendSignalAction();
>+
>+		/**
>+		 * The meta object literal for the 'Target' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SEND_SIGNAL_ACTION__TARGET = eINSTANCE
>+			.getSendSignalAction_Target();
>+
>+		/**
>+		 * The meta object literal for the 'Signal' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SEND_SIGNAL_ACTION__SIGNAL = eINSTANCE
>+			.getSendSignalAction_Signal();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CallOperationActionImpl Call Operation Action}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.CallOperationActionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCallOperationAction()
>+		 * @generated
>+		 */
>+		EClass CALL_OPERATION_ACTION = eINSTANCE.getCallOperationAction();
>+
>+		/**
>+		 * The meta object literal for the 'Operation' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference CALL_OPERATION_ACTION__OPERATION = eINSTANCE
>+			.getCallOperationAction_Operation();
>+
>+		/**
>+		 * The meta object literal for the 'Target' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference CALL_OPERATION_ACTION__TARGET = eINSTANCE
>+			.getCallOperationAction_Target();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CallBehaviorActionImpl Call Behavior Action}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.CallBehaviorActionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCallBehaviorAction()
>+		 * @generated
>+		 */
>+		EClass CALL_BEHAVIOR_ACTION = eINSTANCE.getCallBehaviorAction();
>+
>+		/**
>+		 * The meta object literal for the 'Behavior' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference CALL_BEHAVIOR_ACTION__BEHAVIOR = eINSTANCE
>+			.getCallBehaviorAction_Behavior();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SequenceNodeImpl Sequence Node}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.SequenceNodeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSequenceNode()
>+		 * @generated
>+		 */
>+		EClass SEQUENCE_NODE = eINSTANCE.getSequenceNode();
>+
>+		/**
>+		 * The meta object literal for the 'Executable Node' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SEQUENCE_NODE__EXECUTABLE_NODE = eINSTANCE
>+			.getSequenceNode_ExecutableNode();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ControlNodeImpl Control Node}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ControlNodeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getControlNode()
>+		 * @generated
>+		 */
>+		EClass CONTROL_NODE = eINSTANCE.getControlNode();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ControlFlowImpl Control Flow}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ControlFlowImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getControlFlow()
>+		 * @generated
>+		 */
>+		EClass CONTROL_FLOW = eINSTANCE.getControlFlow();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InitialNodeImpl Initial Node}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.InitialNodeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInitialNode()
>+		 * @generated
>+		 */
>+		EClass INITIAL_NODE = eINSTANCE.getInitialNode();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActivityParameterNodeImpl Activity Parameter Node}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ActivityParameterNodeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActivityParameterNode()
>+		 * @generated
>+		 */
>+		EClass ACTIVITY_PARAMETER_NODE = eINSTANCE.getActivityParameterNode();
>+
>+		/**
>+		 * The meta object literal for the 'Parameter' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference ACTIVITY_PARAMETER_NODE__PARAMETER = eINSTANCE
>+			.getActivityParameterNode_Parameter();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ValuePinImpl Value Pin}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ValuePinImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getValuePin()
>+		 * @generated
>+		 */
>+		EClass VALUE_PIN = eINSTANCE.getValuePin();
>+
>+		/**
>+		 * The meta object literal for the 'Value' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference VALUE_PIN__VALUE = eINSTANCE.getValuePin_Value();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.MessageImpl Message}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.MessageImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMessage()
>+		 * @generated
>+		 */
>+		EClass MESSAGE = eINSTANCE.getMessage();
>+
>+		/**
>+		 * The meta object literal for the 'Message Kind' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute MESSAGE__MESSAGE_KIND = eINSTANCE.getMessage_MessageKind();
>+
>+		/**
>+		 * The meta object literal for the 'Message Sort' attribute feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EAttribute MESSAGE__MESSAGE_SORT = eINSTANCE.getMessage_MessageSort();
>+
>+		/**
>+		 * The meta object literal for the 'Receive Event' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference MESSAGE__RECEIVE_EVENT = eINSTANCE.getMessage_ReceiveEvent();
>+
>+		/**
>+		 * The meta object literal for the 'Send Event' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference MESSAGE__SEND_EVENT = eINSTANCE.getMessage_SendEvent();
>+
>+		/**
>+		 * The meta object literal for the 'Connector' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference MESSAGE__CONNECTOR = eINSTANCE.getMessage_Connector();
>+
>+		/**
>+		 * The meta object literal for the 'Interaction' container reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference MESSAGE__INTERACTION = eINSTANCE.getMessage_Interaction();
>+
>+		/**
>+		 * The meta object literal for the 'Argument' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference MESSAGE__ARGUMENT = eINSTANCE.getMessage_Argument();
>+
>+		/**
>+		 * The meta object literal for the 'Signature' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference MESSAGE__SIGNATURE = eINSTANCE.getMessage_Signature();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.MessageEndImpl Message End}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.MessageEndImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMessageEnd()
>+		 * @generated
>+		 */
>+		EClass MESSAGE_END = eINSTANCE.getMessageEnd();
>+
>+		/**
>+		 * The meta object literal for the 'Message' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference MESSAGE_END__MESSAGE = eINSTANCE.getMessageEnd_Message();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InteractionImpl Interaction}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.InteractionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInteraction()
>+		 * @generated
>+		 */
>+		EClass INTERACTION = eINSTANCE.getInteraction();
>+
>+		/**
>+		 * The meta object literal for the 'Lifeline' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERACTION__LIFELINE = eINSTANCE.getInteraction_Lifeline();
>+
>+		/**
>+		 * The meta object literal for the 'Fragment' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERACTION__FRAGMENT = eINSTANCE.getInteraction_Fragment();
>+
>+		/**
>+		 * The meta object literal for the 'Action' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERACTION__ACTION = eINSTANCE.getInteraction_Action();
>+
>+		/**
>+		 * The meta object literal for the 'Formal Gate' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERACTION__FORMAL_GATE = eINSTANCE
>+			.getInteraction_FormalGate();
>+
>+		/**
>+		 * The meta object literal for the 'Message' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERACTION__MESSAGE = eINSTANCE.getInteraction_Message();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InteractionFragmentImpl Interaction Fragment}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.InteractionFragmentImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInteractionFragment()
>+		 * @generated
>+		 */
>+		EClass INTERACTION_FRAGMENT = eINSTANCE.getInteractionFragment();
>+
>+		/**
>+		 * The meta object literal for the 'Covered' reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERACTION_FRAGMENT__COVERED = eINSTANCE
>+			.getInteractionFragment_Covered();
>+
>+		/**
>+		 * The meta object literal for the 'General Ordering' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERACTION_FRAGMENT__GENERAL_ORDERING = eINSTANCE
>+			.getInteractionFragment_GeneralOrdering();
>+
>+		/**
>+		 * The meta object literal for the 'Enclosing Interaction' container reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERACTION_FRAGMENT__ENCLOSING_INTERACTION = eINSTANCE
>+			.getInteractionFragment_EnclosingInteraction();
>+
>+		/**
>+		 * The meta object literal for the 'Enclosing Operand' container reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERACTION_FRAGMENT__ENCLOSING_OPERAND = eINSTANCE
>+			.getInteractionFragment_EnclosingOperand();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.LifelineImpl Lifeline}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.LifelineImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getLifeline()
>+		 * @generated
>+		 */
>+		EClass LIFELINE = eINSTANCE.getLifeline();
>+
>+		/**
>+		 * The meta object literal for the 'Represents' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference LIFELINE__REPRESENTS = eINSTANCE.getLifeline_Represents();
>+
>+		/**
>+		 * The meta object literal for the 'Interaction' container reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference LIFELINE__INTERACTION = eINSTANCE.getLifeline_Interaction();
>+
>+		/**
>+		 * The meta object literal for the 'Selector' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference LIFELINE__SELECTOR = eINSTANCE.getLifeline_Selector();
>+
>+		/**
>+		 * The meta object literal for the 'Decomposed As' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference LIFELINE__DECOMPOSED_AS = eINSTANCE
>+			.getLifeline_DecomposedAs();
>+
>+		/**
>+		 * The meta object literal for the 'Covered By' reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference LIFELINE__COVERED_BY = eINSTANCE.getLifeline_CoveredBy();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.PartDecompositionImpl Part Decomposition}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.PartDecompositionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getPartDecomposition()
>+		 * @generated
>+		 */
>+		EClass PART_DECOMPOSITION = eINSTANCE.getPartDecomposition();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InteractionUseImpl Interaction Use}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.InteractionUseImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInteractionUse()
>+		 * @generated
>+		 */
>+		EClass INTERACTION_USE = eINSTANCE.getInteractionUse();
>+
>+		/**
>+		 * The meta object literal for the 'Refers To' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERACTION_USE__REFERS_TO = eINSTANCE
>+			.getInteractionUse_RefersTo();
>+
>+		/**
>+		 * The meta object literal for the 'Actual Gate' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERACTION_USE__ACTUAL_GATE = eINSTANCE
>+			.getInteractionUse_ActualGate();
>+
>+		/**
>+		 * The meta object literal for the 'Argument' containment reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INTERACTION_USE__ARGUMENT = eINSTANCE
>+			.getInteractionUse_Argument();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.GateImpl Gate}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.GateImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getGate()
>+		 * @generated
>+		 */
>+		EClass GATE = eINSTANCE.getGate();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.GeneralOrderingImpl General Ordering}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.GeneralOrderingImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getGeneralOrdering()
>+		 * @generated
>+		 */
>+		EClass GENERAL_ORDERING = eINSTANCE.getGeneralOrdering();
>+
>+		/**
>+		 * The meta object literal for the 'Before' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference GENERAL_ORDERING__BEFORE = eINSTANCE
>+			.getGeneralOrdering_Before();
>+
>+		/**
>+		 * The meta object literal for the 'After' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference GENERAL_ORDERING__AFTER = eINSTANCE
>+			.getGeneralOrdering_After();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.OccurrenceSpecificationImpl Occurrence Specification}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.OccurrenceSpecificationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getOccurrenceSpecification()
>+		 * @generated
>+		 */
>+		EClass OCCURRENCE_SPECIFICATION = eINSTANCE
>+			.getOccurrenceSpecification();
>+
>+		/**
>+		 * The meta object literal for the 'To Before' reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference OCCURRENCE_SPECIFICATION__TO_BEFORE = eINSTANCE
>+			.getOccurrenceSpecification_ToBefore();
>+
>+		/**
>+		 * The meta object literal for the 'Event' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference OCCURRENCE_SPECIFICATION__EVENT = eINSTANCE
> 			.getOccurrenceSpecification_Event();
> 
> 		/**
>@@ -72598,238 +73184,575 @@
> 			.getInteractionConstraint_Maxint();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExecutionSpecificationImpl Execution Specification}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExecutionSpecificationImpl Execution Specification}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ExecutionSpecificationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExecutionSpecification()
>+		 * @generated
>+		 */
>+		EClass EXECUTION_SPECIFICATION = eINSTANCE.getExecutionSpecification();
>+
>+		/**
>+		 * The meta object literal for the 'Start' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference EXECUTION_SPECIFICATION__START = eINSTANCE
>+			.getExecutionSpecification_Start();
>+
>+		/**
>+		 * The meta object literal for the 'Finish' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference EXECUTION_SPECIFICATION__FINISH = eINSTANCE
>+			.getExecutionSpecification_Finish();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.StateInvariantImpl State Invariant}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.StateInvariantImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStateInvariant()
>+		 * @generated
>+		 */
>+		EClass STATE_INVARIANT = eINSTANCE.getStateInvariant();
>+
>+		/**
>+		 * The meta object literal for the 'Invariant' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference STATE_INVARIANT__INVARIANT = eINSTANCE
>+			.getStateInvariant_Invariant();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActionExecutionSpecificationImpl Action Execution Specification}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ActionExecutionSpecificationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActionExecutionSpecification()
>+		 * @generated
>+		 */
>+		EClass ACTION_EXECUTION_SPECIFICATION = eINSTANCE
>+			.getActionExecutionSpecification();
>+
>+		/**
>+		 * The meta object literal for the 'Action' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference ACTION_EXECUTION_SPECIFICATION__ACTION = eINSTANCE
>+			.getActionExecutionSpecification_Action();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.BehaviorExecutionSpecificationImpl Behavior Execution Specification}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.BehaviorExecutionSpecificationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getBehaviorExecutionSpecification()
>+		 * @generated
>+		 */
>+		EClass BEHAVIOR_EXECUTION_SPECIFICATION = eINSTANCE
>+			.getBehaviorExecutionSpecification();
>+
>+		/**
>+		 * The meta object literal for the 'Behavior' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference BEHAVIOR_EXECUTION_SPECIFICATION__BEHAVIOR = eINSTANCE
>+			.getBehaviorExecutionSpecification_Behavior();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExecutionEventImpl Execution Event}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ExecutionEventImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExecutionEvent()
>+		 * @generated
>+		 */
>+		EClass EXECUTION_EVENT = eINSTANCE.getExecutionEvent();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CreationEventImpl Creation Event}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.CreationEventImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCreationEvent()
>+		 * @generated
>+		 */
>+		EClass CREATION_EVENT = eINSTANCE.getCreationEvent();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.DestructionEventImpl Destruction Event}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.DestructionEventImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDestructionEvent()
>+		 * @generated
>+		 */
>+		EClass DESTRUCTION_EVENT = eINSTANCE.getDestructionEvent();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SendOperationEventImpl Send Operation Event}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.SendOperationEventImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSendOperationEvent()
>+		 * @generated
>+		 */
>+		EClass SEND_OPERATION_EVENT = eINSTANCE.getSendOperationEvent();
>+
>+		/**
>+		 * The meta object literal for the 'Operation' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SEND_OPERATION_EVENT__OPERATION = eINSTANCE
>+			.getSendOperationEvent_Operation();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.MessageEventImpl Message Event}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.MessageEventImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMessageEvent()
>+		 * @generated
>+		 */
>+		EClass MESSAGE_EVENT = eINSTANCE.getMessageEvent();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SendSignalEventImpl Send Signal Event}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.SendSignalEventImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSendSignalEvent()
>+		 * @generated
>+		 */
>+		EClass SEND_SIGNAL_EVENT = eINSTANCE.getSendSignalEvent();
>+
>+		/**
>+		 * The meta object literal for the 'Signal' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SEND_SIGNAL_EVENT__SIGNAL = eINSTANCE
>+			.getSendSignalEvent_Signal();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.MessageOccurrenceSpecificationImpl Message Occurrence Specification}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.MessageOccurrenceSpecificationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMessageOccurrenceSpecification()
>+		 * @generated
>+		 */
>+		EClass MESSAGE_OCCURRENCE_SPECIFICATION = eINSTANCE
>+			.getMessageOccurrenceSpecification();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExecutionOccurrenceSpecificationImpl Execution Occurrence Specification}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ExecutionOccurrenceSpecificationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExecutionOccurrenceSpecification()
>+		 * @generated
>+		 */
>+		EClass EXECUTION_OCCURRENCE_SPECIFICATION = eINSTANCE
>+			.getExecutionOccurrenceSpecification();
>+
>+		/**
>+		 * The meta object literal for the 'Execution' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference EXECUTION_OCCURRENCE_SPECIFICATION__EXECUTION = eINSTANCE
>+			.getExecutionOccurrenceSpecification_Execution();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ReceiveOperationEventImpl Receive Operation Event}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ReceiveOperationEventImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReceiveOperationEvent()
>+		 * @generated
>+		 */
>+		EClass RECEIVE_OPERATION_EVENT = eINSTANCE.getReceiveOperationEvent();
>+
>+		/**
>+		 * The meta object literal for the 'Operation' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference RECEIVE_OPERATION_EVENT__OPERATION = eINSTANCE
>+			.getReceiveOperationEvent_Operation();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ReceiveSignalEventImpl Receive Signal Event}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ReceiveSignalEventImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReceiveSignalEvent()
>+		 * @generated
>+		 */
>+		EClass RECEIVE_SIGNAL_EVENT = eINSTANCE.getReceiveSignalEvent();
>+
>+		/**
>+		 * The meta object literal for the 'Signal' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference RECEIVE_SIGNAL_EVENT__SIGNAL = eINSTANCE
>+			.getReceiveSignalEvent_Signal();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActorImpl Actor}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ActorImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActor()
>+		 * @generated
>+		 */
>+		EClass ACTOR = eINSTANCE.getActor();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CallEventImpl Call Event}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.CallEventImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCallEvent()
>+		 * @generated
>+		 */
>+		EClass CALL_EVENT = eINSTANCE.getCallEvent();
>+
>+		/**
>+		 * The meta object literal for the 'Operation' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference CALL_EVENT__OPERATION = eINSTANCE.getCallEvent_Operation();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ChangeEventImpl Change Event}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ChangeEventImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getChangeEvent()
>+		 * @generated
>+		 */
>+		EClass CHANGE_EVENT = eINSTANCE.getChangeEvent();
>+
>+		/**
>+		 * The meta object literal for the 'Change Expression' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference CHANGE_EVENT__CHANGE_EXPRESSION = eINSTANCE
>+			.getChangeEvent_ChangeExpression();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SignalEventImpl Signal Event}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.SignalEventImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSignalEvent()
>+		 * @generated
>+		 */
>+		EClass SIGNAL_EVENT = eINSTANCE.getSignalEvent();
>+
>+		/**
>+		 * The meta object literal for the 'Signal' reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference SIGNAL_EVENT__SIGNAL = eINSTANCE.getSignalEvent_Signal();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.AnyReceiveEventImpl Any Receive Event}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.AnyReceiveEventImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getAnyReceiveEvent()
>+		 * @generated
>+		 */
>+		EClass ANY_RECEIVE_EVENT = eINSTANCE.getAnyReceiveEvent();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ForkNodeImpl Fork Node}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ForkNodeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getForkNode()
>+		 * @generated
>+		 */
>+		EClass FORK_NODE = eINSTANCE.getForkNode();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.FlowFinalNodeImpl Flow Final Node}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.FlowFinalNodeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getFlowFinalNode()
>+		 * @generated
>+		 */
>+		EClass FLOW_FINAL_NODE = eINSTANCE.getFlowFinalNode();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.FinalNodeImpl Final Node}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.FinalNodeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getFinalNode()
>+		 * @generated
>+		 */
>+		EClass FINAL_NODE = eINSTANCE.getFinalNode();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CentralBufferNodeImpl Central Buffer Node}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.CentralBufferNodeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCentralBufferNode()
>+		 * @generated
>+		 */
>+		EClass CENTRAL_BUFFER_NODE = eINSTANCE.getCentralBufferNode();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.MergeNodeImpl Merge Node}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ExecutionSpecificationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExecutionSpecification()
>+		 * @see org.eclipse.uml2.uml.internal.impl.MergeNodeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMergeNode()
> 		 * @generated
> 		 */
>-		EClass EXECUTION_SPECIFICATION = eINSTANCE.getExecutionSpecification();
>+		EClass MERGE_NODE = eINSTANCE.getMergeNode();
> 
> 		/**
>-		 * The meta object literal for the 'Start' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.DecisionNodeImpl Decision Node}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.DecisionNodeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDecisionNode()
> 		 * @generated
> 		 */
>-		EReference EXECUTION_SPECIFICATION__START = eINSTANCE
>-			.getExecutionSpecification_Start();
>+		EClass DECISION_NODE = eINSTANCE.getDecisionNode();
> 
> 		/**
>-		 * The meta object literal for the 'Finish' reference feature.
>+		 * The meta object literal for the 'Decision Input' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference EXECUTION_SPECIFICATION__FINISH = eINSTANCE
>-			.getExecutionSpecification_Finish();
>+		EReference DECISION_NODE__DECISION_INPUT = eINSTANCE
>+			.getDecisionNode_DecisionInput();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExecutionOccurrenceSpecificationImpl Execution Occurrence Specification}' class.
>+		 * The meta object literal for the 'Decision Input Flow' reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ExecutionOccurrenceSpecificationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExecutionOccurrenceSpecification()
> 		 * @generated
> 		 */
>-		EClass EXECUTION_OCCURRENCE_SPECIFICATION = eINSTANCE
>-			.getExecutionOccurrenceSpecification();
>+		EReference DECISION_NODE__DECISION_INPUT_FLOW = eINSTANCE
>+			.getDecisionNode_DecisionInputFlow();
> 
> 		/**
>-		 * The meta object literal for the 'Execution' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ObjectFlowImpl Object Flow}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ObjectFlowImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getObjectFlow()
> 		 * @generated
> 		 */
>-		EReference EXECUTION_OCCURRENCE_SPECIFICATION__EXECUTION = eINSTANCE
>-			.getExecutionOccurrenceSpecification_Execution();
>+		EClass OBJECT_FLOW = eINSTANCE.getObjectFlow();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExecutionEventImpl Execution Event}' class.
>+		 * The meta object literal for the 'Is Multicast' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ExecutionEventImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExecutionEvent()
> 		 * @generated
> 		 */
>-		EClass EXECUTION_EVENT = eINSTANCE.getExecutionEvent();
>+		EAttribute OBJECT_FLOW__IS_MULTICAST = eINSTANCE
>+			.getObjectFlow_IsMulticast();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.StateInvariantImpl State Invariant}' class.
>+		 * The meta object literal for the 'Is Multireceive' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.StateInvariantImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStateInvariant()
> 		 * @generated
> 		 */
>-		EClass STATE_INVARIANT = eINSTANCE.getStateInvariant();
>+		EAttribute OBJECT_FLOW__IS_MULTIRECEIVE = eINSTANCE
>+			.getObjectFlow_IsMultireceive();
> 
> 		/**
>-		 * The meta object literal for the 'Invariant' containment reference feature.
>+		 * The meta object literal for the 'Transformation' reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference STATE_INVARIANT__INVARIANT = eINSTANCE
>-			.getStateInvariant_Invariant();
>+		EReference OBJECT_FLOW__TRANSFORMATION = eINSTANCE
>+			.getObjectFlow_Transformation();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActionExecutionSpecificationImpl Action Execution Specification}' class.
>+		 * The meta object literal for the 'Selection' reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ActionExecutionSpecificationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActionExecutionSpecification()
> 		 * @generated
> 		 */
>-		EClass ACTION_EXECUTION_SPECIFICATION = eINSTANCE
>-			.getActionExecutionSpecification();
>+		EReference OBJECT_FLOW__SELECTION = eINSTANCE.getObjectFlow_Selection();
> 
> 		/**
>-		 * The meta object literal for the 'Action' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActivityFinalNodeImpl Activity Final Node}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ActivityFinalNodeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActivityFinalNode()
> 		 * @generated
> 		 */
>-		EReference ACTION_EXECUTION_SPECIFICATION__ACTION = eINSTANCE
>-			.getActionExecutionSpecification_Action();
>+		EClass ACTIVITY_FINAL_NODE = eINSTANCE.getActivityFinalNode();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.BehaviorExecutionSpecificationImpl Behavior Execution Specification}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ComponentRealizationImpl Component Realization}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.BehaviorExecutionSpecificationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getBehaviorExecutionSpecification()
>+		 * @see org.eclipse.uml2.uml.internal.impl.ComponentRealizationImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getComponentRealization()
> 		 * @generated
> 		 */
>-		EClass BEHAVIOR_EXECUTION_SPECIFICATION = eINSTANCE
>-			.getBehaviorExecutionSpecification();
>+		EClass COMPONENT_REALIZATION = eINSTANCE.getComponentRealization();
> 
> 		/**
>-		 * The meta object literal for the 'Behavior' reference feature.
>+		 * The meta object literal for the 'Abstraction' container reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference BEHAVIOR_EXECUTION_SPECIFICATION__BEHAVIOR = eINSTANCE
>-			.getBehaviorExecutionSpecification_Behavior();
>+		EReference COMPONENT_REALIZATION__ABSTRACTION = eINSTANCE
>+			.getComponentRealization_Abstraction();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CreationEventImpl Creation Event}' class.
>+		 * The meta object literal for the 'Realizing Classifier' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.CreationEventImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCreationEvent()
> 		 * @generated
> 		 */
>-		EClass CREATION_EVENT = eINSTANCE.getCreationEvent();
>+		EReference COMPONENT_REALIZATION__REALIZING_CLASSIFIER = eINSTANCE
>+			.getComponentRealization_RealizingClassifier();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.DestructionEventImpl Destruction Event}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ComponentImpl Component}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.DestructionEventImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDestructionEvent()
>+		 * @see org.eclipse.uml2.uml.internal.impl.ComponentImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getComponent()
> 		 * @generated
> 		 */
>-		EClass DESTRUCTION_EVENT = eINSTANCE.getDestructionEvent();
>+		EClass COMPONENT = eINSTANCE.getComponent();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SendOperationEventImpl Send Operation Event}' class.
>+		 * The meta object literal for the 'Is Indirectly Instantiated' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.SendOperationEventImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSendOperationEvent()
> 		 * @generated
> 		 */
>-		EClass SEND_OPERATION_EVENT = eINSTANCE.getSendOperationEvent();
>+		EAttribute COMPONENT__IS_INDIRECTLY_INSTANTIATED = eINSTANCE
>+			.getComponent_IsIndirectlyInstantiated();
> 
> 		/**
>-		 * The meta object literal for the 'Operation' reference feature.
>+		 * The meta object literal for the 'Required' reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SEND_OPERATION_EVENT__OPERATION = eINSTANCE
>-			.getSendOperationEvent_Operation();
>+		EReference COMPONENT__REQUIRED = eINSTANCE.getComponent_Required();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.MessageEventImpl Message Event}' class.
>+		 * The meta object literal for the 'Provided' reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.MessageEventImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMessageEvent()
> 		 * @generated
> 		 */
>-		EClass MESSAGE_EVENT = eINSTANCE.getMessageEvent();
>+		EReference COMPONENT__PROVIDED = eINSTANCE.getComponent_Provided();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SendSignalEventImpl Send Signal Event}' class.
>+		 * The meta object literal for the 'Packaged Element' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.SendSignalEventImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSendSignalEvent()
> 		 * @generated
> 		 */
>-		EClass SEND_SIGNAL_EVENT = eINSTANCE.getSendSignalEvent();
>+		EReference COMPONENT__PACKAGED_ELEMENT = eINSTANCE
>+			.getComponent_PackagedElement();
> 
> 		/**
>-		 * The meta object literal for the 'Signal' reference feature.
>+		 * The meta object literal for the 'Realization' containment reference list feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EReference SEND_SIGNAL_EVENT__SIGNAL = eINSTANCE
>-			.getSendSignalEvent_Signal();
>+		EReference COMPONENT__REALIZATION = eINSTANCE
>+			.getComponent_Realization();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.MessageOccurrenceSpecificationImpl Message Occurrence Specification}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.NodeImpl Node}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.MessageOccurrenceSpecificationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMessageOccurrenceSpecification()
>+		 * @see org.eclipse.uml2.uml.internal.impl.NodeImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getNode()
> 		 * @generated
> 		 */
>-		EClass MESSAGE_OCCURRENCE_SPECIFICATION = eINSTANCE
>-			.getMessageOccurrenceSpecification();
>+		EClass NODE = eINSTANCE.getNode();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ReceiveOperationEventImpl Receive Operation Event}' class.
>+		 * The meta object literal for the 'Nested Node' containment reference list feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ReceiveOperationEventImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReceiveOperationEvent()
> 		 * @generated
> 		 */
>-		EClass RECEIVE_OPERATION_EVENT = eINSTANCE.getReceiveOperationEvent();
>+		EReference NODE__NESTED_NODE = eINSTANCE.getNode_NestedNode();
> 
> 		/**
>-		 * The meta object literal for the 'Operation' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CommunicationPathImpl Communication Path}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.CommunicationPathImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCommunicationPath()
> 		 * @generated
> 		 */
>-		EReference RECEIVE_OPERATION_EVENT__OPERATION = eINSTANCE
>-			.getReceiveOperationEvent_Operation();
>+		EClass COMMUNICATION_PATH = eINSTANCE.getCommunicationPath();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ReceiveSignalEventImpl Receive Signal Event}' class.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.DeviceImpl Device}' class.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ReceiveSignalEventImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getReceiveSignalEvent()
>+		 * @see org.eclipse.uml2.uml.internal.impl.DeviceImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDevice()
> 		 * @generated
> 		 */
>-		EClass RECEIVE_SIGNAL_EVENT = eINSTANCE.getReceiveSignalEvent();
>+		EClass DEVICE = eINSTANCE.getDevice();
> 
> 		/**
>-		 * The meta object literal for the 'Signal' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExecutionEnvironmentImpl Execution Environment}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.ExecutionEnvironmentImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExecutionEnvironment()
> 		 * @generated
> 		 */
>-		EReference RECEIVE_SIGNAL_EVENT__SIGNAL = eINSTANCE
>-			.getReceiveSignalEvent_Signal();
>+		EClass EXECUTION_ENVIRONMENT = eINSTANCE.getExecutionEnvironment();
> 
> 		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CombinedFragmentImpl Combined Fragment}' class.
>@@ -72906,71 +73829,6 @@
> 			.getConsiderIgnoreFragment_Message();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CallEventImpl Call Event}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.CallEventImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCallEvent()
>-		 * @generated
>-		 */
>-		EClass CALL_EVENT = eINSTANCE.getCallEvent();
>-
>-		/**
>-		 * The meta object literal for the 'Operation' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference CALL_EVENT__OPERATION = eINSTANCE.getCallEvent_Operation();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ChangeEventImpl Change Event}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ChangeEventImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getChangeEvent()
>-		 * @generated
>-		 */
>-		EClass CHANGE_EVENT = eINSTANCE.getChangeEvent();
>-
>-		/**
>-		 * The meta object literal for the 'Change Expression' containment reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference CHANGE_EVENT__CHANGE_EXPRESSION = eINSTANCE
>-			.getChangeEvent_ChangeExpression();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SignalEventImpl Signal Event}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.SignalEventImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSignalEvent()
>-		 * @generated
>-		 */
>-		EClass SIGNAL_EVENT = eINSTANCE.getSignalEvent();
>-
>-		/**
>-		 * The meta object literal for the 'Signal' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference SIGNAL_EVENT__SIGNAL = eINSTANCE.getSignalEvent_Signal();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.AnyReceiveEventImpl Any Receive Event}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.AnyReceiveEventImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getAnyReceiveEvent()
>-		 * @generated
>-		 */
>-		EClass ANY_RECEIVE_EVENT = eINSTANCE.getAnyReceiveEvent();
>-
>-		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CreateObjectActionImpl Create Object Action}' class.
> 		 * 
> 		 * 
>@@ -73161,6 +74019,15 @@
> 			.getWriteStructuralFeatureAction_Value();
> 
> 		/**
>+		 * The meta object literal for the 'Result' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference WRITE_STRUCTURAL_FEATURE_ACTION__RESULT = eINSTANCE
>+			.getWriteStructuralFeatureAction_Result();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ClearStructuralFeatureActionImpl Clear Structural Feature Action}' class.
> 		 * 
> 		 * 
>@@ -73172,6 +74039,15 @@
> 			.getClearStructuralFeatureAction();
> 
> 		/**
>+		 * The meta object literal for the 'Result' containment reference feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT = eINSTANCE
>+			.getClearStructuralFeatureAction_Result();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.RemoveStructuralFeatureValueActionImpl Remove Structural Feature Value Action}' class.
> 		 * 
> 		 * 
>@@ -73472,34 +74348,6 @@
> 			.getBroadcastSignalAction_Signal();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InvocationActionImpl Invocation Action}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.InvocationActionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInvocationAction()
>-		 * @generated
>-		 */
>-		EClass INVOCATION_ACTION = eINSTANCE.getInvocationAction();
>-
>-		/**
>-		 * The meta object literal for the 'Argument' containment reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference INVOCATION_ACTION__ARGUMENT = eINSTANCE
>-			.getInvocationAction_Argument();
>-
>-		/**
>-		 * The meta object literal for the 'On Port' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference INVOCATION_ACTION__ON_PORT = eINSTANCE
>-			.getInvocationAction_OnPort();
>-
>-		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SendObjectActionImpl Send Object Action}' class.
> 		 * 
> 		 * 
>@@ -73567,7 +74415,7 @@
> 		EClass TIME_EXPRESSION = eINSTANCE.getTimeExpression();
> 
> 		/**
>-		 * The meta object literal for the 'Expr' reference feature.
>+		 * The meta object literal for the 'Expr' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
>@@ -73604,7 +74452,7 @@
> 		EClass DURATION = eINSTANCE.getDuration();
> 
> 		/**
>-		 * The meta object literal for the 'Expr' reference feature.
>+		 * The meta object literal for the 'Expr' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
>@@ -73620,24 +74468,6 @@
> 		EReference DURATION__OBSERVATION = eINSTANCE.getDuration_Observation();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ValuePinImpl Value Pin}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ValuePinImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getValuePin()
>-		 * @generated
>-		 */
>-		EClass VALUE_PIN = eINSTANCE.getValuePin();
>-
>-		/**
>-		 * The meta object literal for the 'Value' containment reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference VALUE_PIN__VALUE = eINSTANCE.getValuePin_Value();
>-
>-		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.DurationIntervalImpl Duration Interval}' class.
> 		 * 
> 		 * 
>@@ -73785,264 +74615,44 @@
> 		 * @generated
> 		 */
> 		EAttribute DURATION_OBSERVATION__FIRST_EVENT = eINSTANCE
>-			.getDurationObservation_FirstEvent();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.OpaqueActionImpl Opaque Action}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.OpaqueActionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getOpaqueAction()
>-		 * @generated
>-		 */
>-		EClass OPAQUE_ACTION = eINSTANCE.getOpaqueAction();
>-
>-		/**
>-		 * The meta object literal for the 'Body' attribute list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute OPAQUE_ACTION__BODY = eINSTANCE.getOpaqueAction_Body();
>-
>-		/**
>-		 * The meta object literal for the 'Language' attribute list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute OPAQUE_ACTION__LANGUAGE = eINSTANCE
>-			.getOpaqueAction_Language();
>-
>-		/**
>-		 * The meta object literal for the 'Input Value' containment reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference OPAQUE_ACTION__INPUT_VALUE = eINSTANCE
>-			.getOpaqueAction_InputValue();
>-
>-		/**
>-		 * The meta object literal for the 'Output Value' containment reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference OPAQUE_ACTION__OUTPUT_VALUE = eINSTANCE
>-			.getOpaqueAction_OutputValue();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CallActionImpl Call Action}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.CallActionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCallAction()
>-		 * @generated
>-		 */
>-		EClass CALL_ACTION = eINSTANCE.getCallAction();
>-
>-		/**
>-		 * The meta object literal for the 'Is Synchronous' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute CALL_ACTION__IS_SYNCHRONOUS = eINSTANCE
>-			.getCallAction_IsSynchronous();
>-
>-		/**
>-		 * The meta object literal for the 'Result' containment reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference CALL_ACTION__RESULT = eINSTANCE.getCallAction_Result();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SendSignalActionImpl Send Signal Action}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.SendSignalActionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSendSignalAction()
>-		 * @generated
>-		 */
>-		EClass SEND_SIGNAL_ACTION = eINSTANCE.getSendSignalAction();
>-
>-		/**
>-		 * The meta object literal for the 'Target' containment reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference SEND_SIGNAL_ACTION__TARGET = eINSTANCE
>-			.getSendSignalAction_Target();
>-
>-		/**
>-		 * The meta object literal for the 'Signal' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference SEND_SIGNAL_ACTION__SIGNAL = eINSTANCE
>-			.getSendSignalAction_Signal();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CallOperationActionImpl Call Operation Action}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.CallOperationActionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCallOperationAction()
>-		 * @generated
>-		 */
>-		EClass CALL_OPERATION_ACTION = eINSTANCE.getCallOperationAction();
>-
>-		/**
>-		 * The meta object literal for the 'Operation' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference CALL_OPERATION_ACTION__OPERATION = eINSTANCE
>-			.getCallOperationAction_Operation();
>-
>-		/**
>-		 * The meta object literal for the 'Target' containment reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference CALL_OPERATION_ACTION__TARGET = eINSTANCE
>-			.getCallOperationAction_Target();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CallBehaviorActionImpl Call Behavior Action}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.CallBehaviorActionImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCallBehaviorAction()
>-		 * @generated
>-		 */
>-		EClass CALL_BEHAVIOR_ACTION = eINSTANCE.getCallBehaviorAction();
>-
>-		/**
>-		 * The meta object literal for the 'Behavior' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference CALL_BEHAVIOR_ACTION__BEHAVIOR = eINSTANCE
>-			.getCallBehaviorAction_Behavior();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InformationItemImpl Information Item}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.InformationItemImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInformationItem()
>-		 * @generated
>-		 */
>-		EClass INFORMATION_ITEM = eINSTANCE.getInformationItem();
>-
>-		/**
>-		 * The meta object literal for the 'Represented' reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference INFORMATION_ITEM__REPRESENTED = eINSTANCE
>-			.getInformationItem_Represented();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InformationFlowImpl Information Flow}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.InformationFlowImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInformationFlow()
>-		 * @generated
>-		 */
>-		EClass INFORMATION_FLOW = eINSTANCE.getInformationFlow();
>-
>-		/**
>-		 * The meta object literal for the 'Realization' reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference INFORMATION_FLOW__REALIZATION = eINSTANCE
>-			.getInformationFlow_Realization();
>-
>-		/**
>-		 * The meta object literal for the 'Conveyed' reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference INFORMATION_FLOW__CONVEYED = eINSTANCE
>-			.getInformationFlow_Conveyed();
>-
>-		/**
>-		 * The meta object literal for the 'Information Source' reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference INFORMATION_FLOW__INFORMATION_SOURCE = eINSTANCE
>-			.getInformationFlow_InformationSource();
>-
>-		/**
>-		 * The meta object literal for the 'Information Target' reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference INFORMATION_FLOW__INFORMATION_TARGET = eINSTANCE
>-			.getInformationFlow_InformationTarget();
>-
>-		/**
>-		 * The meta object literal for the 'Realizing Activity Edge' reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference INFORMATION_FLOW__REALIZING_ACTIVITY_EDGE = eINSTANCE
>-			.getInformationFlow_RealizingActivityEdge();
>+			.getDurationObservation_FirstEvent();
> 
> 		/**
>-		 * The meta object literal for the 'Realizing Connector' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.FinalStateImpl Final State}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.FinalStateImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getFinalState()
> 		 * @generated
> 		 */
>-		EReference INFORMATION_FLOW__REALIZING_CONNECTOR = eINSTANCE
>-			.getInformationFlow_RealizingConnector();
>+		EClass FINAL_STATE = eINSTANCE.getFinalState();
> 
> 		/**
>-		 * The meta object literal for the 'Realizing Message' reference list feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TimeEventImpl Time Event}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.TimeEventImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTimeEvent()
> 		 * @generated
> 		 */
>-		EReference INFORMATION_FLOW__REALIZING_MESSAGE = eINSTANCE
>-			.getInformationFlow_RealizingMessage();
>+		EClass TIME_EVENT = eINSTANCE.getTimeEvent();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ModelImpl Model}' class.
>+		 * The meta object literal for the 'Is Relative' attribute feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ModelImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getModel()
> 		 * @generated
> 		 */
>-		EClass MODEL = eINSTANCE.getModel();
>+		EAttribute TIME_EVENT__IS_RELATIVE = eINSTANCE
>+			.getTimeEvent_IsRelative();
> 
> 		/**
>-		 * The meta object literal for the 'Viewpoint' attribute feature.
>+		 * The meta object literal for the 'When' containment reference feature.
> 		 * 
> 		 * 
> 		 * @generated
> 		 */
>-		EAttribute MODEL__VIEWPOINT = eINSTANCE.getModel_Viewpoint();
>+		EReference TIME_EVENT__WHEN = eINSTANCE.getTimeEvent_When();
> 
> 		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.VariableActionImpl Variable Action}' class.
>@@ -74208,6 +74818,98 @@
> 			.getActionInputPin_FromAction();
> 
> 		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InformationItemImpl Information Item}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.InformationItemImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInformationItem()
>+		 * @generated
>+		 */
>+		EClass INFORMATION_ITEM = eINSTANCE.getInformationItem();
>+
>+		/**
>+		 * The meta object literal for the 'Represented' reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INFORMATION_ITEM__REPRESENTED = eINSTANCE
>+			.getInformationItem_Represented();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InformationFlowImpl Information Flow}' class.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.InformationFlowImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInformationFlow()
>+		 * @generated
>+		 */
>+		EClass INFORMATION_FLOW = eINSTANCE.getInformationFlow();
>+
>+		/**
>+		 * The meta object literal for the 'Realization' reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INFORMATION_FLOW__REALIZATION = eINSTANCE
>+			.getInformationFlow_Realization();
>+
>+		/**
>+		 * The meta object literal for the 'Conveyed' reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INFORMATION_FLOW__CONVEYED = eINSTANCE
>+			.getInformationFlow_Conveyed();
>+
>+		/**
>+		 * The meta object literal for the 'Information Source' reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INFORMATION_FLOW__INFORMATION_SOURCE = eINSTANCE
>+			.getInformationFlow_InformationSource();
>+
>+		/**
>+		 * The meta object literal for the 'Information Target' reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INFORMATION_FLOW__INFORMATION_TARGET = eINSTANCE
>+			.getInformationFlow_InformationTarget();
>+
>+		/**
>+		 * The meta object literal for the 'Realizing Activity Edge' reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INFORMATION_FLOW__REALIZING_ACTIVITY_EDGE = eINSTANCE
>+			.getInformationFlow_RealizingActivityEdge();
>+
>+		/**
>+		 * The meta object literal for the 'Realizing Connector' reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INFORMATION_FLOW__REALIZING_CONNECTOR = eINSTANCE
>+			.getInformationFlow_RealizingConnector();
>+
>+		/**
>+		 * The meta object literal for the 'Realizing Message' reference list feature.
>+		 * 
>+		 * 
>+		 * @generated
>+		 */
>+		EReference INFORMATION_FLOW__REALIZING_MESSAGE = eINSTANCE
>+			.getInformationFlow_RealizingMessage();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ReadExtentActionImpl Read Extent Action}' class.
> 		 * 
> 		 * 
>@@ -74619,132 +75321,24 @@
> 			.getReduceAction_IsOrdered();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ControlNodeImpl Control Node}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ControlNodeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getControlNode()
>-		 * @generated
>-		 */
>-		EClass CONTROL_NODE = eINSTANCE.getControlNode();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ControlFlowImpl Control Flow}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ControlFlowImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getControlFlow()
>-		 * @generated
>-		 */
>-		EClass CONTROL_FLOW = eINSTANCE.getControlFlow();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.InitialNodeImpl Initial Node}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.InitialNodeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getInitialNode()
>-		 * @generated
>-		 */
>-		EClass INITIAL_NODE = eINSTANCE.getInitialNode();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActivityParameterNodeImpl Activity Parameter Node}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ActivityParameterNodeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActivityParameterNode()
>-		 * @generated
>-		 */
>-		EClass ACTIVITY_PARAMETER_NODE = eINSTANCE.getActivityParameterNode();
>-
>-		/**
>-		 * The meta object literal for the 'Parameter' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference ACTIVITY_PARAMETER_NODE__PARAMETER = eINSTANCE
>-			.getActivityParameterNode_Parameter();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ForkNodeImpl Fork Node}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ForkNodeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getForkNode()
>-		 * @generated
>-		 */
>-		EClass FORK_NODE = eINSTANCE.getForkNode();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.FlowFinalNodeImpl Flow Final Node}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.FlowFinalNodeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getFlowFinalNode()
>-		 * @generated
>-		 */
>-		EClass FLOW_FINAL_NODE = eINSTANCE.getFlowFinalNode();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.FinalNodeImpl Final Node}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.FinalNodeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getFinalNode()
>-		 * @generated
>-		 */
>-		EClass FINAL_NODE = eINSTANCE.getFinalNode();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CentralBufferNodeImpl Central Buffer Node}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.CentralBufferNodeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCentralBufferNode()
>-		 * @generated
>-		 */
>-		EClass CENTRAL_BUFFER_NODE = eINSTANCE.getCentralBufferNode();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.MergeNodeImpl Merge Node}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.MergeNodeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getMergeNode()
>-		 * @generated
>-		 */
>-		EClass MERGE_NODE = eINSTANCE.getMergeNode();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.DecisionNodeImpl Decision Node}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.DecisionNodeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDecisionNode()
>-		 * @generated
>-		 */
>-		EClass DECISION_NODE = eINSTANCE.getDecisionNode();
>-
>-		/**
>-		 * The meta object literal for the 'Decision Input' reference feature.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.StartObjectBehaviorActionImpl Start Object Behavior Action}' class.
> 		 * 
> 		 * 
>+		 * @see org.eclipse.uml2.uml.internal.impl.StartObjectBehaviorActionImpl
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getStartObjectBehaviorAction()
> 		 * @generated
> 		 */
>-		EReference DECISION_NODE__DECISION_INPUT = eINSTANCE
>-			.getDecisionNode_DecisionInput();
>+		EClass START_OBJECT_BEHAVIOR_ACTION = eINSTANCE
>+			.getStartObjectBehaviorAction();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ActivityFinalNodeImpl Activity Final Node}' class.
>+		 * The meta object literal for the 'Object' containment reference feature.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ActivityFinalNodeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getActivityFinalNode()
> 		 * @generated
> 		 */
>-		EClass ACTIVITY_FINAL_NODE = eINSTANCE.getActivityFinalNode();
>+		EReference START_OBJECT_BEHAVIOR_ACTION__OBJECT = eINSTANCE
>+			.getStartObjectBehaviorAction_Object();
> 
> 		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.JoinNodeImpl Join Node}' class.
>@@ -74784,70 +75378,6 @@
> 		EClass DATA_STORE_NODE = eINSTANCE.getDataStoreNode();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ObjectFlowImpl Object Flow}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ObjectFlowImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getObjectFlow()
>-		 * @generated
>-		 */
>-		EClass OBJECT_FLOW = eINSTANCE.getObjectFlow();
>-
>-		/**
>-		 * The meta object literal for the 'Is Multicast' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute OBJECT_FLOW__IS_MULTICAST = eINSTANCE
>-			.getObjectFlow_IsMulticast();
>-
>-		/**
>-		 * The meta object literal for the 'Is Multireceive' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute OBJECT_FLOW__IS_MULTIRECEIVE = eINSTANCE
>-			.getObjectFlow_IsMultireceive();
>-
>-		/**
>-		 * The meta object literal for the 'Transformation' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference OBJECT_FLOW__TRANSFORMATION = eINSTANCE
>-			.getObjectFlow_Transformation();
>-
>-		/**
>-		 * The meta object literal for the 'Selection' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference OBJECT_FLOW__SELECTION = eINSTANCE.getObjectFlow_Selection();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.SequenceNodeImpl Sequence Node}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.SequenceNodeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getSequenceNode()
>-		 * @generated
>-		 */
>-		EClass SEQUENCE_NODE = eINSTANCE.getSequenceNode();
>-
>-		/**
>-		 * The meta object literal for the 'Executable Node' containment reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference SEQUENCE_NODE__EXECUTABLE_NODE = eINSTANCE
>-			.getSequenceNode_ExecutableNode();
>-
>-		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ConditionalNodeImpl Conditional Node}' class.
> 		 * 
> 		 * 
>@@ -75103,172 +75633,6 @@
> 			.getExpansionRegion_OutputElement();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ComponentRealizationImpl Component Realization}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ComponentRealizationImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getComponentRealization()
>-		 * @generated
>-		 */
>-		EClass COMPONENT_REALIZATION = eINSTANCE.getComponentRealization();
>-
>-		/**
>-		 * The meta object literal for the 'Abstraction' container reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference COMPONENT_REALIZATION__ABSTRACTION = eINSTANCE
>-			.getComponentRealization_Abstraction();
>-
>-		/**
>-		 * The meta object literal for the 'Realizing Classifier' reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference COMPONENT_REALIZATION__REALIZING_CLASSIFIER = eINSTANCE
>-			.getComponentRealization_RealizingClassifier();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ComponentImpl Component}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ComponentImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getComponent()
>-		 * @generated
>-		 */
>-		EClass COMPONENT = eINSTANCE.getComponent();
>-
>-		/**
>-		 * The meta object literal for the 'Is Indirectly Instantiated' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute COMPONENT__IS_INDIRECTLY_INSTANTIATED = eINSTANCE
>-			.getComponent_IsIndirectlyInstantiated();
>-
>-		/**
>-		 * The meta object literal for the 'Required' reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference COMPONENT__REQUIRED = eINSTANCE.getComponent_Required();
>-
>-		/**
>-		 * The meta object literal for the 'Provided' reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference COMPONENT__PROVIDED = eINSTANCE.getComponent_Provided();
>-
>-		/**
>-		 * The meta object literal for the 'Packaged Element' containment reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference COMPONENT__PACKAGED_ELEMENT = eINSTANCE
>-			.getComponent_PackagedElement();
>-
>-		/**
>-		 * The meta object literal for the 'Realization' containment reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference COMPONENT__REALIZATION = eINSTANCE
>-			.getComponent_Realization();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.NodeImpl Node}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.NodeImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getNode()
>-		 * @generated
>-		 */
>-		EClass NODE = eINSTANCE.getNode();
>-
>-		/**
>-		 * The meta object literal for the 'Nested Node' containment reference list feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference NODE__NESTED_NODE = eINSTANCE.getNode_NestedNode();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.DeviceImpl Device}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.DeviceImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getDevice()
>-		 * @generated
>-		 */
>-		EClass DEVICE = eINSTANCE.getDevice();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ExecutionEnvironmentImpl Execution Environment}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.ExecutionEnvironmentImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getExecutionEnvironment()
>-		 * @generated
>-		 */
>-		EClass EXECUTION_ENVIRONMENT = eINSTANCE.getExecutionEnvironment();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.CommunicationPathImpl Communication Path}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.CommunicationPathImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCommunicationPath()
>-		 * @generated
>-		 */
>-		EClass COMMUNICATION_PATH = eINSTANCE.getCommunicationPath();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.FinalStateImpl Final State}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.FinalStateImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getFinalState()
>-		 * @generated
>-		 */
>-		EClass FINAL_STATE = eINSTANCE.getFinalState();
>-
>-		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.TimeEventImpl Time Event}' class.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.internal.impl.TimeEventImpl
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getTimeEvent()
>-		 * @generated
>-		 */
>-		EClass TIME_EVENT = eINSTANCE.getTimeEvent();
>-
>-		/**
>-		 * The meta object literal for the 'Is Relative' attribute feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EAttribute TIME_EVENT__IS_RELATIVE = eINSTANCE
>-			.getTimeEvent_IsRelative();
>-
>-		/**
>-		 * The meta object literal for the 'When' containment reference feature.
>-		 * 
>-		 * 
>-		 * @generated
>-		 */
>-		EReference TIME_EVENT__WHEN = eINSTANCE.getTimeEvent_When();
>-
>-		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.internal.impl.ProtocolTransitionImpl Protocol Transition}' class.
> 		 * 
> 		 * 
>@@ -75326,16 +75690,6 @@
> 		EEnum VISIBILITY_KIND = eINSTANCE.getVisibilityKind();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.CallConcurrencyKind Call Concurrency Kind}' enum.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.CallConcurrencyKind
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCallConcurrencyKind()
>-		 * @generated
>-		 */
>-		EEnum CALL_CONCURRENCY_KIND = eINSTANCE.getCallConcurrencyKind();
>-
>-		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.TransitionKind Transition Kind}' enum.
> 		 * 
> 		 * 
>@@ -75356,6 +75710,26 @@
> 		EEnum PSEUDOSTATE_KIND = eINSTANCE.getPseudostateKind();
> 
> 		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.ConnectorKind Connector Kind}' enum.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.ConnectorKind
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConnectorKind()
>+		 * @generated
>+		 */
>+		EEnum CONNECTOR_KIND = eINSTANCE.getConnectorKind();
>+
>+		/**
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.CallConcurrencyKind Call Concurrency Kind}' enum.
>+		 * 
>+		 * 
>+		 * @see org.eclipse.uml2.uml.CallConcurrencyKind
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getCallConcurrencyKind()
>+		 * @generated
>+		 */
>+		EEnum CALL_CONCURRENCY_KIND = eINSTANCE.getCallConcurrencyKind();
>+
>+		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.AggregationKind Aggregation Kind}' enum.
> 		 * 
> 		 * 
>@@ -75386,14 +75760,14 @@
> 		EEnum PARAMETER_EFFECT_KIND = eINSTANCE.getParameterEffectKind();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.ConnectorKind Connector Kind}' enum.
>+		 * The meta object literal for the '{@link org.eclipse.uml2.uml.ObjectNodeOrderingKind Object Node Ordering Kind}' enum.
> 		 * 
> 		 * 
>-		 * @see org.eclipse.uml2.uml.ConnectorKind
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getConnectorKind()
>+		 * @see org.eclipse.uml2.uml.ObjectNodeOrderingKind
>+		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getObjectNodeOrderingKind()
> 		 * @generated
> 		 */
>-		EEnum CONNECTOR_KIND = eINSTANCE.getConnectorKind();
>+		EEnum OBJECT_NODE_ORDERING_KIND = eINSTANCE.getObjectNodeOrderingKind();
> 
> 		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.MessageKind Message Kind}' enum.
>@@ -75416,16 +75790,6 @@
> 		EEnum MESSAGE_SORT = eINSTANCE.getMessageSort();
> 
> 		/**
>-		 * The meta object literal for the '{@link org.eclipse.uml2.uml.ObjectNodeOrderingKind Object Node Ordering Kind}' enum.
>-		 * 
>-		 * 
>-		 * @see org.eclipse.uml2.uml.ObjectNodeOrderingKind
>-		 * @see org.eclipse.uml2.uml.internal.impl.UMLPackageImpl#getObjectNodeOrderingKind()
>-		 * @generated
>-		 */
>-		EEnum OBJECT_NODE_ORDERING_KIND = eINSTANCE.getObjectNodeOrderingKind();
>-
>-		/**
> 		 * The meta object literal for the '{@link org.eclipse.uml2.uml.InteractionOperatorKind Interaction Operator Kind}' enum.
> 		 * 
> 		 * 
>Index: src/org/eclipse/uml2/uml/WriteStructuralFeatureAction.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/WriteStructuralFeatureAction.java,v
>retrieving revision 1.8
>diff -u -r1.8 WriteStructuralFeatureAction.java
>--- src/org/eclipse/uml2/uml/WriteStructuralFeatureAction.java	23 Oct 2007 15:54:22 -0000	1.8
>+++ src/org/eclipse/uml2/uml/WriteStructuralFeatureAction.java	24 Sep 2008 18:40:10 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -31,6 +31,7 @@
> * The following features are supported:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#getValue Value}</li>
>+ * <li>{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#getResult Result}</li>
> * </ul>
> * 
> *
>@@ -98,6 +99,49 @@
> 	InputPin createValue(String name, Type type);
> 
> 	/**
>+	 * Returns the value of the 'Result' containment reference.
>+	 * 
>+	 * This feature subsets the following features:
>+	 * <ul>
>+	 * <li>'{@link org.eclipse.uml2.uml.Action#getOutputs() Output}'</li>
>+	 * </ul>
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Gives the output pin on which the result is put.
>+	 * 
>+	 * @return the value of the 'Result' containment reference.
>+	 * @see #setResult(OutputPin)
>+	 * @see org.eclipse.uml2.uml.UMLPackage#getWriteStructuralFeatureAction_Result()
>+	 * @model containment="true" resolveProxies="true" ordered="false"
>+	 * @generated
>+	 */
>+	OutputPin getResult();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#getResult Result}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Result' containment reference.
>+	 * @see #getResult()
>+	 * @generated
>+	 */
>+	void setResult(OutputPin value);
>+
>+	/**
>+	 * Creates a new {@link org.eclipse.uml2.uml.OutputPin},with the specified 'Name', and 'Type', and sets the 'Result' containment reference.
>+	 * 
>+	 * 
>+	 * @param name The 'Name' for the new {@link org.eclipse.uml2.uml.OutputPin}, or <code>null</code>.
>+	 * @param type The 'Type' for the new {@link org.eclipse.uml2.uml.OutputPin}, or <code>null</code>.
>+	 * @return The new {@link org.eclipse.uml2.uml.OutputPin}.
>+	 * @see #getResult()
>+	 * @generated
>+	 */
>+	OutputPin createResult(String name, Type type);
>+
>+	/**
> 	 * 
> 	 * 
> 	 * 
>@@ -112,4 +156,34 @@
> 	boolean validateInputPin(DiagnosticChain diagnostics,
> 			Map<Object, Object> context);
> 
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The type of the result output pin is the same as the type of the inherited object input pin.
>+	 * result->notEmpty() implies self.result.type = self.object.type
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateTypeOfResult(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The multiplicity of the result output pin must be 1..1.
>+	 * result->notEmpty() implies self.result.multiplicity.is(1,1)
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateMultiplicityOfResult(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
>+
> } // WriteStructuralFeatureAction
>Index: src/org/eclipse/uml2/uml/Behavior.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Behavior.java,v
>retrieving revision 1.22
>diff -u -r1.22 Behavior.java
>--- src/org/eclipse/uml2/uml/Behavior.java	23 Oct 2007 15:54:22 -0000	1.22
>+++ src/org/eclipse/uml2/uml/Behavior.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -406,7 +406,7 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * Designates a behavioral feature that the behavior implements. The behavioral feature must be owned by the classifier that owns the behavior or be inherited by it. The parameters of the behavioral feature and the implementing behavior must match. If a behavior does not have a specification, it is directly associated with a classifier (i.e., it is the behavior of the classifier as a whole).
>+	 * Designates a behavioral feature that the behavior implements. The behavioral feature must be owned by the classifier that owns the behavior or be inherited by it. The parameters of the behavioral feature and the implementing behavior must match. A behavior does not need to have a specification, in which case it either is the classifer behavior of a BehavioredClassifier or it can only be invoked by another behavior of the classifier.
> 	 * 
> 	 * @return the value of the 'Specification' reference.
> 	 * @see #setSpecification(BehavioralFeature)
>Index: src/org/eclipse/uml2/uml/ConnectorEnd.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ConnectorEnd.java,v
>retrieving revision 1.5
>diff -u -r1.5 ConnectorEnd.java
>--- src/org/eclipse/uml2/uml/ConnectorEnd.java	4 May 2007 20:35:32 -0000	1.5
>+++ src/org/eclipse/uml2/uml/ConnectorEnd.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -29,8 +29,8 @@
> * The following features are supported:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.ConnectorEnd#getDefiningEnd Defining End}</li>
>- * <li>{@link org.eclipse.uml2.uml.ConnectorEnd#getPartWithPort Part With Port}</li>
> * <li>{@link org.eclipse.uml2.uml.ConnectorEnd#getRole Role}</li>
>+ * <li>{@link org.eclipse.uml2.uml.ConnectorEnd#getPartWithPort Part With Port}</li>
> * </ul>
> * 
> *
>Index: src/org/eclipse/uml2/uml/TemplateParameterSubstitution.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/TemplateParameterSubstitution.java,v
>retrieving revision 1.13
>diff -u -r1.13 TemplateParameterSubstitution.java
>--- src/org/eclipse/uml2/uml/TemplateParameterSubstitution.java	23 Oct 2007 15:54:22 -0000	1.13
>+++ src/org/eclipse/uml2/uml/TemplateParameterSubstitution.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -16,8 +16,6 @@
> 
> import org.eclipse.emf.common.util.DiagnosticChain;
> 
>-import org.eclipse.emf.common.util.EList;
>-
> import org.eclipse.emf.ecore.EClass;
> 
> /**
>@@ -26,15 +24,15 @@
> * 
> *
> * 
>- * A template parameter substitution relates the actual parameter(s) to a formal template parameter as part of a template binding.
>+ * A template parameter substitution relates the actual parameter to a formal template parameter as part of a template binding.
> * 
> *
> * 
> * The following features are supported:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getFormal Formal}</li>
>- * <li>{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getActuals Actual}</li>
>- * <li>{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getOwnedActuals Owned Actual}</li>
>+ * <li>{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getActual Actual}</li>
>+ * <li>{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getOwnedActual Owned Actual}</li>
> * <li>{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getTemplateBinding Template Binding}</li>
> * </ul>
> * 
>@@ -72,49 +70,69 @@
> 	void setFormal(TemplateParameter value);
> 
> 	/**
>-	 * Returns the value of the 'Actual' reference list.
>-	 * The list contents are of type {@link org.eclipse.uml2.uml.ParameterableElement}.
>+	 * Returns the value of the 'Actual' reference.
> 	 * 
> 	 * 
> 	 * 
>-	 * The elements that are the actual parameters for this substitution.
>+	 * The element that is the actual parameter for this substitution.
> 	 * 
>-	 * @return the value of the 'Actual' reference list.
>+	 * @return the value of the 'Actual' reference.
>+	 * @see #setActual(ParameterableElement)
> 	 * @see org.eclipse.uml2.uml.UMLPackage#getTemplateParameterSubstitution_Actual()
> 	 * @model required="true" ordered="false"
> 	 * @generated
> 	 */
>-	EList<ParameterableElement> getActuals();
>+	ParameterableElement getActual();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getActual Actual}' reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Actual' reference.
>+	 * @see #getActual()
>+	 * @generated
>+	 */
>+	void setActual(ParameterableElement value);
> 
> 	/**
>-	 * Returns the value of the 'Owned Actual' containment reference list.
>-	 * The list contents are of type {@link org.eclipse.uml2.uml.ParameterableElement}.
>+	 * Returns the value of the 'Owned Actual' containment reference.
> 	 * 
> 	 * This feature subsets the following features:
> 	 * <ul>
>-	 * <li>'{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getActuals() Actual}'</li>
>+	 * <li>'{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getActual() Actual}'</li>
> 	 * <li>'{@link org.eclipse.uml2.uml.Element#getOwnedElements() Owned Element}'</li>
> 	 * </ul>
> 	 * 
> 	 * 
> 	 * 
> 	 * 
>-	 * The actual parameters that are owned by this substitution.
>+	 * The actual parameter that is owned by this substitution.
> 	 * 
>-	 * @return the value of the 'Owned Actual' containment reference list.
>+	 * @return the value of the 'Owned Actual' containment reference.
>+	 * @see #setOwnedActual(ParameterableElement)
> 	 * @see org.eclipse.uml2.uml.UMLPackage#getTemplateParameterSubstitution_OwnedActual()
> 	 * @model containment="true" resolveProxies="true" ordered="false"
> 	 * @generated
> 	 */
>-	EList<ParameterableElement> getOwnedActuals();
>+	ParameterableElement getOwnedActual();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.uml2.uml.TemplateParameterSubstitution#getOwnedActual Owned Actual}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Owned Actual' containment reference.
>+	 * @see #getOwnedActual()
>+	 * @generated
>+	 */
>+	void setOwnedActual(ParameterableElement value);
> 
> 	/**
>-	 * Creates a new {@link org.eclipse.uml2.uml.ParameterableElement} and appends it to the 'Owned Actual' containment reference list.
>+	 * Creates a new {@link org.eclipse.uml2.uml.ParameterableElement} and sets the 'Owned Actual' containment reference.
> 	 * 
> 	 * 
> 	 * @param eClass The Ecore class of the {@link org.eclipse.uml2.uml.ParameterableElement} to create.
> 	 * @return The new {@link org.eclipse.uml2.uml.ParameterableElement}.
>-	 * @see #getOwnedActuals()
>+	 * @see #getOwnedActual()
> 	 * @generated
> 	 */
> 	ParameterableElement createOwnedActual(EClass eClass);
>Index: src/org/eclipse/uml2/uml/TimeEvent.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/TimeEvent.java,v
>retrieving revision 1.12
>diff -u -r1.12 TimeEvent.java
>--- src/org/eclipse/uml2/uml/TimeEvent.java	23 Oct 2007 15:54:21 -0000	1.12
>+++ src/org/eclipse/uml2/uml/TimeEvent.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -16,8 +16,6 @@
> 
> import org.eclipse.emf.common.util.DiagnosticChain;
> 
>-import org.eclipse.emf.ecore.EClass;
>-
> /**
> * 
> * A representation of the model object 'Time Event'.
>@@ -83,12 +81,12 @@
> 	 * Specifies the corresponding time deadline.
> 	 * 
> 	 * @return the value of the 'When' containment reference.
>-	 * @see #setWhen(ValueSpecification)
>+	 * @see #setWhen(TimeExpression)
> 	 * @see org.eclipse.uml2.uml.UMLPackage#getTimeEvent_When()
> 	 * @model containment="true" resolveProxies="true" required="true" ordered="false"
> 	 * @generated
> 	 */
>-	ValueSpecification getWhen();
>+	TimeExpression getWhen();
> 
> 	/**
> 	 * Sets the value of the '{@link org.eclipse.uml2.uml.TimeEvent#getWhen When}' containment reference.
>@@ -98,20 +96,19 @@
> 	 * @see #getWhen()
> 	 * @generated
> 	 */
>-	void setWhen(ValueSpecification value);
>+	void setWhen(TimeExpression value);
> 
> 	/**
>-	 * Creates a new {@link org.eclipse.uml2.uml.ValueSpecification}, with the specified 'Name', and 'Type', and sets the 'When' containment reference.
>+	 * Creates a new {@link org.eclipse.uml2.uml.TimeExpression},with the specified 'Name', and 'Type', and sets the 'When' containment reference.
> 	 * 
> 	 * 
>-	 * @param name The 'Name' for the new {@link org.eclipse.uml2.uml.ValueSpecification}, or <code>null</code>.
>-	 * @param type The 'Type' for the new {@link org.eclipse.uml2.uml.ValueSpecification}, or <code>null</code>.
>-	 * @param eClass The Ecore class of the {@link org.eclipse.uml2.uml.ValueSpecification} to create.
>-	 * @return The new {@link org.eclipse.uml2.uml.ValueSpecification}.
>+	 * @param name The 'Name' for the new {@link org.eclipse.uml2.uml.TimeExpression}, or <code>null</code>.
>+	 * @param type The 'Type' for the new {@link org.eclipse.uml2.uml.TimeExpression}, or <code>null</code>.
>+	 * @return The new {@link org.eclipse.uml2.uml.TimeExpression}.
> 	 * @see #getWhen()
> 	 * @generated
> 	 */
>-	ValueSpecification createWhen(String name, Type type, EClass eClass);
>+	TimeExpression createWhen(String name, Type type);
> 
> 	/**
> 	 * 
>Index: src/org/eclipse/uml2/uml/ActivityEdge.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityEdge.java,v
>retrieving revision 1.19
>diff -u -r1.19 ActivityEdge.java
>--- src/org/eclipse/uml2/uml/ActivityEdge.java	9 Jan 2008 18:56:02 -0000	1.19
>+++ src/org/eclipse/uml2/uml/ActivityEdge.java	24 Sep 2008 18:40:07 -0000
>@@ -311,7 +311,7 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * Number of tokens consumed from the source node on each traversal.
>+	 * The minimum number of tokens that must traverse the edge at the same time.
> 	 * 
> 	 * @return the value of the 'Weight' containment reference.
> 	 * @see #setWeight(ValueSpecification)
>Index: src/org/eclipse/uml2/uml/ComponentRealization.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ComponentRealization.java,v
>retrieving revision 1.6
>diff -u -r1.6 ComponentRealization.java
>--- src/org/eclipse/uml2/uml/ComponentRealization.java	23 Oct 2007 15:54:21 -0000	1.6
>+++ src/org/eclipse/uml2/uml/ComponentRealization.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -12,6 +12,9 @@
> */
> package org.eclipse.uml2.uml;
> 
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
>+
> /**
> * 
> * A representation of the model object 'Component Realization'.
>@@ -25,7 +28,7 @@
> * The following features are supported:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.ComponentRealization#getAbstraction Abstraction}</li>
>- * <li>{@link org.eclipse.uml2.uml.ComponentRealization#getRealizingClassifier Realizing Classifier}</li>
>+ * <li>{@link org.eclipse.uml2.uml.ComponentRealization#getRealizingClassifiers Realizing Classifier}</li>
> * </ul>
> * 
> *
>@@ -71,7 +74,8 @@
> 	void setAbstraction(Component value);
> 
> 	/**
>-	 * Returns the value of the 'Realizing Classifier' reference.
>+	 * Returns the value of the 'Realizing Classifier' reference list.
>+	 * The list contents are of type {@link org.eclipse.uml2.uml.Classifier}.
> 	 * 
> 	 * This feature subsets the following features:
> 	 * <ul>
>@@ -81,24 +85,38 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * A classifier that is involved in the implementation of the Component that owns this ComponentRealization.
>+	 * The classifiers that are involved in the implementation of the Component that owns this Realization.
> 	 * 
>-	 * @return the value of the 'Realizing Classifier' reference.
>-	 * @see #setRealizingClassifier(Classifier)
>+	 * @return the value of the 'Realizing Classifier' reference list.
> 	 * @see org.eclipse.uml2.uml.UMLPackage#getComponentRealization_RealizingClassifier()
> 	 * @model required="true" ordered="false"
> 	 * @generated
> 	 */
>-	Classifier getRealizingClassifier();
>+	EList<Classifier> getRealizingClassifiers();
>+
>+	/**
>+	 * Retrieves the first {@link org.eclipse.uml2.uml.Classifier} with the specified 'Name' from the 'Realizing Classifier' reference list.
>+	 * 
>+	 * 
>+	 * @param name The 'Name' of the {@link org.eclipse.uml2.uml.Classifier} to retrieve, or <code>null</code>.
>+	 * @return The first {@link org.eclipse.uml2.uml.Classifier} with the specified 'Name', or <code>null</code>.
>+	 * @see #getRealizingClassifiers()
>+	 * @generated
>+	 */
>+	Classifier getRealizingClassifier(String name);
> 
> 	/**
>-	 * Sets the value of the '{@link org.eclipse.uml2.uml.ComponentRealization#getRealizingClassifier Realizing Classifier}' reference.
>+	 * Retrieves the first {@link org.eclipse.uml2.uml.Classifier} with the specified 'Name' from the 'Realizing Classifier' reference list.
> 	 * 
> 	 * 
>-	 * @param value the new value of the 'Realizing Classifier' reference.
>-	 * @see #getRealizingClassifier()
>+	 * @param name The 'Name' of the {@link org.eclipse.uml2.uml.Classifier} to retrieve, or <code>null</code>.
>+	 * @param ignoreCase Whether to ignore case in {@link java.lang.String} comparisons.
>+	 * @param eClass The Ecore class of the {@link org.eclipse.uml2.uml.Classifier} to retrieve, or <code>null</code>.
>+	 * @return The first {@link org.eclipse.uml2.uml.Classifier} with the specified 'Name', or <code>null</code>.
>+	 * @see #getRealizingClassifiers()
> 	 * @generated
> 	 */
>-	void setRealizingClassifier(Classifier value);
>+	Classifier getRealizingClassifier(String name, boolean ignoreCase,
>+			EClass eClass);
> 
> } // ComponentRealization
>Index: src/org/eclipse/uml2/uml/ClearStructuralFeatureAction.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ClearStructuralFeatureAction.java,v
>retrieving revision 1.3
>diff -u -r1.3 ClearStructuralFeatureAction.java
>--- src/org/eclipse/uml2/uml/ClearStructuralFeatureAction.java	14 Feb 2007 19:57:26 -0000	1.3
>+++ src/org/eclipse/uml2/uml/ClearStructuralFeatureAction.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -12,6 +12,9 @@
> */
> package org.eclipse.uml2.uml;
> 
>+import java.util.Map;
>+import org.eclipse.emf.common.util.DiagnosticChain;
>+
> /**
> * 
> * A representation of the model object 'Clear Structural Feature Action'.
>@@ -21,6 +24,12 @@
> * A clear structural feature action is a structural feature action that removes all values of a structural feature.
> * 
> *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.uml2.uml.ClearStructuralFeatureAction#getResult Result}</li>
>+ * </ul>
>+ * 
> *
> * @see org.eclipse.uml2.uml.UMLPackage#getClearStructuralFeatureAction()
> * @model
>@@ -29,6 +38,77 @@
> public interface ClearStructuralFeatureAction
> 		extends StructuralFeatureAction {
> 
>-	// no methods
>+	/**
>+	 * Returns the value of the 'Result' containment reference.
>+	 * 
>+	 * This feature subsets the following features:
>+	 * <ul>
>+	 * <li>'{@link org.eclipse.uml2.uml.Action#getOutputs() Output}'</li>
>+	 * </ul>
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Gives the output pin on which the result is put.
>+	 * 
>+	 * @return the value of the 'Result' containment reference.
>+	 * @see #setResult(OutputPin)
>+	 * @see org.eclipse.uml2.uml.UMLPackage#getClearStructuralFeatureAction_Result()
>+	 * @model containment="true" resolveProxies="true" ordered="false"
>+	 * @generated
>+	 */
>+	OutputPin getResult();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.uml2.uml.ClearStructuralFeatureAction#getResult Result}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Result' containment reference.
>+	 * @see #getResult()
>+	 * @generated
>+	 */
>+	void setResult(OutputPin value);
>+
>+	/**
>+	 * Creates a new {@link org.eclipse.uml2.uml.OutputPin},with the specified 'Name', and 'Type', and sets the 'Result' containment reference.
>+	 * 
>+	 * 
>+	 * @param name The 'Name' for the new {@link org.eclipse.uml2.uml.OutputPin}, or <code>null</code>.
>+	 * @param type The 'Type' for the new {@link org.eclipse.uml2.uml.OutputPin}, or <code>null</code>.
>+	 * @return The new {@link org.eclipse.uml2.uml.OutputPin}.
>+	 * @see #getResult()
>+	 * @generated
>+	 */
>+	OutputPin createResult(String name, Type type);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The type of the result output pin is the same as the type of the inherited object input pin.
>+	 * result->notEmpty() implies self.result.type = self.object.type
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateTypeOfResult(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The multiplicity of the result output pin must be 1..1.
>+	 * result->notEmpty() implies self.result.multiplicity.is(1,1)
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateMultiplicityOfResult(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
> 
> } // ClearStructuralFeatureAction
>Index: src/org/eclipse/uml2/uml/ClassifierTemplateParameter.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ClassifierTemplateParameter.java,v
>retrieving revision 1.7
>diff -u -r1.7 ClassifierTemplateParameter.java
>--- src/org/eclipse/uml2/uml/ClassifierTemplateParameter.java	25 Apr 2007 17:47:04 -0000	1.7
>+++ src/org/eclipse/uml2/uml/ClassifierTemplateParameter.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -15,6 +15,8 @@
> import java.util.Map;
> 
> import org.eclipse.emf.common.util.DiagnosticChain;
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
> 
> /**
> * 
>@@ -29,8 +31,7 @@
> * The following features are supported:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.ClassifierTemplateParameter#isAllowSubstitutable Allow Substitutable}</li>
>- * <li>{@link org.eclipse.uml2.uml.ClassifierTemplateParameter#getDefaultClassifier Default Classifier}</li>
>- * <li>{@link org.eclipse.uml2.uml.ClassifierTemplateParameter#getConstrainingClassifier Constraining Classifier}</li>
>+ * <li>{@link org.eclipse.uml2.uml.ClassifierTemplateParameter#getConstrainingClassifiers Constraining Classifier}</li>
> * </ul>
> * 
> *
>@@ -68,54 +69,44 @@
> 	void setAllowSubstitutable(boolean value);
> 
> 	/**
>-	 * Returns the value of the 'Default Classifier' reference.
>+	 * Returns the value of the 'Constraining Classifier' reference list.
>+	 * The list contents are of type {@link org.eclipse.uml2.uml.Classifier}.
> 	 * 
> 	 * 
> 	 * 
>-	 * The classifier that is used by default if no argument is provided during template binding. If this property is empty, then there is no default.
>+	 * The classifiers that constrain the argument that can be used for the parameter. If the allowSubstitutable attribute is true, then any classifier that is compatible with this constraining classifier can be substituted; otherwise, it must be either this classifier or one of its subclasses. If this property is empty, there are no constraints on the classifier that can be used as an argument.
> 	 * 
>-	 * @return the value of the 'Default Classifier' reference.
>-	 * @see #setDefaultClassifier(Classifier)
>-	 * @see org.eclipse.uml2.uml.UMLPackage#getClassifierTemplateParameter_DefaultClassifier()
>+	 * @return the value of the 'Constraining Classifier' reference list.
>+	 * @see org.eclipse.uml2.uml.UMLPackage#getClassifierTemplateParameter_ConstrainingClassifier()
> 	 * @model ordered="false"
> 	 * @generated
> 	 */
>-	Classifier getDefaultClassifier();
>+	EList<Classifier> getConstrainingClassifiers();
> 
> 	/**
>-	 * Sets the value of the '{@link org.eclipse.uml2.uml.ClassifierTemplateParameter#getDefaultClassifier Default Classifier}' reference.
>+	 * Retrieves the first {@link org.eclipse.uml2.uml.Classifier} with the specified 'Name' from the 'Constraining Classifier' reference list.
> 	 * 
> 	 * 
>-	 * @param value the new value of the 'Default Classifier' reference.
>-	 * @see #getDefaultClassifier()
>-	 * @generated
>-	 */
>-	void setDefaultClassifier(Classifier value);
>-
>-	/**
>-	 * Returns the value of the 'Constraining Classifier' reference.
>-	 * 
>-	 * 
>-	 * 
>-	 * The classifier that constrains the argument that can be used for the parameter. If the allowSubstitutable attribute is true, then any classifier that is compatible with this constraining classifier can be substituted, otherwise it must be either this classifier or one of its subclasses. If this property is empty, there are no constraints on the classifier that can be used as an argument.
>-	 * 
>-	 * @return the value of the 'Constraining Classifier' reference.
>-	 * @see #setConstrainingClassifier(Classifier)
>-	 * @see org.eclipse.uml2.uml.UMLPackage#getClassifierTemplateParameter_ConstrainingClassifier()
>-	 * @model ordered="false"
>+	 * @param name The 'Name' of the {@link org.eclipse.uml2.uml.Classifier} to retrieve, or <code>null</code>.
>+	 * @return The first {@link org.eclipse.uml2.uml.Classifier} with the specified 'Name', or <code>null</code>.
>+	 * @see #getConstrainingClassifiers()
> 	 * @generated
> 	 */
>-	Classifier getConstrainingClassifier();
>+	Classifier getConstrainingClassifier(String name);
> 
> 	/**
>-	 * Sets the value of the '{@link org.eclipse.uml2.uml.ClassifierTemplateParameter#getConstrainingClassifier Constraining Classifier}' reference.
>+	 * Retrieves the first {@link org.eclipse.uml2.uml.Classifier} with the specified 'Name' from the 'Constraining Classifier' reference list.
> 	 * 
> 	 * 
>-	 * @param value the new value of the 'Constraining Classifier' reference.
>-	 * @see #getConstrainingClassifier()
>+	 * @param name The 'Name' of the {@link org.eclipse.uml2.uml.Classifier} to retrieve, or <code>null</code>.
>+	 * @param ignoreCase Whether to ignore case in {@link java.lang.String} comparisons.
>+	 * @param eClass The Ecore class of the {@link org.eclipse.uml2.uml.Classifier} to retrieve, or <code>null</code>.
>+	 * @return The first {@link org.eclipse.uml2.uml.Classifier} with the specified 'Name', or <code>null</code>.
>+	 * @see #getConstrainingClassifiers()
> 	 * @generated
> 	 */
>-	void setConstrainingClassifier(Classifier value);
>+	Classifier getConstrainingClassifier(String name, boolean ignoreCase,
>+			EClass eClass);
> 
> 	/**
> 	 * 
>Index: src/org/eclipse/uml2/uml/ConnectableElement.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ConnectableElement.java,v
>retrieving revision 1.7
>diff -u -r1.7 ConnectableElement.java
>--- src/org/eclipse/uml2/uml/ConnectableElement.java	12 Jun 2007 12:53:17 -0000	1.7
>+++ src/org/eclipse/uml2/uml/ConnectableElement.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -48,7 +48,7 @@
> 	 * 
> 	 * @return the value of the 'End' reference list.
> 	 * @see org.eclipse.uml2.uml.UMLPackage#getConnectableElement_End()
>-	 * @model transient="true" volatile="true" derived="true"
>+	 * @model transient="true" changeable="false" volatile="true" derived="true" ordered="false"
> 	 * @generated
> 	 */
> 	EList<ConnectorEnd> getEnds();
>Index: src/org/eclipse/uml2/uml/DecisionNode.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DecisionNode.java,v
>retrieving revision 1.4
>diff -u -r1.4 DecisionNode.java
>--- src/org/eclipse/uml2/uml/DecisionNode.java	25 Apr 2007 17:47:06 -0000	1.4
>+++ src/org/eclipse/uml2/uml/DecisionNode.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -29,6 +29,7 @@
> * The following features are supported:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.DecisionNode#getDecisionInput Decision Input}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#getDecisionInputFlow Decision Input Flow}</li>
> * </ul>
> * 
> *
>@@ -65,10 +66,35 @@
> 	void setDecisionInput(Behavior value);
> 
> 	/**
>+	 * Returns the value of the 'Decision Input Flow' reference.
> 	 * 
> 	 * 
> 	 * 
>-	 * A decision node has one incoming edge.
>+	 * An additional edge incoming to the decision node that provides a decision input value.
>+	 * 
>+	 * @return the value of the 'Decision Input Flow' reference.
>+	 * @see #setDecisionInputFlow(ObjectFlow)
>+	 * @see org.eclipse.uml2.uml.UMLPackage#getDecisionNode_DecisionInputFlow()
>+	 * @model ordered="false"
>+	 * @generated
>+	 */
>+	ObjectFlow getDecisionInputFlow();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.uml2.uml.DecisionNode#getDecisionInputFlow Decision Input Flow}' reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Decision Input Flow' reference.
>+	 * @see #getDecisionInputFlow()
>+	 * @generated
>+	 */
>+	void setDecisionInputFlow(ObjectFlow value);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * A decision node has one or two incoming edges and at least one outgoing edge.
> 	 * true
> 	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
> 	 * @param context The cache of context-specific information.
>@@ -76,14 +102,14 @@
> 	 * @model
> 	 * @generated
> 	 */
>-	boolean validateOneIncomingEdge(DiagnosticChain diagnostics,
>+	boolean validateIncomingOutgoingEdges(DiagnosticChain diagnostics,
> 			Map<Object, Object> context);
> 
> 	/**
> 	 * 
> 	 * 
> 	 * 
>-	 * A decision input behavior has zero or one input parameter and one output parameter. Any input parameter must be the same as or a supertype of the type of object tokens coming along the incoming edge. The behavior cannot have side effects.
>+	 * The edges coming into and out of a decision node, other than the decision input flow (if any), must be either all object flows or all control flows.
> 	 * true
> 	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
> 	 * @param context The cache of context-specific information.
>@@ -91,14 +117,14 @@
> 	 * @model
> 	 * @generated
> 	 */
>-	boolean validateInputParameter(DiagnosticChain diagnostics,
>+	boolean validateEdges(DiagnosticChain diagnostics,
> 			Map<Object, Object> context);
> 
> 	/**
> 	 * 
> 	 * 
> 	 * 
>-	 * The edges coming into and out of a decision node must be either all object flows or all control flows.
>+	 * The decisionInputFlow of a decision node must be an incoming edge of the decision node.
> 	 * true
> 	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
> 	 * @param context The cache of context-specific information.
>@@ -106,7 +132,82 @@
> 	 * @model
> 	 * @generated
> 	 */
>-	boolean validateEdges(DiagnosticChain diagnostics,
>+	boolean validateDecisionInputFlowIncoming(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * A decision input behavior has no output parameters, no in-out parameters and one return parameter.
>+	 * true
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateParameters(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * If the decision node has no decision input flow and an incoming control flow, then a decision input behavior has zero input parameters.
>+	 * true
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateZeroInputParameters(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * If the decision node has no decision input flow and an incoming object flow, then a decision input behavior has one input parameter whose type is the same as or a supertype of the type of object tokens offered on the incoming edge.
>+	 * true
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateIncomingObjectOneInputParameter(
>+			DiagnosticChain diagnostics, Map<Object, Object> context);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * If the decision node has a decision input flow and an incoming control flow, then a decision input behavior has one input parameter whose type is the same as or a supertype of the type of object tokens offered on the decision input flow.
>+	 * true
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateIncomingControlOneInputParameter(
>+			DiagnosticChain diagnostics, Map<Object, Object> context);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * If the decision node has a decision input flow and an second incoming object flow, then a decision input behavior has two input parameters, the first of which has a type that is the same as or a supertype of the type of the type of object tokens offered on the nondecision input flow and the second of which has a type that is the same as or a supertype of the type of object tokens offered on the decision input flow.
>+	 * true
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateTwoInputParameters(DiagnosticChain diagnostics,
> 			Map<Object, Object> context);
> 
> } // DecisionNode
>Index: src/org/eclipse/uml2/uml/Component.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Component.java,v
>retrieving revision 1.24
>diff -u -r1.24 Component.java
>--- src/org/eclipse/uml2/uml/Component.java	9 Jan 2008 18:56:02 -0000	1.24
>+++ src/org/eclipse/uml2/uml/Component.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -76,7 +76,7 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * The interfaces that the component requires from other components in its environment in order to be able to offer its full set of provided functionality. These interfaces may be Used by the Component or any of its realizingClassifiers, or they may be the Interfaces that are required by its public Ports.
>+	 * The interfaces that the component requires from other components in its environment in order to be able to offer its full set of provided functionality. These interfaces may be used by the Component or any of its realizingClassifiers, or they may be the Interfaces that are required by its public Ports.
> 	 * 
> 	 * @return the value of the 'Required' reference list.
> 	 * @see org.eclipse.uml2.uml.UMLPackage#getComponent_Required()
>@@ -317,7 +317,7 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * Utility returning the set of realized interfaces of a component:
>+	 * Utility returning the set of realized interfaces of a component.
> 	 * result = (classifier.clientDependency->
> 	 * select(dependency|dependency.oclIsKindOf(Realization) and dependency.supplier.oclIsKindOf(Interface)))->
> 	 * collect(dependency|dependency.client)
>@@ -331,7 +331,7 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * Utility returning the set of used interfaces of a component:
>+	 * Utility returning the set of used interfaces of a component.
> 	 * result = (classifier.supplierDependency->
> 	 * select(dependency|dependency.oclIsKindOf(Usage) and dependency.supplier.oclIsKindOf(interface)))->
> 	 * collect(dependency|dependency.supplier)
>Index: src/org/eclipse/uml2/uml/TimeExpression.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/TimeExpression.java,v
>retrieving revision 1.7
>diff -u -r1.7 TimeExpression.java
>--- src/org/eclipse/uml2/uml/TimeExpression.java	12 Jun 2007 12:53:17 -0000	1.7
>+++ src/org/eclipse/uml2/uml/TimeExpression.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -41,31 +41,44 @@
> 		extends ValueSpecification {
> 
> 	/**
>-	 * Returns the value of the 'Expr' reference.
>+	 * Returns the value of the 'Expr' containment reference.
> 	 * 
> 	 * 
> 	 * 
> 	 * The value of the time expression.
> 	 * 
>-	 * @return the value of the 'Expr' reference.
>+	 * @return the value of the 'Expr' containment reference.
> 	 * @see #setExpr(ValueSpecification)
> 	 * @see org.eclipse.uml2.uml.UMLPackage#getTimeExpression_Expr()
>-	 * @model ordered="false"
>+	 * @model containment="true" resolveProxies="true" ordered="false"
> 	 * @generated
> 	 */
> 	ValueSpecification getExpr();
> 
> 	/**
>-	 * Sets the value of the '{@link org.eclipse.uml2.uml.TimeExpression#getExpr Expr}' reference.
>+	 * Sets the value of the '{@link org.eclipse.uml2.uml.TimeExpression#getExpr Expr}' containment reference.
> 	 * 
> 	 * 
>-	 * @param value the new value of the 'Expr' reference.
>+	 * @param value the new value of the 'Expr' containment reference.
> 	 * @see #getExpr()
> 	 * @generated
> 	 */
> 	void setExpr(ValueSpecification value);
> 
> 	/**
>+	 * Creates a new {@link org.eclipse.uml2.uml.ValueSpecification}, with the specified 'Name', and 'Type', and sets the 'Expr' containment reference.
>+	 * 
>+	 * 
>+	 * @param name The 'Name' for the new {@link org.eclipse.uml2.uml.ValueSpecification}, or <code>null</code>.
>+	 * @param type The 'Type' for the new {@link org.eclipse.uml2.uml.ValueSpecification}, or <code>null</code>.
>+	 * @param eClass The Ecore class of the {@link org.eclipse.uml2.uml.ValueSpecification} to create.
>+	 * @return The new {@link org.eclipse.uml2.uml.ValueSpecification}.
>+	 * @see #getExpr()
>+	 * @generated
>+	 */
>+	ValueSpecification createExpr(String name, Type type, EClass eClass);
>+
>+	/**
> 	 * Returns the value of the 'Observation' reference list.
> 	 * The list contents are of type {@link org.eclipse.uml2.uml.Observation}.
> 	 * 
>Index: src/org/eclipse/uml2/uml/Property.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Property.java,v
>retrieving revision 1.27
>diff -u -r1.27 Property.java
>--- src/org/eclipse/uml2/uml/Property.java	23 Oct 2007 15:54:22 -0000	1.27
>+++ src/org/eclipse/uml2/uml/Property.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -59,8 +59,7 @@
> * @generated
> */
> public interface Property
>-		extends StructuralFeature, ConnectableElement, DeploymentTarget,
>-		TemplateableElement {
>+		extends StructuralFeature, ConnectableElement, DeploymentTarget {
> 
> 	/**
> 	 * Returns the value of the 'Datatype' container reference.
>Index: src/org/eclipse/uml2/uml/MultiplicityElement.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/MultiplicityElement.java,v
>retrieving revision 1.18
>diff -u -r1.18 MultiplicityElement.java
>--- src/org/eclipse/uml2/uml/MultiplicityElement.java	23 Oct 2007 15:54:20 -0000	1.18
>+++ src/org/eclipse/uml2/uml/MultiplicityElement.java	24 Sep 2008 18:40:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -242,21 +242,6 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * A multiplicity must define at least one valid cardinality that is greater than zero.
>-	 * upperBound()->notEmpty() implies upperBound() > 0
>-	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>-	 * @param context The cache of context-specific information.
>-	 * 
>-	 * @model
>-	 * @generated
>-	 */
>-	boolean validateUpperGt0(DiagnosticChain diagnostics,
>-			Map<Object, Object> context);
>-
>-	/**
>-	 * 
>-	 * 
>-	 * 
> 	 * The lower bound must be a non-negative integer literal.
> 	 * lowerBound()->notEmpty() implies lowerBound() >= 0
> 	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>Index: src/org/eclipse/uml2/uml/internal/impl/ConnectorEndImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorEndImpl.java,v
>retrieving revision 1.18
>diff -u -r1.18 ConnectorEndImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/ConnectorEndImpl.java	4 May 2007 20:35:34 -0000	1.18
>+++ src/org/eclipse/uml2/uml/internal/impl/ConnectorEndImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -42,8 +42,8 @@
> * The following features are implemented:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.ConnectorEndImpl#getDefiningEnd Defining End}</li>
>- * <li>{@link org.eclipse.uml2.uml.internal.impl.ConnectorEndImpl#getPartWithPort Part With Port}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.ConnectorEndImpl#getRole Role}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.ConnectorEndImpl#getPartWithPort Part With Port}</li>
> * </ul>
> * 
> *
>@@ -54,24 +54,24 @@
> 		implements ConnectorEnd {
> 
> 	/**
>-	 * The cached value of the '{@link #getPartWithPort() Part With Port}' reference.
>+	 * The cached value of the '{@link #getRole() Role}' reference.
> 	 * 
> 	 * 
>-	 * @see #getPartWithPort()
>+	 * @see #getRole()
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Property partWithPort;
>+	protected ConnectableElement role;
> 
> 	/**
>-	 * The cached value of the '{@link #getRole() Role}' reference.
>+	 * The cached value of the '{@link #getPartWithPort() Part With Port}' reference.
> 	 * 
> 	 * 
>-	 * @see #getRole()
>+	 * @see #getPartWithPort()
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected ConnectableElement role;
>+	protected Property partWithPort;
> 
> 	/**
> 	 * 
>@@ -281,14 +281,14 @@
> 				if (resolve)
> 					return getDefiningEnd();
> 				return basicGetDefiningEnd();
>-			case UMLPackage.CONNECTOR_END__PART_WITH_PORT :
>-				if (resolve)
>-					return getPartWithPort();
>-				return basicGetPartWithPort();
> 			case UMLPackage.CONNECTOR_END__ROLE :
> 				if (resolve)
> 					return getRole();
> 				return basicGetRole();
>+			case UMLPackage.CONNECTOR_END__PART_WITH_PORT :
>+				if (resolve)
>+					return getPartWithPort();
>+				return basicGetPartWithPort();
> 		}
> 		return eDynamicGet(featureID, resolve, coreType);
> 	}
>@@ -330,12 +330,12 @@
> 			case UMLPackage.CONNECTOR_END__LOWER_VALUE :
> 				setLowerValue((ValueSpecification) newValue);
> 				return;
>-			case UMLPackage.CONNECTOR_END__PART_WITH_PORT :
>-				setPartWithPort((Property) newValue);
>-				return;
> 			case UMLPackage.CONNECTOR_END__ROLE :
> 				setRole((ConnectableElement) newValue);
> 				return;
>+			case UMLPackage.CONNECTOR_END__PART_WITH_PORT :
>+				setPartWithPort((Property) newValue);
>+				return;
> 		}
> 		eDynamicSet(featureID, newValue);
> 	}
>@@ -372,12 +372,12 @@
> 			case UMLPackage.CONNECTOR_END__LOWER_VALUE :
> 				setLowerValue((ValueSpecification) null);
> 				return;
>-			case UMLPackage.CONNECTOR_END__PART_WITH_PORT :
>-				setPartWithPort((Property) null);
>-				return;
> 			case UMLPackage.CONNECTOR_END__ROLE :
> 				setRole((ConnectableElement) null);
> 				return;
>+			case UMLPackage.CONNECTOR_END__PART_WITH_PORT :
>+				setPartWithPort((Property) null);
>+				return;
> 		}
> 		eDynamicUnset(featureID);
> 	}
>@@ -412,10 +412,10 @@
> 				return lowerValue != null;
> 			case UMLPackage.CONNECTOR_END__DEFINING_END :
> 				return basicGetDefiningEnd() != null;
>-			case UMLPackage.CONNECTOR_END__PART_WITH_PORT :
>-				return partWithPort != null;
> 			case UMLPackage.CONNECTOR_END__ROLE :
> 				return role != null;
>+			case UMLPackage.CONNECTOR_END__PART_WITH_PORT :
>+				return partWithPort != null;
> 		}
> 		return eDynamicIsSet(featureID);
> 	}
>Index: src/org/eclipse/uml2/uml/internal/impl/ConnectableElementImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementImpl.java,v
>retrieving revision 1.21
>diff -u -r1.21 ConnectableElementImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/ConnectableElementImpl.java	4 May 2007 20:35:34 -0000	1.21
>+++ src/org/eclipse/uml2/uml/internal/impl/ConnectableElementImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -489,10 +489,6 @@
> 			case UMLPackage.CONNECTABLE_ELEMENT__TEMPLATE_PARAMETER :
> 				setTemplateParameter((TemplateParameter) newValue);
> 				return;
>-			case UMLPackage.CONNECTABLE_ELEMENT__END :
>-				getEnds().clear();
>-				getEnds().addAll((Collection<? extends ConnectorEnd>) newValue);
>-				return;
> 		}
> 		eDynamicSet(featureID, newValue);
> 	}
>@@ -532,9 +528,6 @@
> 			case UMLPackage.CONNECTABLE_ELEMENT__TEMPLATE_PARAMETER :
> 				setTemplateParameter((TemplateParameter) null);
> 				return;
>-			case UMLPackage.CONNECTABLE_ELEMENT__END :
>-				getEnds().clear();
>-				return;
> 		}
> 		eDynamicUnset(featureID);
> 	}
>Index: src/org/eclipse/uml2/uml/internal/impl/MultiplicityElementImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MultiplicityElementImpl.java,v
>retrieving revision 1.27
>diff -u -r1.27 MultiplicityElementImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/MultiplicityElementImpl.java	25 Apr 2007 17:47:02 -0000	1.27
>+++ src/org/eclipse/uml2/uml/internal/impl/MultiplicityElementImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -498,17 +498,6 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateUpperGt0(DiagnosticChain diagnostics,
>-			Map<Object, Object> context) {
>-		return MultiplicityElementOperations.validateUpperGt0(this,
>-			diagnostics, context);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public boolean validateLowerGe0(DiagnosticChain diagnostics,
> 			Map<Object, Object> context) {
> 		return MultiplicityElementOperations.validateLowerGe0(this,
>Index: src/org/eclipse/uml2/uml/internal/impl/ConnectionPointReferenceImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectionPointReferenceImpl.java,v
>retrieving revision 1.21
>diff -u -r1.21 ConnectionPointReferenceImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/ConnectionPointReferenceImpl.java	4 May 2007 20:35:34 -0000	1.21
>+++ src/org/eclipse/uml2/uml/internal/impl/ConnectionPointReferenceImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -40,7 +40,6 @@
> import org.eclipse.uml2.uml.Region;
> import org.eclipse.uml2.uml.State;
> import org.eclipse.uml2.uml.StringExpression;
>-import org.eclipse.uml2.uml.Transition;
> import org.eclipse.uml2.uml.UMLPackage;
> import org.eclipse.uml2.uml.VisibilityKind;
> 
>@@ -385,10 +384,10 @@
> 				if (resolve)
> 					return getNameExpression();
> 				return basicGetNameExpression();
>-			case UMLPackage.CONNECTION_POINT_REFERENCE__INCOMING :
>-				return getIncomings();
> 			case UMLPackage.CONNECTION_POINT_REFERENCE__OUTGOING :
> 				return getOutgoings();
>+			case UMLPackage.CONNECTION_POINT_REFERENCE__INCOMING :
>+				return getIncomings();
> 			case UMLPackage.CONNECTION_POINT_REFERENCE__CONTAINER :
> 				if (resolve)
> 					return getContainer();
>@@ -438,16 +437,6 @@
> 			case UMLPackage.CONNECTION_POINT_REFERENCE__NAME_EXPRESSION :
> 				setNameExpression((StringExpression) newValue);
> 				return;
>-			case UMLPackage.CONNECTION_POINT_REFERENCE__INCOMING :
>-				getIncomings().clear();
>-				getIncomings().addAll(
>-					(Collection<? extends Transition>) newValue);
>-				return;
>-			case UMLPackage.CONNECTION_POINT_REFERENCE__OUTGOING :
>-				getOutgoings().clear();
>-				getOutgoings().addAll(
>-					(Collection<? extends Transition>) newValue);
>-				return;
> 			case UMLPackage.CONNECTION_POINT_REFERENCE__CONTAINER :
> 				setContainer((Region) newValue);
> 				return;
>@@ -493,12 +482,6 @@
> 			case UMLPackage.CONNECTION_POINT_REFERENCE__NAME_EXPRESSION :
> 				setNameExpression((StringExpression) null);
> 				return;
>-			case UMLPackage.CONNECTION_POINT_REFERENCE__INCOMING :
>-				getIncomings().clear();
>-				return;
>-			case UMLPackage.CONNECTION_POINT_REFERENCE__OUTGOING :
>-				getOutgoings().clear();
>-				return;
> 			case UMLPackage.CONNECTION_POINT_REFERENCE__CONTAINER :
> 				setContainer((Region) null);
> 				return;
>@@ -546,10 +529,10 @@
> 				return isSetNamespace();
> 			case UMLPackage.CONNECTION_POINT_REFERENCE__NAME_EXPRESSION :
> 				return nameExpression != null;
>-			case UMLPackage.CONNECTION_POINT_REFERENCE__INCOMING :
>-				return !getIncomings().isEmpty();
> 			case UMLPackage.CONNECTION_POINT_REFERENCE__OUTGOING :
> 				return !getOutgoings().isEmpty();
>+			case UMLPackage.CONNECTION_POINT_REFERENCE__INCOMING :
>+				return !getIncomings().isEmpty();
> 			case UMLPackage.CONNECTION_POINT_REFERENCE__CONTAINER :
> 				return basicGetContainer() != null;
> 			case UMLPackage.CONNECTION_POINT_REFERENCE__ENTRY :
>Index: src/org/eclipse/uml2/uml/internal/impl/DurationImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationImpl.java,v
>retrieving revision 1.18
>diff -u -r1.18 DurationImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/DurationImpl.java	25 Apr 2007 17:47:04 -0000	1.18
>+++ src/org/eclipse/uml2/uml/internal/impl/DurationImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -15,6 +15,7 @@
> import java.util.Collection;
> import org.eclipse.emf.common.notify.Notification;
> 
>+import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.util.EList;
> 
> import org.eclipse.emf.ecore.EAnnotation;
>@@ -25,6 +26,7 @@
> 
> import org.eclipse.emf.ecore.util.EObjectResolvingEList;
> 
>+import org.eclipse.emf.ecore.util.InternalEList;
> import org.eclipse.uml2.uml.Comment;
> import org.eclipse.uml2.uml.Dependency;
> import org.eclipse.uml2.uml.Duration;
>@@ -57,7 +59,7 @@
> 		implements Duration {
> 
> 	/**
>-	 * The cached value of the '{@link #getExpr() Expr}' reference.
>+	 * The cached value of the '{@link #getExpr() Expr}' containment reference.
> 	 * 
> 	 * 
> 	 * @see #getExpr()
>@@ -105,6 +107,16 @@
> 			InternalEObject oldExpr = (InternalEObject) expr;
> 			expr = (ValueSpecification) eResolveProxy(oldExpr);
> 			if (expr != oldExpr) {
>+				InternalEObject newExpr = (InternalEObject) expr;
>+				NotificationChain msgs = oldExpr.eInverseRemove(this,
>+					EOPPOSITE_FEATURE_BASE - UMLPackage.DURATION__EXPR, null,
>+					null);
>+				if (newExpr.eInternalContainer() == null) {
>+					msgs = newExpr.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.DURATION__EXPR, null, msgs);
>+				}
>+				if (msgs != null)
>+					msgs.dispatch();
> 				if (eNotificationRequired())
> 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
> 						UMLPackage.DURATION__EXPR, oldExpr, expr));
>@@ -127,12 +139,58 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public void setExpr(ValueSpecification newExpr) {
>+	public NotificationChain basicSetExpr(ValueSpecification newExpr,
>+			NotificationChain msgs) {
> 		ValueSpecification oldExpr = expr;
> 		expr = newExpr;
>-		if (eNotificationRequired())
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this,
>+				Notification.SET, UMLPackage.DURATION__EXPR, oldExpr, newExpr);
>+			if (msgs == null)
>+				msgs = notification;
>+			else
>+				msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setExpr(ValueSpecification newExpr) {
>+		if (newExpr != expr) {
>+			NotificationChain msgs = null;
>+			if (expr != null)
>+				msgs = ((InternalEObject) expr).eInverseRemove(this,
>+					EOPPOSITE_FEATURE_BASE - UMLPackage.DURATION__EXPR, null,
>+					msgs);
>+			if (newExpr != null)
>+				msgs = ((InternalEObject) newExpr).eInverseAdd(this,
>+					EOPPOSITE_FEATURE_BASE - UMLPackage.DURATION__EXPR, null,
>+					msgs);
>+			msgs = basicSetExpr(newExpr, msgs);
>+			if (msgs != null)
>+				msgs.dispatch();
>+		} else if (eNotificationRequired())
> 			eNotify(new ENotificationImpl(this, Notification.SET,
>-				UMLPackage.DURATION__EXPR, oldExpr, expr));
>+				UMLPackage.DURATION__EXPR, newExpr, newExpr));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ValueSpecification createExpr(String name, Type type, EClass eClass) {
>+		ValueSpecification newExpr = (ValueSpecification) create(eClass);
>+		setExpr(newExpr);
>+		if (name != null)
>+			newExpr.setName(name);
>+		if (type != null)
>+			newExpr.setType(type);
>+		return newExpr;
> 	}
> 
> 	/**
>@@ -192,6 +250,36 @@
> 	 * @generated
> 	 */
> 	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd,
>+			int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case UMLPackage.DURATION__EANNOTATIONS :
>+				return ((InternalEList<?>) getEAnnotations()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.DURATION__OWNED_COMMENT :
>+				return ((InternalEList<?>) getOwnedComments()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.DURATION__CLIENT_DEPENDENCY :
>+				return ((InternalEList<?>) getClientDependencies())
>+					.basicRemove(otherEnd, msgs);
>+			case UMLPackage.DURATION__NAME_EXPRESSION :
>+				return basicSetNameExpression(null, msgs);
>+			case UMLPackage.DURATION__OWNING_TEMPLATE_PARAMETER :
>+				return basicSetOwningTemplateParameter(null, msgs);
>+			case UMLPackage.DURATION__TEMPLATE_PARAMETER :
>+				return basicSetTemplateParameter(null, msgs);
>+			case UMLPackage.DURATION__EXPR :
>+				return basicSetExpr(null, msgs);
>+		}
>+		return eDynamicInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
> 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
> 		switch (featureID) {
> 			case UMLPackage.DURATION__EANNOTATIONS :
>Index: src/org/eclipse/uml2/uml/internal/impl/StateImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateImpl.java,v
>retrieving revision 1.35
>diff -u -r1.35 StateImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/StateImpl.java	21 Apr 2008 16:32:41 -0000	1.35
>+++ src/org/eclipse/uml2/uml/internal/impl/StateImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -79,8 +79,8 @@
> * <li>{@link org.eclipse.uml2.uml.internal.impl.StateImpl#getRedefinitionContexts Redefinition Context}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.StateImpl#isLeaf Is Leaf}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.StateImpl#getNamespace Namespace}</li>
>- * <li>{@link org.eclipse.uml2.uml.internal.impl.StateImpl#getIncomings Incoming}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.StateImpl#getOutgoings Outgoing}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.StateImpl#getIncomings Incoming}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.StateImpl#getContainer Container}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.StateImpl#getOwnedMembers Owned Member}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.StateImpl#getOwnedElements Owned Element}</li>
>@@ -1707,10 +1707,10 @@
> 				return getRedefinedElements();
> 			case UMLPackage.STATE__REDEFINITION_CONTEXT :
> 				return getRedefinitionContexts();
>-			case UMLPackage.STATE__INCOMING :
>-				return getIncomings();
> 			case UMLPackage.STATE__OUTGOING :
> 				return getOutgoings();
>+			case UMLPackage.STATE__INCOMING :
>+				return getIncomings();
> 			case UMLPackage.STATE__CONTAINER :
> 				if (resolve)
> 					return getContainer();
>@@ -1818,16 +1818,6 @@
> 			case UMLPackage.STATE__IS_LEAF :
> 				setIsLeaf(((Boolean) newValue).booleanValue());
> 				return;
>-			case UMLPackage.STATE__INCOMING :
>-				getIncomings().clear();
>-				getIncomings().addAll(
>-					(Collection<? extends Transition>) newValue);
>-				return;
>-			case UMLPackage.STATE__OUTGOING :
>-				getOutgoings().clear();
>-				getOutgoings().addAll(
>-					(Collection<? extends Transition>) newValue);
>-				return;
> 			case UMLPackage.STATE__CONTAINER :
> 				setContainer((Region) newValue);
> 				return;
>@@ -1910,12 +1900,6 @@
> 			case UMLPackage.STATE__IS_LEAF :
> 				setIsLeaf(IS_LEAF_EDEFAULT);
> 				return;
>-			case UMLPackage.STATE__INCOMING :
>-				getIncomings().clear();
>-				return;
>-			case UMLPackage.STATE__OUTGOING :
>-				getOutgoings().clear();
>-				return;
> 			case UMLPackage.STATE__CONTAINER :
> 				setContainer((Region) null);
> 				return;
>@@ -2002,10 +1986,10 @@
> 				return isSetRedefinedElements();
> 			case UMLPackage.STATE__REDEFINITION_CONTEXT :
> 				return isSetRedefinitionContexts();
>-			case UMLPackage.STATE__INCOMING :
>-				return !getIncomings().isEmpty();
> 			case UMLPackage.STATE__OUTGOING :
> 				return !getOutgoings().isEmpty();
>+			case UMLPackage.STATE__INCOMING :
>+				return !getIncomings().isEmpty();
> 			case UMLPackage.STATE__CONTAINER :
> 				return basicGetContainer() != null;
> 			case UMLPackage.STATE__IS_COMPOSITE :
>@@ -2062,10 +2046,10 @@
> 		}
> 		if (baseClass == Vertex.class) {
> 			switch (derivedFeatureID) {
>-				case UMLPackage.STATE__INCOMING :
>-					return UMLPackage.VERTEX__INCOMING;
> 				case UMLPackage.STATE__OUTGOING :
> 					return UMLPackage.VERTEX__OUTGOING;
>+				case UMLPackage.STATE__INCOMING :
>+					return UMLPackage.VERTEX__INCOMING;
> 				case UMLPackage.STATE__CONTAINER :
> 					return UMLPackage.VERTEX__CONTAINER;
> 				default :
>@@ -2096,10 +2080,10 @@
> 		}
> 		if (baseClass == Vertex.class) {
> 			switch (baseFeatureID) {
>-				case UMLPackage.VERTEX__INCOMING :
>-					return UMLPackage.STATE__INCOMING;
> 				case UMLPackage.VERTEX__OUTGOING :
> 					return UMLPackage.STATE__OUTGOING;
>+				case UMLPackage.VERTEX__INCOMING :
>+					return UMLPackage.STATE__INCOMING;
> 				case UMLPackage.VERTEX__CONTAINER :
> 					return UMLPackage.STATE__CONTAINER;
> 				default :
>Index: src/org/eclipse/uml2/uml/internal/impl/WriteStructuralFeatureActionImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteStructuralFeatureActionImpl.java,v
>retrieving revision 1.26
>diff -u -r1.26 WriteStructuralFeatureActionImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/WriteStructuralFeatureActionImpl.java	25 Apr 2007 17:47:01 -0000	1.26
>+++ src/org/eclipse/uml2/uml/internal/impl/WriteStructuralFeatureActionImpl.java	24 Sep 2008 18:40:12 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -45,6 +45,7 @@
> import org.eclipse.uml2.uml.ExceptionHandler;
> import org.eclipse.uml2.uml.InputPin;
> import org.eclipse.uml2.uml.InterruptibleActivityRegion;
>+import org.eclipse.uml2.uml.OutputPin;
> import org.eclipse.uml2.uml.StringExpression;
> import org.eclipse.uml2.uml.StructuralFeature;
> import org.eclipse.uml2.uml.StructuredActivityNode;
>@@ -63,7 +64,9 @@
> * The following features are implemented:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.WriteStructuralFeatureActionImpl#getInputs Input}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.WriteStructuralFeatureActionImpl#getOutputs Output}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.WriteStructuralFeatureActionImpl#getValue Value}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.WriteStructuralFeatureActionImpl#getResult Result}</li>
> * </ul>
> * 
> *
>@@ -84,6 +87,16 @@
> 	protected InputPin value;
> 
> 	/**
>+	 * The cached value of the '{@link #getResult() Result}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getResult()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected OutputPin result;
>+
>+	/**
> 	 * 
> 	 * 
> 	 * @generated
>@@ -246,6 +259,110 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public OutputPin getResult() {
>+		if (result != null && result.eIsProxy()) {
>+			InternalEObject oldResult = (InternalEObject) result;
>+			result = (OutputPin) eResolveProxy(oldResult);
>+			if (result != oldResult) {
>+				InternalEObject newResult = (InternalEObject) result;
>+				NotificationChain msgs = oldResult.eInverseRemove(this,
>+					EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT,
>+					null, null);
>+				if (newResult.eInternalContainer() == null) {
>+					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT,
>+						null, msgs);
>+				}
>+				if (msgs != null)
>+					msgs.dispatch();
>+				if (eNotificationRequired())
>+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
>+						UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT,
>+						oldResult, result));
>+			}
>+		}
>+		return result;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public OutputPin basicGetResult() {
>+		return result;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetResult(OutputPin newResult,
>+			NotificationChain msgs) {
>+		OutputPin oldResult = result;
>+		result = newResult;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this,
>+				Notification.SET,
>+				UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT, oldResult,
>+				newResult);
>+			if (msgs == null)
>+				msgs = notification;
>+			else
>+				msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setResult(OutputPin newResult) {
>+		if (newResult != result) {
>+			NotificationChain msgs = null;
>+			if (result != null)
>+				msgs = ((InternalEObject) result).eInverseRemove(this,
>+					EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT,
>+					null, msgs);
>+			if (newResult != null)
>+				msgs = ((InternalEObject) newResult).eInverseAdd(this,
>+					EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT,
>+					null, msgs);
>+			msgs = basicSetResult(newResult, msgs);
>+			if (msgs != null)
>+				msgs.dispatch();
>+		} else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET,
>+				UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT, newResult,
>+				newResult));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public OutputPin createResult(String name, Type type) {
>+		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
>+		setResult(newResult);
>+		if (name != null)
>+			newResult.setName(name);
>+		if (type != null)
>+			newResult.setType(type);
>+		return newResult;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public boolean validateInputPin(DiagnosticChain diagnostics,
> 			Map<Object, Object> context) {
> 		return WriteStructuralFeatureActionOperations.validateInputPin(this,
>@@ -257,6 +374,28 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public boolean validateTypeOfResult(DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return WriteStructuralFeatureActionOperations.validateTypeOfResult(
>+			this, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateMultiplicityOfResult(DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return WriteStructuralFeatureActionOperations
>+			.validateMultiplicityOfResult(this, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	@Override
> 	public boolean validateMultiplicity(DiagnosticChain diagnostics,
> 			Map<Object, Object> context) {
>@@ -313,6 +452,8 @@
> 				return basicSetObject(null, msgs);
> 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__VALUE :
> 				return basicSetValue(null, msgs);
>+			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT :
>+				return basicSetResult(null, msgs);
> 		}
> 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -405,6 +546,10 @@
> 				if (resolve)
> 					return getValue();
> 				return basicGetValue();
>+			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT :
>+				if (resolve)
>+					return getResult();
>+				return basicGetResult();
> 		}
> 		return eDynamicGet(featureID, resolve, coreType);
> 	}
>@@ -501,6 +646,9 @@
> 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__VALUE :
> 				setValue((InputPin) newValue);
> 				return;
>+			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT :
>+				setResult((OutputPin) newValue);
>+				return;
> 		}
> 		eDynamicSet(featureID, newValue);
> 	}
>@@ -573,6 +721,9 @@
> 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__VALUE :
> 				setValue((InputPin) null);
> 				return;
>+			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT :
>+				setResult((OutputPin) null);
>+				return;
> 		}
> 		eDynamicUnset(featureID);
> 	}
>@@ -651,6 +802,8 @@
> 				return object != null;
> 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__VALUE :
> 				return value != null;
>+			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT :
>+				return result != null;
> 		}
> 		return eDynamicIsSet(featureID);
> 	}
>@@ -673,9 +826,56 @@
> 	 * @generated
> 	 */
> 	@Override
>+	public EList<OutputPin> getOutputs() {
>+		CacheAdapter cache = getCacheAdapter();
>+		if (cache != null) {
>+			Resource eResource = eResource();
>+			@SuppressWarnings("unchecked")
>+			EList<OutputPin> outputs = (EList<OutputPin>) cache.get(eResource,
>+				this, UMLPackage.Literals.ACTION__OUTPUT);
>+			if (outputs == null) {
>+				cache.put(eResource, this, UMLPackage.Literals.ACTION__OUTPUT,
>+					outputs = new DerivedUnionEObjectEList<OutputPin>(
>+						OutputPin.class, this,
>+						UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__OUTPUT,
>+						OUTPUT_ESUBSETS));
>+			}
>+			return outputs;
>+		}
>+		return new DerivedUnionEObjectEList<OutputPin>(OutputPin.class, this,
>+			UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__OUTPUT, OUTPUT_ESUBSETS);
>+	}
>+
>+	/**
>+	 * The array of subset feature identifiers for the '{@link #getOutputs() Output}' reference list.
>+	 * 
>+	 * 
>+	 * @see #getOutputs()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT};
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
> 	public boolean isSetInputs() {
> 		return super.isSetInputs()
> 			|| eIsSet(UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__VALUE);
> 	}
> 
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean isSetOutputs() {
>+		return super.isSetOutputs()
>+			|| eIsSet(UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT);
>+	}
>+
> } //WriteStructuralFeatureActionImpl
>Index: src/org/eclipse/uml2/uml/internal/impl/PseudostateImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PseudostateImpl.java,v
>retrieving revision 1.20
>diff -u -r1.20 PseudostateImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/PseudostateImpl.java	21 Apr 2008 16:32:41 -0000	1.20
>+++ src/org/eclipse/uml2/uml/internal/impl/PseudostateImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -40,7 +40,6 @@
> import org.eclipse.uml2.uml.State;
> import org.eclipse.uml2.uml.StateMachine;
> import org.eclipse.uml2.uml.StringExpression;
>-import org.eclipse.uml2.uml.Transition;
> import org.eclipse.uml2.uml.UMLPackage;
> import org.eclipse.uml2.uml.VisibilityKind;
> 
>@@ -509,10 +508,10 @@
> 				if (resolve)
> 					return getNameExpression();
> 				return basicGetNameExpression();
>-			case UMLPackage.PSEUDOSTATE__INCOMING :
>-				return getIncomings();
> 			case UMLPackage.PSEUDOSTATE__OUTGOING :
> 				return getOutgoings();
>+			case UMLPackage.PSEUDOSTATE__INCOMING :
>+				return getIncomings();
> 			case UMLPackage.PSEUDOSTATE__CONTAINER :
> 				if (resolve)
> 					return getContainer();
>@@ -564,16 +563,6 @@
> 			case UMLPackage.PSEUDOSTATE__NAME_EXPRESSION :
> 				setNameExpression((StringExpression) newValue);
> 				return;
>-			case UMLPackage.PSEUDOSTATE__INCOMING :
>-				getIncomings().clear();
>-				getIncomings().addAll(
>-					(Collection<? extends Transition>) newValue);
>-				return;
>-			case UMLPackage.PSEUDOSTATE__OUTGOING :
>-				getOutgoings().clear();
>-				getOutgoings().addAll(
>-					(Collection<? extends Transition>) newValue);
>-				return;
> 			case UMLPackage.PSEUDOSTATE__CONTAINER :
> 				setContainer((Region) newValue);
> 				return;
>@@ -616,12 +605,6 @@
> 			case UMLPackage.PSEUDOSTATE__NAME_EXPRESSION :
> 				setNameExpression((StringExpression) null);
> 				return;
>-			case UMLPackage.PSEUDOSTATE__INCOMING :
>-				getIncomings().clear();
>-				return;
>-			case UMLPackage.PSEUDOSTATE__OUTGOING :
>-				getOutgoings().clear();
>-				return;
> 			case UMLPackage.PSEUDOSTATE__CONTAINER :
> 				setContainer((Region) null);
> 				return;
>@@ -669,10 +652,10 @@
> 				return isSetNamespace();
> 			case UMLPackage.PSEUDOSTATE__NAME_EXPRESSION :
> 				return nameExpression != null;
>-			case UMLPackage.PSEUDOSTATE__INCOMING :
>-				return !getIncomings().isEmpty();
> 			case UMLPackage.PSEUDOSTATE__OUTGOING :
> 				return !getOutgoings().isEmpty();
>+			case UMLPackage.PSEUDOSTATE__INCOMING :
>+				return !getIncomings().isEmpty();
> 			case UMLPackage.PSEUDOSTATE__CONTAINER :
> 				return basicGetContainer() != null;
> 			case UMLPackage.PSEUDOSTATE__KIND :
>Index: src/org/eclipse/uml2/uml/internal/impl/UMLPackageImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLPackageImpl.java,v
>retrieving revision 1.21
>diff -u -r1.21 UMLPackageImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/UMLPackageImpl.java	9 Jan 2008 18:56:03 -0000	1.21
>+++ src/org/eclipse/uml2/uml/internal/impl/UMLPackageImpl.java	24 Sep 2008 18:40:12 -0000
>@@ -1576,6 +1576,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass startObjectBehaviorActionEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass controlNodeEClass = null;
> 
> 	/**
>@@ -2863,7 +2870,7 @@
> 	public EClass getProfile() {
> 		if (profileEClass == null) {
> 			profileEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(79);
>+				UMLPackage.eNS_URI).getEClassifiers().get(78);
> 		}
> 		return profileEClass;
> 	}
>@@ -2903,7 +2910,7 @@
> 	public EClass getStereotype() {
> 		if (stereotypeEClass == null) {
> 			stereotypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(77);
>+				UMLPackage.eNS_URI).getEClassifiers().get(76);
> 		}
> 		return stereotypeEClass;
> 	}
>@@ -2925,7 +2932,7 @@
> 	public EClass getClass_() {
> 		if (classEClass == null) {
> 			classEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(51);
>+				UMLPackage.eNS_URI).getEClassifiers().get(50);
> 		}
> 		return classEClass;
> 	}
>@@ -2992,7 +2999,7 @@
> 	public EClass getBehavioredClassifier() {
> 		if (behavioredClassifierEClass == null) {
> 			behavioredClassifierEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(52);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(51);
> 		}
> 		return behavioredClassifierEClass;
> 	}
>@@ -3842,7 +3849,7 @@
> 	public EClass getConnectorEnd() {
> 		if (connectorEndEClass == null) {
> 			connectorEndEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(40);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(39);
> 		}
> 		return connectorEndEClass;
> 	}
>@@ -3862,7 +3869,7 @@
> 	 * @generated
> 	 */
> 	public EReference getConnectorEnd_PartWithPort() {
>-		return (EReference) getConnectorEnd().getEStructuralFeatures().get(1);
>+		return (EReference) getConnectorEnd().getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -3871,7 +3878,7 @@
> 	 * @generated
> 	 */
> 	public EReference getConnectorEnd_Role() {
>-		return (EReference) getConnectorEnd().getEStructuralFeatures().get(2);
>+		return (EReference) getConnectorEnd().getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -3882,7 +3889,7 @@
> 	public EClass getProperty() {
> 		if (propertyEClass == null) {
> 			propertyEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(41);
>+				UMLPackage.eNS_URI).getEClassifiers().get(40);
> 		}
> 		return propertyEClass;
> 	}
>@@ -4030,7 +4037,7 @@
> 	public EClass getDeploymentTarget() {
> 		if (deploymentTargetEClass == null) {
> 			deploymentTargetEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(42);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(41);
> 		}
> 		return deploymentTargetEClass;
> 	}
>@@ -4063,7 +4070,7 @@
> 	public EClass getDeployment() {
> 		if (deploymentEClass == null) {
> 			deploymentEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(43);
>+				UMLPackage.eNS_URI).getEClassifiers().get(42);
> 		}
> 		return deploymentEClass;
> 	}
>@@ -4103,7 +4110,7 @@
> 	public EClass getDeployedArtifact() {
> 		if (deployedArtifactEClass == null) {
> 			deployedArtifactEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(44);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(43);
> 		}
> 		return deployedArtifactEClass;
> 	}
>@@ -4116,7 +4123,7 @@
> 	public EClass getDeploymentSpecification() {
> 		if (deploymentSpecificationEClass == null) {
> 			deploymentSpecificationEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(45);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(44);
> 		}
> 		return deploymentSpecificationEClass;
> 	}
>@@ -4159,7 +4166,7 @@
> 	public EClass getArtifact() {
> 		if (artifactEClass == null) {
> 			artifactEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(46);
>+				UMLPackage.eNS_URI).getEClassifiers().get(45);
> 		}
> 		return artifactEClass;
> 	}
>@@ -4217,7 +4224,7 @@
> 	public EClass getManifestation() {
> 		if (manifestationEClass == null) {
> 			manifestationEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(47);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(46);
> 		}
> 		return manifestationEClass;
> 	}
>@@ -4239,7 +4246,7 @@
> 	public EClass getOperation() {
> 		if (operationEClass == null) {
> 			operationEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(48);
>+				UMLPackage.eNS_URI).getEClassifiers().get(47);
> 		}
> 		return operationEClass;
> 	}
>@@ -4369,7 +4376,7 @@
> 	public EClass getBehavioralFeature() {
> 		if (behavioralFeatureEClass == null) {
> 			behavioralFeatureEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(49);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(48);
> 		}
> 		return behavioralFeatureEClass;
> 	}
>@@ -4442,7 +4449,7 @@
> 	public EClass getBehavior() {
> 		if (behaviorEClass == null) {
> 			behaviorEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(50);
>+				UMLPackage.eNS_URI).getEClassifiers().get(49);
> 		}
> 		return behaviorEClass;
> 	}
>@@ -4527,7 +4534,7 @@
> 	public EClass getParameterSet() {
> 		if (parameterSetEClass == null) {
> 			parameterSetEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(81);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(80);
> 		}
> 		return parameterSetEClass;
> 	}
>@@ -4558,7 +4565,7 @@
> 	public EClass getDataType() {
> 		if (dataTypeEClass == null) {
> 			dataTypeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(83);
>+				UMLPackage.eNS_URI).getEClassifiers().get(82);
> 		}
> 		return dataTypeEClass;
> 	}
>@@ -4589,7 +4596,7 @@
> 	public EClass getInterface() {
> 		if (interfaceEClass == null) {
> 			interfaceEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(54);
>+				UMLPackage.eNS_URI).getEClassifiers().get(53);
> 		}
> 		return interfaceEClass;
> 	}
>@@ -4656,7 +4663,7 @@
> 	public EClass getReception() {
> 		if (receptionEClass == null) {
> 			receptionEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(55);
>+				UMLPackage.eNS_URI).getEClassifiers().get(54);
> 		}
> 		return receptionEClass;
> 	}
>@@ -4678,7 +4685,7 @@
> 	public EClass getSignal() {
> 		if (signalEClass == null) {
> 			signalEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(56);
>+				UMLPackage.eNS_URI).getEClassifiers().get(55);
> 		}
> 		return signalEClass;
> 	}
>@@ -4700,7 +4707,7 @@
> 	public EClass getProtocolStateMachine() {
> 		if (protocolStateMachineEClass == null) {
> 			protocolStateMachineEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(57);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(56);
> 		}
> 		return protocolStateMachineEClass;
> 	}
>@@ -4723,7 +4730,7 @@
> 	public EClass getStateMachine() {
> 		if (stateMachineEClass == null) {
> 			stateMachineEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(58);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(57);
> 		}
> 		return stateMachineEClass;
> 	}
>@@ -4772,7 +4779,7 @@
> 	public EClass getRegion() {
> 		if (regionEClass == null) {
> 			regionEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(59);
>+				UMLPackage.eNS_URI).getEClassifiers().get(58);
> 		}
> 		return regionEClass;
> 	}
>@@ -4830,7 +4837,7 @@
> 	public EClass getVertex() {
> 		if (vertexEClass == null) {
> 			vertexEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(60);
>+				UMLPackage.eNS_URI).getEClassifiers().get(59);
> 		}
> 		return vertexEClass;
> 	}
>@@ -4841,7 +4848,7 @@
> 	 * @generated
> 	 */
> 	public EReference getVertex_Outgoing() {
>-		return (EReference) getVertex().getEStructuralFeatures().get(1);
>+		return (EReference) getVertex().getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -4850,7 +4857,7 @@
> 	 * @generated
> 	 */
> 	public EReference getVertex_Incoming() {
>-		return (EReference) getVertex().getEStructuralFeatures().get(0);
>+		return (EReference) getVertex().getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -4870,7 +4877,7 @@
> 	public EClass getTransition() {
> 		if (transitionEClass == null) {
> 			transitionEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(61);
>+				UMLPackage.eNS_URI).getEClassifiers().get(60);
> 		}
> 		return transitionEClass;
> 	}
>@@ -4899,7 +4906,7 @@
> 	 * @generated
> 	 */
> 	public EReference getTransition_Target() {
>-		return (EReference) getTransition().getEStructuralFeatures().get(6);
>+		return (EReference) getTransition().getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -4908,7 +4915,7 @@
> 	 * @generated
> 	 */
> 	public EReference getTransition_RedefinedTransition() {
>-		return (EReference) getTransition().getEStructuralFeatures().get(2);
>+		return (EReference) getTransition().getEStructuralFeatures().get(4);
> 	}
> 
> 	/**
>@@ -4917,7 +4924,7 @@
> 	 * @generated
> 	 */
> 	public EReference getTransition_Guard() {
>-		return (EReference) getTransition().getEStructuralFeatures().get(3);
>+		return (EReference) getTransition().getEStructuralFeatures().get(5);
> 	}
> 
> 	/**
>@@ -4926,7 +4933,7 @@
> 	 * @generated
> 	 */
> 	public EReference getTransition_Effect() {
>-		return (EReference) getTransition().getEStructuralFeatures().get(4);
>+		return (EReference) getTransition().getEStructuralFeatures().get(6);
> 	}
> 
> 	/**
>@@ -4935,7 +4942,7 @@
> 	 * @generated
> 	 */
> 	public EReference getTransition_Trigger() {
>-		return (EReference) getTransition().getEStructuralFeatures().get(5);
>+		return (EReference) getTransition().getEStructuralFeatures().get(7);
> 	}
> 
> 	/**
>@@ -4944,7 +4951,7 @@
> 	 * @generated
> 	 */
> 	public EReference getTransition_Source() {
>-		return (EReference) getTransition().getEStructuralFeatures().get(7);
>+		return (EReference) getTransition().getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -4955,7 +4962,7 @@
> 	public EClass getTrigger() {
> 		if (triggerEClass == null) {
> 			triggerEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(63);
>+				UMLPackage.eNS_URI).getEClassifiers().get(62);
> 		}
> 		return triggerEClass;
> 	}
>@@ -4986,7 +4993,7 @@
> 	public EClass getEvent() {
> 		if (eventEClass == null) {
> 			eventEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(64);
>+				UMLPackage.eNS_URI).getEClassifiers().get(63);
> 		}
> 		return eventEClass;
> 	}
>@@ -4999,7 +5006,7 @@
> 	public EClass getPort() {
> 		if (portEClass == null) {
> 			portEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(65);
>+				UMLPackage.eNS_URI).getEClassifiers().get(64);
> 		}
> 		return portEClass;
> 	}
>@@ -5066,7 +5073,7 @@
> 	public EClass getState() {
> 		if (stateEClass == null) {
> 			stateEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(66);
>+				UMLPackage.eNS_URI).getEClassifiers().get(65);
> 		}
> 		return stateEClass;
> 	}
>@@ -5205,7 +5212,7 @@
> 	public EClass getConnectionPointReference() {
> 		if (connectionPointReferenceEClass == null) {
> 			connectionPointReferenceEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(67);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(66);
> 		}
> 		return connectionPointReferenceEClass;
> 	}
>@@ -5248,7 +5255,7 @@
> 	public EClass getPseudostate() {
> 		if (pseudostateEClass == null) {
> 			pseudostateEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(68);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(67);
> 		}
> 		return pseudostateEClass;
> 	}
>@@ -5288,7 +5295,7 @@
> 	public EClass getProtocolConformance() {
> 		if (protocolConformanceEClass == null) {
> 			protocolConformanceEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(70);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(69);
> 		}
> 		return protocolConformanceEClass;
> 	}
>@@ -5321,7 +5328,7 @@
> 	public EClass getOperationTemplateParameter() {
> 		if (operationTemplateParameterEClass == null) {
> 			operationTemplateParameterEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(84);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(83);
> 		}
> 		return operationTemplateParameterEClass;
> 	}
>@@ -5334,7 +5341,7 @@
> 	public EClass getStructuralFeature() {
> 		if (structuralFeatureEClass == null) {
> 			structuralFeatureEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(85);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(84);
> 		}
> 		return structuralFeatureEClass;
> 	}
>@@ -5415,7 +5422,7 @@
> 	public EClass getConnectableElementTemplateParameter() {
> 		if (connectableElementTemplateParameterEClass == null) {
> 			connectableElementTemplateParameterEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(39);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(86);
> 		}
> 		return connectableElementTemplateParameterEClass;
> 	}
>@@ -5483,7 +5490,7 @@
> 	public EClass getStructuredClassifier() {
> 		if (structuredClassifierEClass == null) {
> 			structuredClassifierEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(72);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(71);
> 		}
> 		return structuredClassifierEClass;
> 	}
>@@ -5536,7 +5543,7 @@
> 	public EClass getConnector() {
> 		if (connectorEClass == null) {
> 			connectorEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(73);
>+				UMLPackage.eNS_URI).getEClassifiers().get(72);
> 		}
> 		return connectorEClass;
> 	}
>@@ -5657,19 +5664,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EReference getClassifierTemplateParameter_DefaultClassifier() {
>-		return (EReference) getClassifierTemplateParameter()
>-			.getEStructuralFeatures().get(1);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public EReference getClassifierTemplateParameter_ConstrainingClassifier() {
> 		return (EReference) getClassifierTemplateParameter()
>-			.getEStructuralFeatures().get(2);
>+			.getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -5680,7 +5677,7 @@
> 	public EClass getInterfaceRealization() {
> 		if (interfaceRealizationEClass == null) {
> 			interfaceRealizationEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(53);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(52);
> 		}
> 		return interfaceRealizationEClass;
> 	}
>@@ -5713,7 +5710,7 @@
> 	public EClass getEncapsulatedClassifier() {
> 		if (encapsulatedClassifierEClass == null) {
> 			encapsulatedClassifierEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(71);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(70);
> 		}
> 		return encapsulatedClassifierEClass;
> 	}
>@@ -5736,7 +5733,7 @@
> 	public EClass getExtension() {
> 		if (extensionEClass == null) {
> 			extensionEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(75);
>+				UMLPackage.eNS_URI).getEClassifiers().get(74);
> 		}
> 		return extensionEClass;
> 	}
>@@ -5767,7 +5764,7 @@
> 	public EClass getExtensionEnd() {
> 		if (extensionEndEClass == null) {
> 			extensionEndEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(76);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(75);
> 		}
> 		return extensionEndEClass;
> 	}
>@@ -5780,7 +5777,7 @@
> 	public EClass getImage() {
> 		if (imageEClass == null) {
> 			imageEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(78);
>+				UMLPackage.eNS_URI).getEClassifiers().get(77);
> 		}
> 		return imageEClass;
> 	}
>@@ -7754,7 +7751,7 @@
> 	public EClass getCombinedFragment() {
> 		if (combinedFragmentEClass == null) {
> 			combinedFragmentEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(190);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(191);
> 		}
> 		return combinedFragmentEClass;
> 	}
>@@ -7797,7 +7794,7 @@
> 	public EClass getContinuation() {
> 		if (continuationEClass == null) {
> 			continuationEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(192);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(193);
> 		}
> 		return continuationEClass;
> 	}
>@@ -7819,7 +7816,7 @@
> 	public EClass getConsiderIgnoreFragment() {
> 		if (considerIgnoreFragmentEClass == null) {
> 			considerIgnoreFragmentEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(193);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(194);
> 		}
> 		return considerIgnoreFragmentEClass;
> 	}
>@@ -7921,7 +7918,7 @@
> 	public EClass getCreateObjectAction() {
> 		if (createObjectActionEClass == null) {
> 			createObjectActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(194);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(195);
> 		}
> 		return createObjectActionEClass;
> 	}
>@@ -7954,7 +7951,7 @@
> 	public EClass getDestroyObjectAction() {
> 		if (destroyObjectActionEClass == null) {
> 			destroyObjectActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(195);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(196);
> 		}
> 		return destroyObjectActionEClass;
> 	}
>@@ -7997,7 +7994,7 @@
> 	public EClass getTestIdentityAction() {
> 		if (testIdentityActionEClass == null) {
> 			testIdentityActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(196);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(197);
> 		}
> 		return testIdentityActionEClass;
> 	}
>@@ -8040,7 +8037,7 @@
> 	public EClass getReadSelfAction() {
> 		if (readSelfActionEClass == null) {
> 			readSelfActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(197);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(198);
> 		}
> 		return readSelfActionEClass;
> 	}
>@@ -8062,7 +8059,7 @@
> 	public EClass getStructuralFeatureAction() {
> 		if (structuralFeatureActionEClass == null) {
> 			structuralFeatureActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(198);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(199);
> 		}
> 		return structuralFeatureActionEClass;
> 	}
>@@ -8095,7 +8092,7 @@
> 	public EClass getReadStructuralFeatureAction() {
> 		if (readStructuralFeatureActionEClass == null) {
> 			readStructuralFeatureActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(199);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(200);
> 		}
> 		return readStructuralFeatureActionEClass;
> 	}
>@@ -8118,7 +8115,7 @@
> 	public EClass getWriteStructuralFeatureAction() {
> 		if (writeStructuralFeatureActionEClass == null) {
> 			writeStructuralFeatureActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(200);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(201);
> 		}
> 		return writeStructuralFeatureActionEClass;
> 	}
>@@ -8138,10 +8135,20 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EReference getWriteStructuralFeatureAction_Result() {
>+		return (EReference) getWriteStructuralFeatureAction()
>+			.getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getClearStructuralFeatureAction() {
> 		if (clearStructuralFeatureActionEClass == null) {
> 			clearStructuralFeatureActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(201);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(202);
> 		}
> 		return clearStructuralFeatureActionEClass;
> 	}
>@@ -8151,10 +8158,20 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EReference getClearStructuralFeatureAction_Result() {
>+		return (EReference) getClearStructuralFeatureAction()
>+			.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getRemoveStructuralFeatureValueAction() {
> 		if (removeStructuralFeatureValueActionEClass == null) {
> 			removeStructuralFeatureValueActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(202);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(203);
> 		}
> 		return removeStructuralFeatureValueActionEClass;
> 	}
>@@ -8187,7 +8204,7 @@
> 	public EClass getAddStructuralFeatureValueAction() {
> 		if (addStructuralFeatureValueActionEClass == null) {
> 			addStructuralFeatureValueActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(203);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(204);
> 		}
> 		return addStructuralFeatureValueActionEClass;
> 	}
>@@ -8220,7 +8237,7 @@
> 	public EClass getLinkAction() {
> 		if (linkActionEClass == null) {
> 			linkActionEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(204);
>+				UMLPackage.eNS_URI).getEClassifiers().get(205);
> 		}
> 		return linkActionEClass;
> 	}
>@@ -8251,7 +8268,7 @@
> 	public EClass getLinkEndData() {
> 		if (linkEndDataEClass == null) {
> 			linkEndDataEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(205);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(206);
> 		}
> 		return linkEndDataEClass;
> 	}
>@@ -8291,7 +8308,7 @@
> 	public EClass getQualifierValue() {
> 		if (qualifierValueEClass == null) {
> 			qualifierValueEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(206);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(207);
> 		}
> 		return qualifierValueEClass;
> 	}
>@@ -8322,7 +8339,7 @@
> 	public EClass getReadLinkAction() {
> 		if (readLinkActionEClass == null) {
> 			readLinkActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(207);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(208);
> 		}
> 		return readLinkActionEClass;
> 	}
>@@ -8344,7 +8361,7 @@
> 	public EClass getLinkEndCreationData() {
> 		if (linkEndCreationDataEClass == null) {
> 			linkEndCreationDataEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(208);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(209);
> 		}
> 		return linkEndCreationDataEClass;
> 	}
>@@ -8377,7 +8394,7 @@
> 	public EClass getCreateLinkAction() {
> 		if (createLinkActionEClass == null) {
> 			createLinkActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(209);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(210);
> 		}
> 		return createLinkActionEClass;
> 	}
>@@ -8390,7 +8407,7 @@
> 	public EClass getWriteLinkAction() {
> 		if (writeLinkActionEClass == null) {
> 			writeLinkActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(210);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(211);
> 		}
> 		return writeLinkActionEClass;
> 	}
>@@ -8403,7 +8420,7 @@
> 	public EClass getDestroyLinkAction() {
> 		if (destroyLinkActionEClass == null) {
> 			destroyLinkActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(211);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(212);
> 		}
> 		return destroyLinkActionEClass;
> 	}
>@@ -8416,7 +8433,7 @@
> 	public EClass getLinkEndDestructionData() {
> 		if (linkEndDestructionDataEClass == null) {
> 			linkEndDestructionDataEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(212);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(213);
> 		}
> 		return linkEndDestructionDataEClass;
> 	}
>@@ -8449,7 +8466,7 @@
> 	public EClass getClearAssociationAction() {
> 		if (clearAssociationActionEClass == null) {
> 			clearAssociationActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(213);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(214);
> 		}
> 		return clearAssociationActionEClass;
> 	}
>@@ -8482,7 +8499,7 @@
> 	public EClass getBroadcastSignalAction() {
> 		if (broadcastSignalActionEClass == null) {
> 			broadcastSignalActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(214);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(215);
> 		}
> 		return broadcastSignalActionEClass;
> 	}
>@@ -8538,7 +8555,7 @@
> 	public EClass getSendObjectAction() {
> 		if (sendObjectActionEClass == null) {
> 			sendObjectActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(215);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(216);
> 		}
> 		return sendObjectActionEClass;
> 	}
>@@ -8571,7 +8588,7 @@
> 	public EClass getValueSpecificationAction() {
> 		if (valueSpecificationActionEClass == null) {
> 			valueSpecificationActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(216);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(217);
> 		}
> 		return valueSpecificationActionEClass;
> 	}
>@@ -8604,7 +8621,7 @@
> 	public EClass getTimeExpression() {
> 		if (timeExpressionEClass == null) {
> 			timeExpressionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(217);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(218);
> 		}
> 		return timeExpressionEClass;
> 	}
>@@ -8635,7 +8652,7 @@
> 	public EClass getObservation() {
> 		if (observationEClass == null) {
> 			observationEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(218);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(219);
> 		}
> 		return observationEClass;
> 	}
>@@ -8648,7 +8665,7 @@
> 	public EClass getDuration() {
> 		if (durationEClass == null) {
> 			durationEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(219);
>+				UMLPackage.eNS_URI).getEClassifiers().get(220);
> 		}
> 		return durationEClass;
> 	}
>@@ -8701,7 +8718,7 @@
> 	public EClass getDurationInterval() {
> 		if (durationIntervalEClass == null) {
> 			durationIntervalEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(220);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(221);
> 		}
> 		return durationIntervalEClass;
> 	}
>@@ -8714,7 +8731,7 @@
> 	public EClass getInterval() {
> 		if (intervalEClass == null) {
> 			intervalEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(221);
>+				UMLPackage.eNS_URI).getEClassifiers().get(222);
> 		}
> 		return intervalEClass;
> 	}
>@@ -8745,7 +8762,7 @@
> 	public EClass getTimeConstraint() {
> 		if (timeConstraintEClass == null) {
> 			timeConstraintEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(222);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(223);
> 		}
> 		return timeConstraintEClass;
> 	}
>@@ -8767,7 +8784,7 @@
> 	public EClass getIntervalConstraint() {
> 		if (intervalConstraintEClass == null) {
> 			intervalConstraintEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(223);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(224);
> 		}
> 		return intervalConstraintEClass;
> 	}
>@@ -8780,7 +8797,7 @@
> 	public EClass getTimeInterval() {
> 		if (timeIntervalEClass == null) {
> 			timeIntervalEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(224);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(225);
> 		}
> 		return timeIntervalEClass;
> 	}
>@@ -8793,7 +8810,7 @@
> 	public EClass getDurationConstraint() {
> 		if (durationConstraintEClass == null) {
> 			durationConstraintEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(225);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(226);
> 		}
> 		return durationConstraintEClass;
> 	}
>@@ -8816,7 +8833,7 @@
> 	public EClass getTimeObservation() {
> 		if (timeObservationEClass == null) {
> 			timeObservationEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(226);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(227);
> 		}
> 		return timeObservationEClass;
> 	}
>@@ -8849,7 +8866,7 @@
> 	public EClass getDurationObservation() {
> 		if (durationObservationEClass == null) {
> 			durationObservationEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(227);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(228);
> 		}
> 		return durationObservationEClass;
> 	}
>@@ -9051,7 +9068,7 @@
> 	public EClass getInformationItem() {
> 		if (informationItemEClass == null) {
> 			informationItemEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(238);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(239);
> 		}
> 		return informationItemEClass;
> 	}
>@@ -9074,7 +9091,7 @@
> 	public EClass getInformationFlow() {
> 		if (informationFlowEClass == null) {
> 			informationFlowEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(239);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(240);
> 		}
> 		return informationFlowEClass;
> 	}
>@@ -9157,7 +9174,7 @@
> 	public EClass getModel() {
> 		if (modelEClass == null) {
> 			modelEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(80);
>+				UMLPackage.eNS_URI).getEClassifiers().get(79);
> 		}
> 		return modelEClass;
> 	}
>@@ -9179,7 +9196,7 @@
> 	public EClass getVariableAction() {
> 		if (variableActionEClass == null) {
> 			variableActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(230);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(231);
> 		}
> 		return variableActionEClass;
> 	}
>@@ -9201,7 +9218,7 @@
> 	public EClass getReadVariableAction() {
> 		if (readVariableActionEClass == null) {
> 			readVariableActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(231);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(232);
> 		}
> 		return readVariableActionEClass;
> 	}
>@@ -9224,7 +9241,7 @@
> 	public EClass getWriteVariableAction() {
> 		if (writeVariableActionEClass == null) {
> 			writeVariableActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(232);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(233);
> 		}
> 		return writeVariableActionEClass;
> 	}
>@@ -9247,7 +9264,7 @@
> 	public EClass getClearVariableAction() {
> 		if (clearVariableActionEClass == null) {
> 			clearVariableActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(233);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(234);
> 		}
> 		return clearVariableActionEClass;
> 	}
>@@ -9260,7 +9277,7 @@
> 	public EClass getAddVariableValueAction() {
> 		if (addVariableValueActionEClass == null) {
> 			addVariableValueActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(234);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(235);
> 		}
> 		return addVariableValueActionEClass;
> 	}
>@@ -9293,7 +9310,7 @@
> 	public EClass getRemoveVariableValueAction() {
> 		if (removeVariableValueActionEClass == null) {
> 			removeVariableValueActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(235);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(236);
> 		}
> 		return removeVariableValueActionEClass;
> 	}
>@@ -9326,7 +9343,7 @@
> 	public EClass getRaiseExceptionAction() {
> 		if (raiseExceptionActionEClass == null) {
> 			raiseExceptionActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(236);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(237);
> 		}
> 		return raiseExceptionActionEClass;
> 	}
>@@ -9349,7 +9366,7 @@
> 	public EClass getActionInputPin() {
> 		if (actionInputPinEClass == null) {
> 			actionInputPinEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(237);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(238);
> 		}
> 		return actionInputPinEClass;
> 	}
>@@ -9371,7 +9388,7 @@
> 	public EClass getReadExtentAction() {
> 		if (readExtentActionEClass == null) {
> 			readExtentActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(240);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(241);
> 		}
> 		return readExtentActionEClass;
> 	}
>@@ -9404,7 +9421,7 @@
> 	public EClass getReclassifyObjectAction() {
> 		if (reclassifyObjectActionEClass == null) {
> 			reclassifyObjectActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(241);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(242);
> 		}
> 		return reclassifyObjectActionEClass;
> 	}
>@@ -9457,7 +9474,7 @@
> 	public EClass getReadIsClassifiedObjectAction() {
> 		if (readIsClassifiedObjectActionEClass == null) {
> 			readIsClassifiedObjectActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(242);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(243);
> 		}
> 		return readIsClassifiedObjectActionEClass;
> 	}
>@@ -9510,7 +9527,7 @@
> 	public EClass getStartClassifierBehaviorAction() {
> 		if (startClassifierBehaviorActionEClass == null) {
> 			startClassifierBehaviorActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(243);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(244);
> 		}
> 		return startClassifierBehaviorActionEClass;
> 	}
>@@ -9533,7 +9550,7 @@
> 	public EClass getReadLinkObjectEndAction() {
> 		if (readLinkObjectEndActionEClass == null) {
> 			readLinkObjectEndActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(244);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(245);
> 		}
> 		return readLinkObjectEndActionEClass;
> 	}
>@@ -9576,7 +9593,7 @@
> 	public EClass getReadLinkObjectEndQualifierAction() {
> 		if (readLinkObjectEndQualifierActionEClass == null) {
> 			readLinkObjectEndQualifierActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(245);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(246);
> 		}
> 		return readLinkObjectEndQualifierActionEClass;
> 	}
>@@ -9619,7 +9636,7 @@
> 	public EClass getCreateLinkObjectAction() {
> 		if (createLinkObjectActionEClass == null) {
> 			createLinkObjectActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(246);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(247);
> 		}
> 		return createLinkObjectActionEClass;
> 	}
>@@ -9642,7 +9659,7 @@
> 	public EClass getAcceptEventAction() {
> 		if (acceptEventActionEClass == null) {
> 			acceptEventActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(247);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(248);
> 		}
> 		return acceptEventActionEClass;
> 	}
>@@ -9685,7 +9702,7 @@
> 	public EClass getAcceptCallAction() {
> 		if (acceptCallActionEClass == null) {
> 			acceptCallActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(248);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(249);
> 		}
> 		return acceptCallActionEClass;
> 	}
>@@ -9708,7 +9725,7 @@
> 	public EClass getReplyAction() {
> 		if (replyActionEClass == null) {
> 			replyActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(249);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(250);
> 		}
> 		return replyActionEClass;
> 	}
>@@ -9748,7 +9765,7 @@
> 	public EClass getUnmarshallAction() {
> 		if (unmarshallActionEClass == null) {
> 			unmarshallActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(250);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(251);
> 		}
> 		return unmarshallActionEClass;
> 	}
>@@ -9791,7 +9808,7 @@
> 	public EClass getReduceAction() {
> 		if (reduceActionEClass == null) {
> 			reduceActionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(251);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(252);
> 		}
> 		return reduceActionEClass;
> 	}
>@@ -9837,6 +9854,29 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EClass getStartObjectBehaviorAction() {
>+		if (startObjectBehaviorActionEClass == null) {
>+			startObjectBehaviorActionEClass = (EClass) EPackage.Registry.INSTANCE
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(253);
>+		}
>+		return startObjectBehaviorActionEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getStartObjectBehaviorAction_Object() {
>+		return (EReference) getStartObjectBehaviorAction()
>+			.getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getControlNode() {
> 		if (controlNodeEClass == null) {
> 			controlNodeEClass = (EClass) EPackage.Registry.INSTANCE
>@@ -9986,10 +10026,19 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EReference getDecisionNode_DecisionInputFlow() {
>+		return (EReference) getDecisionNode().getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getActivityFinalNode() {
> 		if (activityFinalNodeEClass == null) {
> 			activityFinalNodeEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(183);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(184);
> 		}
> 		return activityFinalNodeEClass;
> 	}
>@@ -10002,7 +10051,7 @@
> 	public EClass getJoinNode() {
> 		if (joinNodeEClass == null) {
> 			joinNodeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(252);
>+				UMLPackage.eNS_URI).getEClassifiers().get(254);
> 		}
> 		return joinNodeEClass;
> 	}
>@@ -10033,7 +10082,7 @@
> 	public EClass getDataStoreNode() {
> 		if (dataStoreNodeEClass == null) {
> 			dataStoreNodeEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(253);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(255);
> 		}
> 		return dataStoreNodeEClass;
> 	}
>@@ -10046,7 +10095,7 @@
> 	public EClass getObjectFlow() {
> 		if (objectFlowEClass == null) {
> 			objectFlowEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(254);
>+				UMLPackage.eNS_URI).getEClassifiers().get(183);
> 		}
> 		return objectFlowEClass;
> 	}
>@@ -10117,7 +10166,7 @@
> 	public EClass getConditionalNode() {
> 		if (conditionalNodeEClass == null) {
> 			conditionalNodeEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(255);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(256);
> 		}
> 		return conditionalNodeEClass;
> 	}
>@@ -10170,7 +10219,7 @@
> 	public EClass getClause() {
> 		if (clauseEClass == null) {
> 			clauseEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(256);
>+				UMLPackage.eNS_URI).getEClassifiers().get(257);
> 		}
> 		return clauseEClass;
> 	}
>@@ -10237,7 +10286,7 @@
> 	public EClass getLoopNode() {
> 		if (loopNodeEClass == null) {
> 			loopNodeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(257);
>+				UMLPackage.eNS_URI).getEClassifiers().get(258);
> 		}
> 		return loopNodeEClass;
> 	}
>@@ -10331,7 +10380,7 @@
> 	public EClass getExpansionNode() {
> 		if (expansionNodeEClass == null) {
> 			expansionNodeEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(258);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(259);
> 		}
> 		return expansionNodeEClass;
> 	}
>@@ -10362,7 +10411,7 @@
> 	public EClass getExpansionRegion() {
> 		if (expansionRegionEClass == null) {
> 			expansionRegionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(259);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(260);
> 		}
> 		return expansionRegionEClass;
> 	}
>@@ -10405,7 +10454,7 @@
> 	public EClass getComponentRealization() {
> 		if (componentRealizationEClass == null) {
> 			componentRealizationEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(184);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(185);
> 		}
> 		return componentRealizationEClass;
> 	}
>@@ -10438,7 +10487,7 @@
> 	public EClass getComponent() {
> 		if (componentEClass == null) {
> 			componentEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(185);
>+				UMLPackage.eNS_URI).getEClassifiers().get(186);
> 		}
> 		return componentEClass;
> 	}
>@@ -10496,7 +10545,7 @@
> 	public EClass getNode() {
> 		if (nodeEClass == null) {
> 			nodeEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(186);
>+				UMLPackage.eNS_URI).getEClassifiers().get(187);
> 		}
> 		return nodeEClass;
> 	}
>@@ -10518,7 +10567,7 @@
> 	public EClass getDevice() {
> 		if (deviceEClass == null) {
> 			deviceEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(188);
>+				UMLPackage.eNS_URI).getEClassifiers().get(189);
> 		}
> 		return deviceEClass;
> 	}
>@@ -10531,7 +10580,7 @@
> 	public EClass getExecutionEnvironment() {
> 		if (executionEnvironmentEClass == null) {
> 			executionEnvironmentEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(189);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(190);
> 		}
> 		return executionEnvironmentEClass;
> 	}
>@@ -10544,7 +10593,7 @@
> 	public EClass getCommunicationPath() {
> 		if (communicationPathEClass == null) {
> 			communicationPathEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(187);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(188);
> 		}
> 		return communicationPathEClass;
> 	}
>@@ -10557,7 +10606,7 @@
> 	public EClass getFinalState() {
> 		if (finalStateEClass == null) {
> 			finalStateEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(228);
>+				UMLPackage.eNS_URI).getEClassifiers().get(229);
> 		}
> 		return finalStateEClass;
> 	}
>@@ -10570,7 +10619,7 @@
> 	public EClass getTimeEvent() {
> 		if (timeEventEClass == null) {
> 			timeEventEClass = (EClass) EPackage.Registry.INSTANCE.getEPackage(
>-				UMLPackage.eNS_URI).getEClassifiers().get(229);
>+				UMLPackage.eNS_URI).getEClassifiers().get(230);
> 		}
> 		return timeEventEClass;
> 	}
>@@ -10601,7 +10650,7 @@
> 	public EClass getProtocolTransition() {
> 		if (protocolTransitionEClass == null) {
> 			protocolTransitionEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(261);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(262);
> 		}
> 		return protocolTransitionEClass;
> 	}
>@@ -10644,7 +10693,7 @@
> 	public EClass getAssociationClass() {
> 		if (associationClassEClass == null) {
> 			associationClassEClass = (EClass) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(262);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(263);
> 		}
> 		return associationClassEClass;
> 	}
>@@ -10670,7 +10719,7 @@
> 	public EEnum getCallConcurrencyKind() {
> 		if (callConcurrencyKindEEnum == null) {
> 			callConcurrencyKindEEnum = (EEnum) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(82);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(81);
> 		}
> 		return callConcurrencyKindEEnum;
> 	}
>@@ -10683,7 +10732,7 @@
> 	public EEnum getTransitionKind() {
> 		if (transitionKindEEnum == null) {
> 			transitionKindEEnum = (EEnum) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(62);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(61);
> 		}
> 		return transitionKindEEnum;
> 	}
>@@ -10696,7 +10745,7 @@
> 	public EEnum getPseudostateKind() {
> 		if (pseudostateKindEEnum == null) {
> 			pseudostateKindEEnum = (EEnum) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(69);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(68);
> 		}
> 		return pseudostateKindEEnum;
> 	}
>@@ -10709,7 +10758,7 @@
> 	public EEnum getAggregationKind() {
> 		if (aggregationKindEEnum == null) {
> 			aggregationKindEEnum = (EEnum) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(86);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(85);
> 		}
> 		return aggregationKindEEnum;
> 	}
>@@ -10748,7 +10797,7 @@
> 	public EEnum getConnectorKind() {
> 		if (connectorKindEEnum == null) {
> 			connectorKindEEnum = (EEnum) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(74);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(73);
> 		}
> 		return connectorKindEEnum;
> 	}
>@@ -10800,7 +10849,7 @@
> 	public EEnum getInteractionOperatorKind() {
> 		if (interactionOperatorKindEEnum == null) {
> 			interactionOperatorKindEEnum = (EEnum) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(191);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(192);
> 		}
> 		return interactionOperatorKindEEnum;
> 	}
>@@ -10813,7 +10862,7 @@
> 	public EEnum getExpansionKind() {
> 		if (expansionKindEEnum == null) {
> 			expansionKindEEnum = (EEnum) EPackage.Registry.INSTANCE
>-				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(260);
>+				.getEPackage(UMLPackage.eNS_URI).getEClassifiers().get(261);
> 		}
> 		return expansionKindEEnum;
> 	}
>Index: src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java,v
>retrieving revision 1.19
>diff -u -r1.19 ComponentRealizationImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java	25 Apr 2007 17:47:03 -0000	1.19
>+++ src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -56,7 +56,7 @@
> * <li>{@link org.eclipse.uml2.uml.internal.impl.ComponentRealizationImpl#getClients Client}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.ComponentRealizationImpl#getSuppliers Supplier}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.ComponentRealizationImpl#getAbstraction Abstraction}</li>
>- * <li>{@link org.eclipse.uml2.uml.internal.impl.ComponentRealizationImpl#getRealizingClassifier Realizing Classifier}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.ComponentRealizationImpl#getRealizingClassifiers Realizing Classifier}</li>
> * </ul>
> * 
> *
>@@ -67,14 +67,14 @@
> 		implements ComponentRealization {
> 
> 	/**
>-	 * The cached value of the '{@link #getRealizingClassifier() Realizing Classifier}' reference.
>+	 * The cached value of the '{@link #getRealizingClassifiers() Realizing Classifier}' reference list.
> 	 * 
> 	 * 
>-	 * @see #getRealizingClassifier()
>+	 * @see #getRealizingClassifiers()
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Classifier realizingClassifier;
>+	protected EList<Classifier> realizingClassifiers;
> 
> 	/**
> 	 * 
>@@ -234,27 +234,33 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public Classifier getRealizingClassifier() {
>-		if (realizingClassifier != null && realizingClassifier.eIsProxy()) {
>-			InternalEObject oldRealizingClassifier = (InternalEObject) realizingClassifier;
>-			realizingClassifier = (Classifier) eResolveProxy(oldRealizingClassifier);
>-			if (realizingClassifier != oldRealizingClassifier) {
>-				if (eNotificationRequired())
>-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
>-						UMLPackage.COMPONENT_REALIZATION__REALIZING_CLASSIFIER,
>-						oldRealizingClassifier, realizingClassifier));
>-			}
>+	public EList<Classifier> getRealizingClassifiers() {
>+		if (realizingClassifiers == null) {
>+			realizingClassifiers = new SubsetSupersetEObjectResolvingEList<Classifier>(
>+				Classifier.class, this,
>+				UMLPackage.COMPONENT_REALIZATION__REALIZING_CLASSIFIER,
>+				REALIZING_CLASSIFIER_ESUPERSETS, null);
> 		}
>-		return realizingClassifier;
>+		return realizingClassifiers;
> 	}
> 
> 	/**
>+	 * The array of superset feature identifiers for the '{@link #getRealizingClassifiers() Realizing Classifier}' reference list.
>+	 * 
>+	 * 
>+	 * @see #getRealizingClassifiers()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final int[] REALIZING_CLASSIFIER_ESUPERSETS = new int[]{UMLPackage.COMPONENT_REALIZATION__SUPPLIER};
>+
>+	/**
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
>-	public Classifier basicGetRealizingClassifier() {
>-		return realizingClassifier;
>+	public Classifier getRealizingClassifier(String name) {
>+		return getRealizingClassifier(name, false, null);
> 	}
> 
> 	/**
>@@ -262,22 +268,18 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public void setRealizingClassifier(Classifier newRealizingClassifier) {
>-		Classifier oldRealizingClassifier = realizingClassifier;
>-		realizingClassifier = newRealizingClassifier;
>-		if (eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET,
>-				UMLPackage.COMPONENT_REALIZATION__REALIZING_CLASSIFIER,
>-				oldRealizingClassifier, realizingClassifier));
>-		Resource.Internal eInternalResource = eInternalResource();
>-		if (eInternalResource == null || !eInternalResource.isLoading()) {
>-			if (newRealizingClassifier != null) {
>-				EList<NamedElement> suppliers = getSuppliers();
>-				if (!suppliers.contains(newRealizingClassifier)) {
>-					suppliers.add(newRealizingClassifier);
>-				}
>-			}
>+	public Classifier getRealizingClassifier(String name, boolean ignoreCase,
>+			EClass eClass) {
>+		realizingClassifierLoop : for (Classifier realizingClassifier : getRealizingClassifiers()) {
>+			if (eClass != null && !eClass.isInstance(realizingClassifier))
>+				continue realizingClassifierLoop;
>+			if (name != null && !(ignoreCase
>+				? name.equalsIgnoreCase(realizingClassifier.getName())
>+				: name.equals(realizingClassifier.getName())))
>+				continue realizingClassifierLoop;
>+			return realizingClassifier;
> 		}
>+		return null;
> 	}
> 
> 	/**
>@@ -436,9 +438,7 @@
> 					return getAbstraction();
> 				return basicGetAbstraction();
> 			case UMLPackage.COMPONENT_REALIZATION__REALIZING_CLASSIFIER :
>-				if (resolve)
>-					return getRealizingClassifier();
>-				return basicGetRealizingClassifier();
>+				return getRealizingClassifiers();
> 		}
> 		return eDynamicGet(featureID, resolve, coreType);
> 	}
>@@ -499,7 +499,9 @@
> 				setAbstraction((Component) newValue);
> 				return;
> 			case UMLPackage.COMPONENT_REALIZATION__REALIZING_CLASSIFIER :
>-				setRealizingClassifier((Classifier) newValue);
>+				getRealizingClassifiers().clear();
>+				getRealizingClassifiers().addAll(
>+					(Collection<? extends Classifier>) newValue);
> 				return;
> 		}
> 		eDynamicSet(featureID, newValue);
>@@ -550,7 +552,7 @@
> 				setAbstraction((Component) null);
> 				return;
> 			case UMLPackage.COMPONENT_REALIZATION__REALIZING_CLASSIFIER :
>-				setRealizingClassifier((Classifier) null);
>+				getRealizingClassifiers().clear();
> 				return;
> 		}
> 		eDynamicUnset(featureID);
>@@ -606,7 +608,8 @@
> 			case UMLPackage.COMPONENT_REALIZATION__ABSTRACTION :
> 				return basicGetAbstraction() != null;
> 			case UMLPackage.COMPONENT_REALIZATION__REALIZING_CLASSIFIER :
>-				return realizingClassifier != null;
>+				return realizingClassifiers != null
>+					&& !realizingClassifiers.isEmpty();
> 		}
> 		return eDynamicIsSet(featureID);
> 	}
>Index: src/org/eclipse/uml2/uml/internal/impl/ParameterImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterImpl.java,v
>retrieving revision 1.40
>diff -u -r1.40 ParameterImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/ParameterImpl.java	21 Apr 2008 16:32:41 -0000	1.40
>+++ src/org/eclipse/uml2/uml/internal/impl/ParameterImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -39,7 +39,6 @@
> import org.eclipse.uml2.common.util.DerivedUnionEObjectEList;
> 
> import org.eclipse.uml2.uml.Comment;
>-import org.eclipse.uml2.uml.ConnectorEnd;
> import org.eclipse.uml2.uml.Dependency;
> import org.eclipse.uml2.uml.Element;
> import org.eclipse.uml2.uml.MultiplicityElement;
>@@ -1053,17 +1052,6 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateUpperGt0(DiagnosticChain diagnostics,
>-			Map<Object, Object> context) {
>-		return MultiplicityElementOperations.validateUpperGt0(this,
>-			diagnostics, context);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public boolean validateLowerGe0(DiagnosticChain diagnostics,
> 			Map<Object, Object> context) {
> 		return MultiplicityElementOperations.validateLowerGe0(this,
>@@ -1476,10 +1464,6 @@
> 			case UMLPackage.PARAMETER__TEMPLATE_PARAMETER :
> 				setTemplateParameter((TemplateParameter) newValue);
> 				return;
>-			case UMLPackage.PARAMETER__END :
>-				getEnds().clear();
>-				getEnds().addAll((Collection<? extends ConnectorEnd>) newValue);
>-				return;
> 			case UMLPackage.PARAMETER__IS_ORDERED :
> 				setIsOrdered(((Boolean) newValue).booleanValue());
> 				return;
>@@ -1571,9 +1555,6 @@
> 			case UMLPackage.PARAMETER__TEMPLATE_PARAMETER :
> 				setTemplateParameter((TemplateParameter) null);
> 				return;
>-			case UMLPackage.PARAMETER__END :
>-				getEnds().clear();
>-				return;
> 			case UMLPackage.PARAMETER__IS_ORDERED :
> 				setIsOrdered(IS_ORDERED_EDEFAULT);
> 				return;
>Index: src/org/eclipse/uml2/uml/internal/impl/RemoveStructuralFeatureValueActionImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveStructuralFeatureValueActionImpl.java,v
>retrieving revision 1.27
>diff -u -r1.27 RemoveStructuralFeatureValueActionImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/RemoveStructuralFeatureValueActionImpl.java	21 Apr 2008 16:32:41 -0000	1.27
>+++ src/org/eclipse/uml2/uml/internal/impl/RemoveStructuralFeatureValueActionImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -46,6 +46,7 @@
> import org.eclipse.uml2.uml.ExceptionHandler;
> import org.eclipse.uml2.uml.InputPin;
> import org.eclipse.uml2.uml.InterruptibleActivityRegion;
>+import org.eclipse.uml2.uml.OutputPin;
> import org.eclipse.uml2.uml.RemoveStructuralFeatureValueAction;
> import org.eclipse.uml2.uml.StringExpression;
> import org.eclipse.uml2.uml.StructuralFeature;
>@@ -368,6 +369,8 @@
> 				return basicSetObject(null, msgs);
> 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__VALUE :
> 				return basicSetValue(null, msgs);
>+			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__RESULT :
>+				return basicSetResult(null, msgs);
> 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT :
> 				return basicSetRemoveAt(null, msgs);
> 		}
>@@ -462,6 +465,10 @@
> 				if (resolve)
> 					return getValue();
> 				return basicGetValue();
>+			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__RESULT :
>+				if (resolve)
>+					return getResult();
>+				return basicGetResult();
> 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REMOVE_DUPLICATES :
> 				return isRemoveDuplicates()
> 					? Boolean.TRUE
>@@ -566,6 +573,9 @@
> 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__VALUE :
> 				setValue((InputPin) newValue);
> 				return;
>+			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__RESULT :
>+				setResult((OutputPin) newValue);
>+				return;
> 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REMOVE_DUPLICATES :
> 				setIsRemoveDuplicates(((Boolean) newValue).booleanValue());
> 				return;
>@@ -644,6 +654,9 @@
> 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__VALUE :
> 				setValue((InputPin) null);
> 				return;
>+			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__RESULT :
>+				setResult((OutputPin) null);
>+				return;
> 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REMOVE_DUPLICATES :
> 				setIsRemoveDuplicates(IS_REMOVE_DUPLICATES_EDEFAULT);
> 				return;
>@@ -728,6 +741,8 @@
> 				return object != null;
> 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__VALUE :
> 				return value != null;
>+			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__RESULT :
>+				return result != null;
> 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REMOVE_DUPLICATES :
> 				return ((eFlags & IS_REMOVE_DUPLICATES_EFLAG) != 0) != IS_REMOVE_DUPLICATES_EDEFAULT;
> 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT :
>Index: src/org/eclipse/uml2/uml/internal/impl/PropertyImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PropertyImpl.java,v
>retrieving revision 1.45
>diff -u -r1.45 PropertyImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/PropertyImpl.java	21 Apr 2008 16:32:42 -0000	1.45
>+++ src/org/eclipse/uml2/uml/internal/impl/PropertyImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -59,10 +59,7 @@
> import org.eclipse.uml2.uml.Property;
> import org.eclipse.uml2.uml.RedefinableElement;
> import org.eclipse.uml2.uml.StringExpression;
>-import org.eclipse.uml2.uml.TemplateBinding;
> import org.eclipse.uml2.uml.TemplateParameter;
>-import org.eclipse.uml2.uml.TemplateSignature;
>-import org.eclipse.uml2.uml.TemplateableElement;
> import org.eclipse.uml2.uml.Type;
> import org.eclipse.uml2.uml.UMLPackage;
> import org.eclipse.uml2.uml.ValueSpecification;
>@@ -72,7 +69,6 @@
> import org.eclipse.uml2.uml.internal.operations.DeploymentTargetOperations;
> import org.eclipse.uml2.uml.internal.operations.ParameterableElementOperations;
> import org.eclipse.uml2.uml.internal.operations.PropertyOperations;
>-import org.eclipse.uml2.uml.internal.operations.TemplateableElementOperations;
> 
> /**
> * 
>@@ -89,8 +85,6 @@
> * <li>{@link org.eclipse.uml2.uml.internal.impl.PropertyImpl#getClientDependencies Client Dependency}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.PropertyImpl#getDeployments Deployment}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.PropertyImpl#getDeployedElements Deployed Element}</li>
>- * <li>{@link org.eclipse.uml2.uml.internal.impl.PropertyImpl#getTemplateBindings Template Binding}</li>
>- * <li>{@link org.eclipse.uml2.uml.internal.impl.PropertyImpl#getOwnedTemplateSignature Owned Template Signature}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.PropertyImpl#getNamespace Namespace}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.PropertyImpl#getFeaturingClassifiers Featuring Classifier}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.PropertyImpl#getRedefinedElements Redefined Element}</li>
>@@ -140,28 +134,6 @@
> 	protected EList<Deployment> deployments;
> 
> 	/**
>-	 * The cached value of the '{@link #getTemplateBindings() Template Binding}' containment reference list.
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @see #getTemplateBindings()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected EList<TemplateBinding> templateBindings;
>-
>-	/**
>-	 * The cached value of the '{@link #getOwnedTemplateSignature() Owned Template Signature}' containment reference.
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @see #getOwnedTemplateSignature()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected TemplateSignature ownedTemplateSignature;
>-
>-	/**
> 	 * The cached value of the '{@link #getAssociation() Association}' reference.
> 	 * 
> 	 * 
>@@ -693,179 +665,6 @@
> 
> 	/**
> 	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 */
>-	public EList<TemplateBinding> getTemplateBindings() {
>-		if (templateBindings == null) {
>-			templateBindings = new EObjectContainmentWithInverseEList.Resolving<TemplateBinding>(
>-				TemplateBinding.class, this,
>-				UMLPackage.PROPERTY__TEMPLATE_BINDING,
>-				UMLPackage.TEMPLATE_BINDING__BOUND_ELEMENT);
>-		}
>-		return templateBindings;
>-	}
>-
>-	/**
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 */
>-	public TemplateBinding createTemplateBinding(TemplateSignature signature) {
>-		TemplateBinding newTemplateBinding = (TemplateBinding) create(UMLPackage.Literals.TEMPLATE_BINDING);
>-		getTemplateBindings().add(newTemplateBinding);
>-		if (signature != null)
>-			newTemplateBinding.setSignature(signature);
>-		return newTemplateBinding;
>-	}
>-
>-	/**
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 */
>-	public TemplateBinding getTemplateBinding(TemplateSignature signature) {
>-		return getTemplateBinding(signature, false);
>-	}
>-
>-	/**
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 */
>-	public TemplateBinding getTemplateBinding(TemplateSignature signature,
>-			boolean createOnDemand) {
>-		templateBindingLoop : for (TemplateBinding templateBinding : getTemplateBindings()) {
>-			if (signature != null
>-				&& !signature.equals(templateBinding.getSignature()))
>-				continue templateBindingLoop;
>-			return templateBinding;
>-		}
>-		return createOnDemand
>-			? createTemplateBinding(signature)
>-			: null;
>-	}
>-
>-	/**
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 */
>-	public TemplateSignature getOwnedTemplateSignature() {
>-		if (ownedTemplateSignature != null && ownedTemplateSignature.eIsProxy()) {
>-			InternalEObject oldOwnedTemplateSignature = (InternalEObject) ownedTemplateSignature;
>-			ownedTemplateSignature = (TemplateSignature) eResolveProxy(oldOwnedTemplateSignature);
>-			if (ownedTemplateSignature != oldOwnedTemplateSignature) {
>-				InternalEObject newOwnedTemplateSignature = (InternalEObject) ownedTemplateSignature;
>-				NotificationChain msgs = oldOwnedTemplateSignature
>-					.eInverseRemove(this,
>-						UMLPackage.TEMPLATE_SIGNATURE__TEMPLATE,
>-						TemplateSignature.class, null);
>-				if (newOwnedTemplateSignature.eInternalContainer() == null) {
>-					msgs = newOwnedTemplateSignature.eInverseAdd(this,
>-						UMLPackage.TEMPLATE_SIGNATURE__TEMPLATE,
>-						TemplateSignature.class, msgs);
>-				}
>-				if (msgs != null)
>-					msgs.dispatch();
>-				if (eNotificationRequired())
>-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
>-						UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE,
>-						oldOwnedTemplateSignature, ownedTemplateSignature));
>-			}
>-		}
>-		return ownedTemplateSignature;
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public TemplateSignature basicGetOwnedTemplateSignature() {
>-		return ownedTemplateSignature;
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public NotificationChain basicSetOwnedTemplateSignature(
>-			TemplateSignature newOwnedTemplateSignature, NotificationChain msgs) {
>-		TemplateSignature oldOwnedTemplateSignature = ownedTemplateSignature;
>-		ownedTemplateSignature = newOwnedTemplateSignature;
>-		if (eNotificationRequired()) {
>-			ENotificationImpl notification = new ENotificationImpl(this,
>-				Notification.SET,
>-				UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE,
>-				oldOwnedTemplateSignature, newOwnedTemplateSignature);
>-			if (msgs == null)
>-				msgs = notification;
>-			else
>-				msgs.add(notification);
>-		}
>-		return msgs;
>-	}
>-
>-	/**
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 */
>-	public void setOwnedTemplateSignature(
>-			TemplateSignature newOwnedTemplateSignature) {
>-		if (newOwnedTemplateSignature != ownedTemplateSignature) {
>-			NotificationChain msgs = null;
>-			if (ownedTemplateSignature != null)
>-				msgs = ((InternalEObject) ownedTemplateSignature)
>-					.eInverseRemove(this,
>-						UMLPackage.TEMPLATE_SIGNATURE__TEMPLATE,
>-						TemplateSignature.class, msgs);
>-			if (newOwnedTemplateSignature != null)
>-				msgs = ((InternalEObject) newOwnedTemplateSignature)
>-					.eInverseAdd(this, UMLPackage.TEMPLATE_SIGNATURE__TEMPLATE,
>-						TemplateSignature.class, msgs);
>-			msgs = basicSetOwnedTemplateSignature(newOwnedTemplateSignature,
>-				msgs);
>-			if (msgs != null)
>-				msgs.dispatch();
>-		} else if (eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET,
>-				UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE,
>-				newOwnedTemplateSignature, newOwnedTemplateSignature));
>-	}
>-
>-	/**
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 */
>-	public TemplateSignature createOwnedTemplateSignature(EClass eClass) {
>-		TemplateSignature newOwnedTemplateSignature = (TemplateSignature) create(eClass);
>-		setOwnedTemplateSignature(newOwnedTemplateSignature);
>-		return newOwnedTemplateSignature;
>-	}
>-
>-	/**
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 */
>-	public TemplateSignature createOwnedTemplateSignature() {
>-		return createOwnedTemplateSignature(UMLPackage.Literals.TEMPLATE_SIGNATURE);
>-	}
>-
>-	/**
>-	 * 
> 	 * 
> 	 * @generated
> 	 */
>@@ -1736,40 +1535,6 @@
> 
> 	/**
> 	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 */
>-	public EList<ParameterableElement> parameterableElements() {
>-		CacheAdapter cache = getCacheAdapter();
>-		if (cache != null) {
>-			@SuppressWarnings("unchecked")
>-			EList<ParameterableElement> result = (EList<ParameterableElement>) cache
>-				.get(this, UMLPackage.Literals.TEMPLATEABLE_ELEMENT
>-					.getEOperations().get(0));
>-			if (result == null) {
>-				cache.put(this, UMLPackage.Literals.TEMPLATEABLE_ELEMENT
>-					.getEOperations().get(0),
>-					result = TemplateableElementOperations
>-						.parameterableElements(this));
>-			}
>-			return result;
>-		}
>-		return TemplateableElementOperations.parameterableElements(this);
>-	}
>-
>-	/**
>-	 * 
>-	 * @deprecated
>-	 * 
>-	 * @generated
>-	 */
>-	public boolean isTemplate() {
>-		return TemplateableElementOperations.isTemplate(this);
>-	}
>-
>-	/**
>-	 * 
> 	 * 
> 	 * @generated
> 	 */
>@@ -2022,17 +1787,6 @@
> 			case UMLPackage.PROPERTY__DEPLOYMENT :
> 				return ((InternalEList<InternalEObject>) (InternalEList<?>) getDeployments())
> 					.basicAdd(otherEnd, msgs);
>-			case UMLPackage.PROPERTY__TEMPLATE_BINDING :
>-				return ((InternalEList<InternalEObject>) (InternalEList<?>) getTemplateBindings())
>-					.basicAdd(otherEnd, msgs);
>-			case UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE :
>-				if (ownedTemplateSignature != null)
>-					msgs = ((InternalEObject) ownedTemplateSignature)
>-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
>-							- UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE,
>-							null, msgs);
>-				return basicSetOwnedTemplateSignature(
>-					(TemplateSignature) otherEnd, msgs);
> 			case UMLPackage.PROPERTY__DATATYPE :
> 				if (eInternalContainer() != null)
> 					msgs = eBasicRemoveFromContainer(msgs);
>@@ -2089,11 +1843,6 @@
> 			case UMLPackage.PROPERTY__DEPLOYMENT :
> 				return ((InternalEList<?>) getDeployments()).basicRemove(
> 					otherEnd, msgs);
>-			case UMLPackage.PROPERTY__TEMPLATE_BINDING :
>-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
>-					otherEnd, msgs);
>-			case UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE :
>-				return basicSetOwnedTemplateSignature(null, msgs);
> 			case UMLPackage.PROPERTY__DATATYPE :
> 				return basicSetDatatype(null, msgs);
> 			case UMLPackage.PROPERTY__OWNING_ASSOCIATION :
>@@ -2229,12 +1978,6 @@
> 				return getDeployments();
> 			case UMLPackage.PROPERTY__DEPLOYED_ELEMENT :
> 				return getDeployedElements();
>-			case UMLPackage.PROPERTY__TEMPLATE_BINDING :
>-				return getTemplateBindings();
>-			case UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE :
>-				if (resolve)
>-					return getOwnedTemplateSignature();
>-				return basicGetOwnedTemplateSignature();
> 			case UMLPackage.PROPERTY__CLASS :
> 				if (resolve)
> 					return getClass_();
>@@ -2358,23 +2101,11 @@
> 			case UMLPackage.PROPERTY__TEMPLATE_PARAMETER :
> 				setTemplateParameter((TemplateParameter) newValue);
> 				return;
>-			case UMLPackage.PROPERTY__END :
>-				getEnds().clear();
>-				getEnds().addAll((Collection<? extends ConnectorEnd>) newValue);
>-				return;
> 			case UMLPackage.PROPERTY__DEPLOYMENT :
> 				getDeployments().clear();
> 				getDeployments().addAll(
> 					(Collection<? extends Deployment>) newValue);
> 				return;
>-			case UMLPackage.PROPERTY__TEMPLATE_BINDING :
>-				getTemplateBindings().clear();
>-				getTemplateBindings().addAll(
>-					(Collection<? extends TemplateBinding>) newValue);
>-				return;
>-			case UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE :
>-				setOwnedTemplateSignature((TemplateSignature) newValue);
>-				return;
> 			case UMLPackage.PROPERTY__DATATYPE :
> 				setDatatype((DataType) newValue);
> 				return;
>@@ -2500,18 +2231,9 @@
> 			case UMLPackage.PROPERTY__TEMPLATE_PARAMETER :
> 				setTemplateParameter((TemplateParameter) null);
> 				return;
>-			case UMLPackage.PROPERTY__END :
>-				getEnds().clear();
>-				return;
> 			case UMLPackage.PROPERTY__DEPLOYMENT :
> 				getDeployments().clear();
> 				return;
>-			case UMLPackage.PROPERTY__TEMPLATE_BINDING :
>-				getTemplateBindings().clear();
>-				return;
>-			case UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE :
>-				setOwnedTemplateSignature((TemplateSignature) null);
>-				return;
> 			case UMLPackage.PROPERTY__DATATYPE :
> 				setDatatype((DataType) null);
> 				return;
>@@ -2625,10 +2347,6 @@
> 				return deployments != null && !deployments.isEmpty();
> 			case UMLPackage.PROPERTY__DEPLOYED_ELEMENT :
> 				return !getDeployedElements().isEmpty();
>-			case UMLPackage.PROPERTY__TEMPLATE_BINDING :
>-				return templateBindings != null && !templateBindings.isEmpty();
>-			case UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE :
>-				return ownedTemplateSignature != null;
> 			case UMLPackage.PROPERTY__CLASS :
> 				return basicGetClass_() != null;
> 			case UMLPackage.PROPERTY__DATATYPE :
>@@ -2700,16 +2418,6 @@
> 					return -1;
> 			}
> 		}
>-		if (baseClass == TemplateableElement.class) {
>-			switch (derivedFeatureID) {
>-				case UMLPackage.PROPERTY__TEMPLATE_BINDING :
>-					return UMLPackage.TEMPLATEABLE_ELEMENT__TEMPLATE_BINDING;
>-				case UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE :
>-					return UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
>-				default :
>-					return -1;
>-			}
>-		}
> 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
> 	}
> 
>@@ -2748,16 +2456,6 @@
> 					return -1;
> 			}
> 		}
>-		if (baseClass == TemplateableElement.class) {
>-			switch (baseFeatureID) {
>-				case UMLPackage.TEMPLATEABLE_ELEMENT__TEMPLATE_BINDING :
>-					return UMLPackage.PROPERTY__TEMPLATE_BINDING;
>-				case UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE :
>-					return UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE;
>-				default :
>-					return -1;
>-			}
>-		}
> 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
> 	}
> 
>@@ -2825,8 +2523,6 @@
> 		UMLPackage.PROPERTY__OWNED_COMMENT,
> 		UMLPackage.PROPERTY__NAME_EXPRESSION, UMLPackage.PROPERTY__UPPER_VALUE,
> 		UMLPackage.PROPERTY__LOWER_VALUE, UMLPackage.PROPERTY__DEPLOYMENT,
>-		UMLPackage.PROPERTY__TEMPLATE_BINDING,
>-		UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE,
> 		UMLPackage.PROPERTY__DEFAULT_VALUE, UMLPackage.PROPERTY__QUALIFIER};
> 
> 	/**
>@@ -2858,8 +2554,6 @@
> 	public boolean isSetOwnedElements() {
> 		return super.isSetOwnedElements()
> 			|| eIsSet(UMLPackage.PROPERTY__DEPLOYMENT)
>-			|| eIsSet(UMLPackage.PROPERTY__TEMPLATE_BINDING)
>-			|| eIsSet(UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE)
> 			|| eIsSet(UMLPackage.PROPERTY__DEFAULT_VALUE)
> 			|| eIsSet(UMLPackage.PROPERTY__QUALIFIER);
> 	}
>Index: src/org/eclipse/uml2/uml/internal/impl/UMLFactoryImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLFactoryImpl.java,v
>retrieving revision 1.19
>diff -u -r1.19 UMLFactoryImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/UMLFactoryImpl.java	9 Jan 2008 18:56:03 -0000	1.19
>+++ src/org/eclipse/uml2/uml/internal/impl/UMLFactoryImpl.java	24 Sep 2008 18:40:12 -0000
>@@ -204,6 +204,7 @@
> import org.eclipse.uml2.uml.SignalEvent;
> import org.eclipse.uml2.uml.Slot;
> import org.eclipse.uml2.uml.StartClassifierBehaviorAction;
>+import org.eclipse.uml2.uml.StartObjectBehaviorAction;
> import org.eclipse.uml2.uml.State;
> import org.eclipse.uml2.uml.StateInvariant;
> import org.eclipse.uml2.uml.StateMachine;
>@@ -253,7 +254,7 @@
> 	public static UMLFactory init() {
> 		try {
> 			UMLFactory theUMLFactory = (UMLFactory) EPackage.Registry.INSTANCE
>-				.getEFactory("http://www.eclipse.org/uml2/2.1.0/UML"); //$NON-NLS-1$ 
>+				.getEFactory("http://www.eclipse.org/uml2/3.0.0/UML"); //$NON-NLS-1$ 
> 			if (theUMLFactory != null) {
> 				return theUMLFactory;
> 			}
>@@ -317,8 +318,6 @@
> 				return createOpaqueExpression();
> 			case UMLPackage.PARAMETER :
> 				return createParameter();
>-			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER :
>-				return createConnectableElementTemplateParameter();
> 			case UMLPackage.CONNECTOR_END :
> 				return createConnectorEnd();
> 			case UMLPackage.PROPERTY :
>@@ -383,6 +382,8 @@
> 				return createDataType();
> 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER :
> 				return createOperationTemplateParameter();
>+			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER :
>+				return createConnectableElementTemplateParameter();
> 			case UMLPackage.COLLABORATION_USE :
> 				return createCollaborationUse();
> 			case UMLPackage.COLLABORATION :
>@@ -535,6 +536,8 @@
> 				return createMergeNode();
> 			case UMLPackage.DECISION_NODE :
> 				return createDecisionNode();
>+			case UMLPackage.OBJECT_FLOW :
>+				return createObjectFlow();
> 			case UMLPackage.ACTIVITY_FINAL_NODE :
> 				return createActivityFinalNode();
> 			case UMLPackage.COMPONENT_REALIZATION :
>@@ -657,12 +660,12 @@
> 				return createUnmarshallAction();
> 			case UMLPackage.REDUCE_ACTION :
> 				return createReduceAction();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION :
>+				return createStartObjectBehaviorAction();
> 			case UMLPackage.JOIN_NODE :
> 				return createJoinNode();
> 			case UMLPackage.DATA_STORE_NODE :
> 				return createDataStoreNode();
>-			case UMLPackage.OBJECT_FLOW :
>-				return createObjectFlow();
> 			case UMLPackage.CONDITIONAL_NODE :
> 				return createConditionalNode();
> 			case UMLPackage.CLAUSE :
>@@ -2494,6 +2497,16 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public StartObjectBehaviorAction createStartObjectBehaviorAction() {
>+		StartObjectBehaviorActionImpl startObjectBehaviorAction = new StartObjectBehaviorActionImpl();
>+		return startObjectBehaviorAction;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public ControlFlow createControlFlow() {
> 		ControlFlowImpl controlFlow = new ControlFlowImpl();
> 		return controlFlow;
>Index: src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java,v
>retrieving revision 1.38
>diff -u -r1.38 ProtocolTransitionImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java	21 Apr 2008 16:32:42 -0000	1.38
>+++ src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -612,6 +612,14 @@
> 				if (resolve)
> 					return getContainer();
> 				return basicGetContainer();
>+			case UMLPackage.PROTOCOL_TRANSITION__SOURCE :
>+				if (resolve)
>+					return getSource();
>+				return basicGetSource();
>+			case UMLPackage.PROTOCOL_TRANSITION__TARGET :
>+				if (resolve)
>+					return getTarget();
>+				return basicGetTarget();
> 			case UMLPackage.PROTOCOL_TRANSITION__REDEFINED_TRANSITION :
> 				if (resolve)
> 					return getRedefinedTransition();
>@@ -626,14 +634,6 @@
> 				return basicGetEffect();
> 			case UMLPackage.PROTOCOL_TRANSITION__TRIGGER :
> 				return getTriggers();
>-			case UMLPackage.PROTOCOL_TRANSITION__TARGET :
>-				if (resolve)
>-					return getTarget();
>-				return basicGetTarget();
>-			case UMLPackage.PROTOCOL_TRANSITION__SOURCE :
>-				if (resolve)
>-					return getSource();
>-				return basicGetSource();
> 			case UMLPackage.PROTOCOL_TRANSITION__POST_CONDITION :
> 				if (resolve)
> 					return getPostCondition();
>@@ -705,6 +705,12 @@
> 			case UMLPackage.PROTOCOL_TRANSITION__CONTAINER :
> 				setContainer((Region) newValue);
> 				return;
>+			case UMLPackage.PROTOCOL_TRANSITION__SOURCE :
>+				setSource((Vertex) newValue);
>+				return;
>+			case UMLPackage.PROTOCOL_TRANSITION__TARGET :
>+				setTarget((Vertex) newValue);
>+				return;
> 			case UMLPackage.PROTOCOL_TRANSITION__REDEFINED_TRANSITION :
> 				setRedefinedTransition((Transition) newValue);
> 				return;
>@@ -718,12 +724,6 @@
> 				getTriggers().clear();
> 				getTriggers().addAll((Collection<? extends Trigger>) newValue);
> 				return;
>-			case UMLPackage.PROTOCOL_TRANSITION__TARGET :
>-				setTarget((Vertex) newValue);
>-				return;
>-			case UMLPackage.PROTOCOL_TRANSITION__SOURCE :
>-				setSource((Vertex) newValue);
>-				return;
> 			case UMLPackage.PROTOCOL_TRANSITION__POST_CONDITION :
> 				setPostCondition((Constraint) newValue);
> 				return;
>@@ -778,6 +778,12 @@
> 			case UMLPackage.PROTOCOL_TRANSITION__CONTAINER :
> 				setContainer((Region) null);
> 				return;
>+			case UMLPackage.PROTOCOL_TRANSITION__SOURCE :
>+				setSource((Vertex) null);
>+				return;
>+			case UMLPackage.PROTOCOL_TRANSITION__TARGET :
>+				setTarget((Vertex) null);
>+				return;
> 			case UMLPackage.PROTOCOL_TRANSITION__REDEFINED_TRANSITION :
> 				setRedefinedTransition((Transition) null);
> 				return;
>@@ -790,12 +796,6 @@
> 			case UMLPackage.PROTOCOL_TRANSITION__TRIGGER :
> 				getTriggers().clear();
> 				return;
>-			case UMLPackage.PROTOCOL_TRANSITION__TARGET :
>-				setTarget((Vertex) null);
>-				return;
>-			case UMLPackage.PROTOCOL_TRANSITION__SOURCE :
>-				setSource((Vertex) null);
>-				return;
> 			case UMLPackage.PROTOCOL_TRANSITION__POST_CONDITION :
> 				setPostCondition((Constraint) null);
> 				return;
>@@ -859,6 +859,10 @@
> 				return (eFlags & KIND_EFLAG) != KIND_EFLAG_DEFAULT;
> 			case UMLPackage.PROTOCOL_TRANSITION__CONTAINER :
> 				return basicGetContainer() != null;
>+			case UMLPackage.PROTOCOL_TRANSITION__SOURCE :
>+				return source != null;
>+			case UMLPackage.PROTOCOL_TRANSITION__TARGET :
>+				return target != null;
> 			case UMLPackage.PROTOCOL_TRANSITION__REDEFINED_TRANSITION :
> 				return redefinedTransition != null;
> 			case UMLPackage.PROTOCOL_TRANSITION__GUARD :
>@@ -867,10 +871,6 @@
> 				return effect != null;
> 			case UMLPackage.PROTOCOL_TRANSITION__TRIGGER :
> 				return triggers != null && !triggers.isEmpty();
>-			case UMLPackage.PROTOCOL_TRANSITION__TARGET :
>-				return target != null;
>-			case UMLPackage.PROTOCOL_TRANSITION__SOURCE :
>-				return source != null;
> 			case UMLPackage.PROTOCOL_TRANSITION__POST_CONDITION :
> 				return postCondition != null;
> 			case UMLPackage.PROTOCOL_TRANSITION__REFERRED :
>Index: src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureImpl.java,v
>retrieving revision 1.28
>diff -u -r1.28 StructuralFeatureImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureImpl.java	21 Apr 2008 16:32:41 -0000	1.28
>+++ src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -602,17 +602,6 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateUpperGt0(DiagnosticChain diagnostics,
>-			Map<Object, Object> context) {
>-		return MultiplicityElementOperations.validateUpperGt0(this,
>-			diagnostics, context);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public boolean validateLowerGe0(DiagnosticChain diagnostics,
> 			Map<Object, Object> context) {
> 		return MultiplicityElementOperations.validateLowerGe0(this,
>Index: src/org/eclipse/uml2/uml/internal/impl/VariableImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableImpl.java,v
>retrieving revision 1.34
>diff -u -r1.34 VariableImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/VariableImpl.java	21 Apr 2008 16:32:42 -0000	1.34
>+++ src/org/eclipse/uml2/uml/internal/impl/VariableImpl.java	24 Sep 2008 18:40:12 -0000
>@@ -40,7 +40,6 @@
> import org.eclipse.uml2.uml.Action;
> import org.eclipse.uml2.uml.Activity;
> import org.eclipse.uml2.uml.Comment;
>-import org.eclipse.uml2.uml.ConnectorEnd;
> import org.eclipse.uml2.uml.Dependency;
> import org.eclipse.uml2.uml.Element;
> import org.eclipse.uml2.uml.MultiplicityElement;
>@@ -634,17 +633,6 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateUpperGt0(DiagnosticChain diagnostics,
>-			Map<Object, Object> context) {
>-		return MultiplicityElementOperations.validateUpperGt0(this,
>-			diagnostics, context);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public boolean validateLowerGe0(DiagnosticChain diagnostics,
> 			Map<Object, Object> context) {
> 		return MultiplicityElementOperations.validateLowerGe0(this,
>@@ -989,10 +977,6 @@
> 			case UMLPackage.VARIABLE__TEMPLATE_PARAMETER :
> 				setTemplateParameter((TemplateParameter) newValue);
> 				return;
>-			case UMLPackage.VARIABLE__END :
>-				getEnds().clear();
>-				getEnds().addAll((Collection<? extends ConnectorEnd>) newValue);
>-				return;
> 			case UMLPackage.VARIABLE__IS_ORDERED :
> 				setIsOrdered(((Boolean) newValue).booleanValue());
> 				return;
>@@ -1056,9 +1040,6 @@
> 			case UMLPackage.VARIABLE__TEMPLATE_PARAMETER :
> 				setTemplateParameter((TemplateParameter) null);
> 				return;
>-			case UMLPackage.VARIABLE__END :
>-				getEnds().clear();
>-				return;
> 			case UMLPackage.VARIABLE__IS_ORDERED :
> 				setIsOrdered(IS_ORDERED_EDEFAULT);
> 				return;
>Index: src/org/eclipse/uml2/uml/internal/impl/DecisionNodeImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DecisionNodeImpl.java,v
>retrieving revision 1.17
>diff -u -r1.17 DecisionNodeImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/DecisionNodeImpl.java	25 Apr 2007 17:47:01 -0000	1.17
>+++ src/org/eclipse/uml2/uml/internal/impl/DecisionNodeImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -34,6 +34,7 @@
> import org.eclipse.uml2.uml.DecisionNode;
> import org.eclipse.uml2.uml.Dependency;
> import org.eclipse.uml2.uml.InterruptibleActivityRegion;
>+import org.eclipse.uml2.uml.ObjectFlow;
> import org.eclipse.uml2.uml.StringExpression;
> import org.eclipse.uml2.uml.StructuredActivityNode;
> import org.eclipse.uml2.uml.UMLPackage;
>@@ -49,6 +50,7 @@
> * The following features are implemented:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.DecisionNodeImpl#getDecisionInput Decision Input}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.DecisionNodeImpl#getDecisionInputFlow Decision Input Flow}</li>
> * </ul>
> * 
> *
>@@ -69,6 +71,16 @@
> 	protected Behavior decisionInput;
> 
> 	/**
>+	 * The cached value of the '{@link #getDecisionInputFlow() Decision Input Flow}' reference.
>+	 * 
>+	 * 
>+	 * @see #getDecisionInputFlow()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected ObjectFlow decisionInputFlow;
>+
>+	/**
> 	 * 
> 	 * 
> 	 * @generated
>@@ -134,9 +146,51 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateOneIncomingEdge(DiagnosticChain diagnostics,
>+	public ObjectFlow getDecisionInputFlow() {
>+		if (decisionInputFlow != null && decisionInputFlow.eIsProxy()) {
>+			InternalEObject oldDecisionInputFlow = (InternalEObject) decisionInputFlow;
>+			decisionInputFlow = (ObjectFlow) eResolveProxy(oldDecisionInputFlow);
>+			if (decisionInputFlow != oldDecisionInputFlow) {
>+				if (eNotificationRequired())
>+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
>+						UMLPackage.DECISION_NODE__DECISION_INPUT_FLOW,
>+						oldDecisionInputFlow, decisionInputFlow));
>+			}
>+		}
>+		return decisionInputFlow;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ObjectFlow basicGetDecisionInputFlow() {
>+		return decisionInputFlow;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setDecisionInputFlow(ObjectFlow newDecisionInputFlow) {
>+		ObjectFlow oldDecisionInputFlow = decisionInputFlow;
>+		decisionInputFlow = newDecisionInputFlow;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET,
>+				UMLPackage.DECISION_NODE__DECISION_INPUT_FLOW,
>+				oldDecisionInputFlow, decisionInputFlow));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateIncomingOutgoingEdges(DiagnosticChain diagnostics,
> 			Map<Object, Object> context) {
>-		return DecisionNodeOperations.validateOneIncomingEdge(this,
>+		return DecisionNodeOperations.validateIncomingOutgoingEdges(this,
> 			diagnostics, context);
> 	}
> 
>@@ -145,9 +199,30 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateInputParameter(DiagnosticChain diagnostics,
>+	public boolean validateEdges(DiagnosticChain diagnostics,
> 			Map<Object, Object> context) {
>-		return DecisionNodeOperations.validateInputParameter(this, diagnostics,
>+		return DecisionNodeOperations.validateEdges(this, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateDecisionInputFlowIncoming(
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return DecisionNodeOperations.validateDecisionInputFlowIncoming(this,
>+			diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateParameters(DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return DecisionNodeOperations.validateParameters(this, diagnostics,
> 			context);
> 	}
> 
>@@ -156,9 +231,43 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateEdges(DiagnosticChain diagnostics,
>+	public boolean validateZeroInputParameters(DiagnosticChain diagnostics,
> 			Map<Object, Object> context) {
>-		return DecisionNodeOperations.validateEdges(this, diagnostics, context);
>+		return DecisionNodeOperations.validateZeroInputParameters(this,
>+			diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateIncomingObjectOneInputParameter(
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return DecisionNodeOperations.validateIncomingObjectOneInputParameter(
>+			this, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateIncomingControlOneInputParameter(
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return DecisionNodeOperations.validateIncomingControlOneInputParameter(
>+			this, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateTwoInputParameters(DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return DecisionNodeOperations.validateTwoInputParameters(this,
>+			diagnostics, context);
> 	}
> 
> 	/**
>@@ -227,6 +336,10 @@
> 				if (resolve)
> 					return getDecisionInput();
> 				return basicGetDecisionInput();
>+			case UMLPackage.DECISION_NODE__DECISION_INPUT_FLOW :
>+				if (resolve)
>+					return getDecisionInputFlow();
>+				return basicGetDecisionInputFlow();
> 		}
> 		return eDynamicGet(featureID, resolve, coreType);
> 	}
>@@ -302,6 +415,9 @@
> 			case UMLPackage.DECISION_NODE__DECISION_INPUT :
> 				setDecisionInput((Behavior) newValue);
> 				return;
>+			case UMLPackage.DECISION_NODE__DECISION_INPUT_FLOW :
>+				setDecisionInputFlow((ObjectFlow) newValue);
>+				return;
> 		}
> 		eDynamicSet(featureID, newValue);
> 	}
>@@ -359,6 +475,9 @@
> 			case UMLPackage.DECISION_NODE__DECISION_INPUT :
> 				setDecisionInput((Behavior) null);
> 				return;
>+			case UMLPackage.DECISION_NODE__DECISION_INPUT_FLOW :
>+				setDecisionInputFlow((ObjectFlow) null);
>+				return;
> 		}
> 		eDynamicUnset(featureID);
> 	}
>@@ -419,6 +538,8 @@
> 				return redefinedNodes != null && !redefinedNodes.isEmpty();
> 			case UMLPackage.DECISION_NODE__DECISION_INPUT :
> 				return decisionInput != null;
>+			case UMLPackage.DECISION_NODE__DECISION_INPUT_FLOW :
>+				return decisionInputFlow != null;
> 		}
> 		return eDynamicIsSet(featureID);
> 	}
>Index: src/org/eclipse/uml2/uml/internal/impl/PortImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PortImpl.java,v
>retrieving revision 1.30
>diff -u -r1.30 PortImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/PortImpl.java	21 Apr 2008 16:32:41 -0000	1.30
>+++ src/org/eclipse/uml2/uml/internal/impl/PortImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -38,7 +38,6 @@
> import org.eclipse.uml2.uml.AggregationKind;
> import org.eclipse.uml2.uml.Association;
> import org.eclipse.uml2.uml.Comment;
>-import org.eclipse.uml2.uml.ConnectorEnd;
> import org.eclipse.uml2.uml.DataType;
> import org.eclipse.uml2.uml.Dependency;
> import org.eclipse.uml2.uml.Deployment;
>@@ -48,9 +47,7 @@
> import org.eclipse.uml2.uml.ProtocolStateMachine;
> import org.eclipse.uml2.uml.RedefinableElement;
> import org.eclipse.uml2.uml.StringExpression;
>-import org.eclipse.uml2.uml.TemplateBinding;
> import org.eclipse.uml2.uml.TemplateParameter;
>-import org.eclipse.uml2.uml.TemplateSignature;
> import org.eclipse.uml2.uml.Type;
> import org.eclipse.uml2.uml.UMLPackage;
> import org.eclipse.uml2.uml.ValueSpecification;
>@@ -545,12 +542,6 @@
> 				return getDeployments();
> 			case UMLPackage.PORT__DEPLOYED_ELEMENT :
> 				return getDeployedElements();
>-			case UMLPackage.PORT__TEMPLATE_BINDING :
>-				return getTemplateBindings();
>-			case UMLPackage.PORT__OWNED_TEMPLATE_SIGNATURE :
>-				if (resolve)
>-					return getOwnedTemplateSignature();
>-				return basicGetOwnedTemplateSignature();
> 			case UMLPackage.PORT__CLASS :
> 				if (resolve)
> 					return getClass_();
>@@ -692,23 +683,11 @@
> 			case UMLPackage.PORT__TEMPLATE_PARAMETER :
> 				setTemplateParameter((TemplateParameter) newValue);
> 				return;
>-			case UMLPackage.PORT__END :
>-				getEnds().clear();
>-				getEnds().addAll((Collection<? extends ConnectorEnd>) newValue);
>-				return;
> 			case UMLPackage.PORT__DEPLOYMENT :
> 				getDeployments().clear();
> 				getDeployments().addAll(
> 					(Collection<? extends Deployment>) newValue);
> 				return;
>-			case UMLPackage.PORT__TEMPLATE_BINDING :
>-				getTemplateBindings().clear();
>-				getTemplateBindings().addAll(
>-					(Collection<? extends TemplateBinding>) newValue);
>-				return;
>-			case UMLPackage.PORT__OWNED_TEMPLATE_SIGNATURE :
>-				setOwnedTemplateSignature((TemplateSignature) newValue);
>-				return;
> 			case UMLPackage.PORT__DATATYPE :
> 				setDatatype((DataType) newValue);
> 				return;
>@@ -848,18 +827,9 @@
> 			case UMLPackage.PORT__TEMPLATE_PARAMETER :
> 				setTemplateParameter((TemplateParameter) null);
> 				return;
>-			case UMLPackage.PORT__END :
>-				getEnds().clear();
>-				return;
> 			case UMLPackage.PORT__DEPLOYMENT :
> 				getDeployments().clear();
> 				return;
>-			case UMLPackage.PORT__TEMPLATE_BINDING :
>-				getTemplateBindings().clear();
>-				return;
>-			case UMLPackage.PORT__OWNED_TEMPLATE_SIGNATURE :
>-				setOwnedTemplateSignature((TemplateSignature) null);
>-				return;
> 			case UMLPackage.PORT__DATATYPE :
> 				setDatatype((DataType) null);
> 				return;
>@@ -985,10 +955,6 @@
> 				return deployments != null && !deployments.isEmpty();
> 			case UMLPackage.PORT__DEPLOYED_ELEMENT :
> 				return !getDeployedElements().isEmpty();
>-			case UMLPackage.PORT__TEMPLATE_BINDING :
>-				return templateBindings != null && !templateBindings.isEmpty();
>-			case UMLPackage.PORT__OWNED_TEMPLATE_SIGNATURE :
>-				return ownedTemplateSignature != null;
> 			case UMLPackage.PORT__CLASS :
> 				return basicGetClass_() != null;
> 			case UMLPackage.PORT__DATATYPE :
>Index: src/org/eclipse/uml2/uml/internal/impl/TimeEventImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeEventImpl.java,v
>retrieving revision 1.24
>diff -u -r1.24 TimeEventImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/TimeEventImpl.java	21 Apr 2008 16:32:41 -0000	1.24
>+++ src/org/eclipse/uml2/uml/internal/impl/TimeEventImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -42,9 +42,9 @@
> import org.eclipse.uml2.uml.StringExpression;
> import org.eclipse.uml2.uml.TemplateParameter;
> import org.eclipse.uml2.uml.TimeEvent;
>+import org.eclipse.uml2.uml.TimeExpression;
> import org.eclipse.uml2.uml.Type;
> import org.eclipse.uml2.uml.UMLPackage;
>-import org.eclipse.uml2.uml.ValueSpecification;
> import org.eclipse.uml2.uml.VisibilityKind;
> 
> import org.eclipse.uml2.uml.internal.operations.TimeEventOperations;
>@@ -96,7 +96,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected ValueSpecification when;
>+	protected TimeExpression when;
> 
> 	/**
> 	 * 
>@@ -175,10 +175,10 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public ValueSpecification getWhen() {
>+	public TimeExpression getWhen() {
> 		if (when != null && when.eIsProxy()) {
> 			InternalEObject oldWhen = (InternalEObject) when;
>-			when = (ValueSpecification) eResolveProxy(oldWhen);
>+			when = (TimeExpression) eResolveProxy(oldWhen);
> 			if (when != oldWhen) {
> 				InternalEObject newWhen = (InternalEObject) when;
> 				NotificationChain msgs = oldWhen.eInverseRemove(this,
>@@ -203,7 +203,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public ValueSpecification basicGetWhen() {
>+	public TimeExpression basicGetWhen() {
> 		return when;
> 	}
> 
>@@ -212,9 +212,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public NotificationChain basicSetWhen(ValueSpecification newWhen,
>+	public NotificationChain basicSetWhen(TimeExpression newWhen,
> 			NotificationChain msgs) {
>-		ValueSpecification oldWhen = when;
>+		TimeExpression oldWhen = when;
> 		when = newWhen;
> 		if (eNotificationRequired()) {
> 			ENotificationImpl notification = new ENotificationImpl(this,
>@@ -232,7 +232,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public void setWhen(ValueSpecification newWhen) {
>+	public void setWhen(TimeExpression newWhen) {
> 		if (newWhen != when) {
> 			NotificationChain msgs = null;
> 			if (when != null)
>@@ -256,8 +256,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public ValueSpecification createWhen(String name, Type type, EClass eClass) {
>-		ValueSpecification newWhen = (ValueSpecification) create(eClass);
>+	public TimeExpression createWhen(String name, Type type) {
>+		TimeExpression newWhen = (TimeExpression) create(UMLPackage.Literals.TIME_EXPRESSION);
> 		setWhen(newWhen);
> 		if (name != null)
> 			newWhen.setName(name);
>@@ -415,7 +415,7 @@
> 				setIsRelative(((Boolean) newValue).booleanValue());
> 				return;
> 			case UMLPackage.TIME_EVENT__WHEN :
>-				setWhen((ValueSpecification) newValue);
>+				setWhen((TimeExpression) newValue);
> 				return;
> 		}
> 		eDynamicSet(featureID, newValue);
>@@ -457,7 +457,7 @@
> 				setIsRelative(IS_RELATIVE_EDEFAULT);
> 				return;
> 			case UMLPackage.TIME_EVENT__WHEN :
>-				setWhen((ValueSpecification) null);
>+				setWhen((TimeExpression) null);
> 				return;
> 		}
> 		eDynamicUnset(featureID);
>Index: src/org/eclipse/uml2/uml/internal/impl/TemplateParameterSubstitutionImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterSubstitutionImpl.java,v
>retrieving revision 1.21
>diff -u -r1.21 TemplateParameterSubstitutionImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/TemplateParameterSubstitutionImpl.java	25 Apr 2007 17:47:03 -0000	1.21
>+++ src/org/eclipse/uml2/uml/internal/impl/TemplateParameterSubstitutionImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -35,8 +35,6 @@
> 
> import org.eclipse.uml2.common.util.CacheAdapter;
> import org.eclipse.uml2.common.util.DerivedUnionEObjectEList;
>-import org.eclipse.uml2.common.util.SubsetSupersetEObjectContainmentEList;
>-import org.eclipse.uml2.common.util.SubsetSupersetEObjectResolvingEList;
> 
> import org.eclipse.uml2.uml.Comment;
> import org.eclipse.uml2.uml.Element;
>@@ -57,9 +55,9 @@
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.TemplateParameterSubstitutionImpl#getOwnedElements Owned Element}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.TemplateParameterSubstitutionImpl#getOwner Owner}</li>
>- * <li>{@link org.eclipse.uml2.uml.internal.impl.TemplateParameterSubstitutionImpl#getActuals Actual}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.TemplateParameterSubstitutionImpl#getActual Actual}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.TemplateParameterSubstitutionImpl#getFormal Formal}</li>
>- * <li>{@link org.eclipse.uml2.uml.internal.impl.TemplateParameterSubstitutionImpl#getOwnedActuals Owned Actual}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.TemplateParameterSubstitutionImpl#getOwnedActual Owned Actual}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.TemplateParameterSubstitutionImpl#getTemplateBinding Template Binding}</li>
> * </ul>
> * 
>@@ -71,14 +69,14 @@
> 		implements TemplateParameterSubstitution {
> 
> 	/**
>-	 * The cached value of the '{@link #getActuals() Actual}' reference list.
>+	 * The cached value of the '{@link #getActual() Actual}' reference.
> 	 * 
> 	 * 
>-	 * @see #getActuals()
>+	 * @see #getActual()
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList<ParameterableElement> actuals;
>+	protected ParameterableElement actual;
> 
> 	/**
> 	 * The cached value of the '{@link #getFormal() Formal}' reference.
>@@ -91,14 +89,14 @@
> 	protected TemplateParameter formal;
> 
> 	/**
>-	 * The cached value of the '{@link #getOwnedActuals() Owned Actual}' containment reference list.
>+	 * The cached value of the '{@link #getOwnedActual() Owned Actual}' containment reference.
> 	 * 
> 	 * 
>-	 * @see #getOwnedActuals()
>+	 * @see #getOwnedActual()
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList<ParameterableElement> ownedActuals;
>+	protected ParameterableElement ownedActual;
> 
> 	/**
> 	 * 
>@@ -156,21 +154,6 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EList<ParameterableElement> getActuals() {
>-		if (actuals == null) {
>-			actuals = new SubsetSupersetEObjectResolvingEList<ParameterableElement>(
>-				ParameterableElement.class, this,
>-				UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL, null,
>-				ACTUAL_ESUBSETS);
>-		}
>-		return actuals;
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public TemplateParameter getFormal() {
> 		if (formal != null && formal.eIsProxy()) {
> 			InternalEObject oldFormal = (InternalEObject) formal;
>@@ -213,14 +196,107 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EList<ParameterableElement> getOwnedActuals() {
>-		if (ownedActuals == null) {
>-			ownedActuals = new SubsetSupersetEObjectContainmentEList.Resolving<ParameterableElement>(
>-				ParameterableElement.class, this,
>+	public ParameterableElement getOwnedActual() {
>+		if (ownedActual != null && ownedActual.eIsProxy()) {
>+			InternalEObject oldOwnedActual = (InternalEObject) ownedActual;
>+			ownedActual = (ParameterableElement) eResolveProxy(oldOwnedActual);
>+			if (ownedActual != oldOwnedActual) {
>+				InternalEObject newOwnedActual = (InternalEObject) ownedActual;
>+				NotificationChain msgs = oldOwnedActual
>+					.eInverseRemove(
>+						this,
>+						EOPPOSITE_FEATURE_BASE
>+							- UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL,
>+						null, null);
>+				if (newOwnedActual.eInternalContainer() == null) {
>+					msgs = newOwnedActual
>+						.eInverseAdd(
>+							this,
>+							EOPPOSITE_FEATURE_BASE
>+								- UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL,
>+							null, msgs);
>+				}
>+				if (msgs != null)
>+					msgs.dispatch();
>+				if (eNotificationRequired())
>+					eNotify(new ENotificationImpl(
>+						this,
>+						Notification.RESOLVE,
>+						UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL,
>+						oldOwnedActual, ownedActual));
>+			}
>+		}
>+		return ownedActual;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ParameterableElement basicGetOwnedActual() {
>+		return ownedActual;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetOwnedActual(
>+			ParameterableElement newOwnedActual, NotificationChain msgs) {
>+		ParameterableElement oldOwnedActual = ownedActual;
>+		ownedActual = newOwnedActual;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this,
>+				Notification.SET,
> 				UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL,
>-				OWNED_ACTUAL_ESUPERSETS, null);
>+				oldOwnedActual, newOwnedActual);
>+			if (msgs == null)
>+				msgs = notification;
>+			else
>+				msgs.add(notification);
>+		}
>+		Resource.Internal eInternalResource = eInternalResource();
>+		if (eInternalResource == null || !eInternalResource.isLoading()) {
>+			if (newOwnedActual != null) {
>+				if (newOwnedActual != actual) {
>+					setActual(newOwnedActual);
>+				}
>+			}
> 		}
>-		return ownedActuals;
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setOwnedActual(ParameterableElement newOwnedActual) {
>+		if (newOwnedActual != ownedActual) {
>+			NotificationChain msgs = null;
>+			if (ownedActual != null)
>+				msgs = ((InternalEObject) ownedActual)
>+					.eInverseRemove(
>+						this,
>+						EOPPOSITE_FEATURE_BASE
>+							- UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL,
>+						null, msgs);
>+			if (newOwnedActual != null)
>+				msgs = ((InternalEObject) newOwnedActual)
>+					.eInverseAdd(
>+						this,
>+						EOPPOSITE_FEATURE_BASE
>+							- UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL,
>+						null, msgs);
>+			msgs = basicSetOwnedActual(newOwnedActual, msgs);
>+			if (msgs != null)
>+				msgs.dispatch();
>+		} else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET,
>+				UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL,
>+				newOwnedActual, newOwnedActual));
> 	}
> 
> 	/**
>@@ -230,7 +306,7 @@
> 	 */
> 	public ParameterableElement createOwnedActual(EClass eClass) {
> 		ParameterableElement newOwnedActual = (ParameterableElement) create(eClass);
>-		getOwnedActuals().add(newOwnedActual);
>+		setOwnedActual(newOwnedActual);
> 		return newOwnedActual;
> 	}
> 
>@@ -343,8 +419,7 @@
> 				return ((InternalEList<?>) getOwnedComments()).basicRemove(
> 					otherEnd, msgs);
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL :
>-				return ((InternalEList<?>) getOwnedActuals()).basicRemove(
>-					otherEnd, msgs);
>+				return basicSetOwnedActual(null, msgs);
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING :
> 				return basicSetTemplateBinding(null, msgs);
> 		}
>@@ -391,9 +466,13 @@
> 					return getFormal();
> 				return basicGetFormal();
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL :
>-				return getActuals();
>+				if (resolve)
>+					return getActual();
>+				return basicGetActual();
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL :
>-				return getOwnedActuals();
>+				if (resolve)
>+					return getOwnedActual();
>+				return basicGetOwnedActual();
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING :
> 				if (resolve)
> 					return getTemplateBinding();
>@@ -425,14 +504,10 @@
> 				setFormal((TemplateParameter) newValue);
> 				return;
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL :
>-				getActuals().clear();
>-				getActuals().addAll(
>-					(Collection<? extends ParameterableElement>) newValue);
>+				setActual((ParameterableElement) newValue);
> 				return;
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL :
>-				getOwnedActuals().clear();
>-				getOwnedActuals().addAll(
>-					(Collection<? extends ParameterableElement>) newValue);
>+				setOwnedActual((ParameterableElement) newValue);
> 				return;
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING :
> 				setTemplateBinding((TemplateBinding) newValue);
>@@ -459,10 +534,10 @@
> 				setFormal((TemplateParameter) null);
> 				return;
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL :
>-				getActuals().clear();
>+				setActual((ParameterableElement) null);
> 				return;
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL :
>-				getOwnedActuals().clear();
>+				setOwnedActual((ParameterableElement) null);
> 				return;
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING :
> 				setTemplateBinding((TemplateBinding) null);
>@@ -490,9 +565,9 @@
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__FORMAL :
> 				return formal != null;
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL :
>-				return actuals != null && !actuals.isEmpty();
>+				return actual != null;
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL :
>-				return ownedActuals != null && !ownedActuals.isEmpty();
>+				return ownedActual != null;
> 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING :
> 				return basicGetTemplateBinding() != null;
> 		}
>@@ -512,26 +587,6 @@
> 		UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL};
> 
> 	/**
>-	 * The array of subset feature identifiers for the '{@link #getActuals() Actual}' reference list.
>-	 * 
>-	 * 
>-	 * @see #getActuals()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final int[] ACTUAL_ESUBSETS = new int[]{UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL};
>-
>-	/**
>-	 * The array of superset feature identifiers for the '{@link #getOwnedActuals() Owned Actual}' containment reference list.
>-	 * 
>-	 * 
>-	 * @see #getOwnedActuals()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final int[] OWNED_ACTUAL_ESUPERSETS = new int[]{UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL};
>-
>-	/**
> 	 * 
> 	 * 
> 	 * @generated
>@@ -574,6 +629,54 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public ParameterableElement getActual() {
>+		if (actual != null && actual.eIsProxy()) {
>+			InternalEObject oldActual = (InternalEObject) actual;
>+			actual = (ParameterableElement) eResolveProxy(oldActual);
>+			if (actual != oldActual) {
>+				if (eNotificationRequired())
>+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
>+						UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL,
>+						oldActual, actual));
>+			}
>+		}
>+		return actual;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ParameterableElement basicGetActual() {
>+		return actual;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setActual(ParameterableElement newActual) {
>+		ParameterableElement oldActual = actual;
>+		actual = newActual;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET,
>+				UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL, oldActual,
>+				actual));
>+		Resource.Internal eInternalResource = eInternalResource();
>+		if (eInternalResource == null || !eInternalResource.isLoading()) {
>+			if (ownedActual != null && ownedActual != newActual) {
>+				setOwnedActual(null);
>+			}
>+		}
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	@Override
> 	public boolean isSetOwner() {
> 		return super.isSetOwner()
>Index: src/org/eclipse/uml2/uml/internal/impl/PinImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PinImpl.java,v
>retrieving revision 1.30
>diff -u -r1.30 PinImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/PinImpl.java	21 Apr 2008 16:32:42 -0000	1.30
>+++ src/org/eclipse/uml2/uml/internal/impl/PinImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -544,17 +544,6 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean validateUpperGt0(DiagnosticChain diagnostics,
>-			Map<Object, Object> context) {
>-		return MultiplicityElementOperations.validateUpperGt0(this,
>-			diagnostics, context);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public boolean validateLowerGe0(DiagnosticChain diagnostics,
> 			Map<Object, Object> context) {
> 		return MultiplicityElementOperations.validateLowerGe0(this,
>Index: src/org/eclipse/uml2/uml/internal/impl/ClearStructuralFeatureActionImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClearStructuralFeatureActionImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ClearStructuralFeatureActionImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/ClearStructuralFeatureActionImpl.java	14 Dec 2006 15:49:30 -0000	1.3
>+++ src/org/eclipse/uml2/uml/internal/impl/ClearStructuralFeatureActionImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2006 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -12,16 +12,51 @@
> */
> package org.eclipse.uml2.uml.internal.impl;
> 
>+import java.util.Collection;
>+import java.util.Map;
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+import org.eclipse.emf.common.util.DiagnosticChain;
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EAnnotation;
> import org.eclipse.emf.ecore.EClass;
> 
>+import org.eclipse.emf.ecore.InternalEObject;
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.resource.Resource;
>+import org.eclipse.emf.ecore.util.InternalEList;
>+import org.eclipse.uml2.common.util.CacheAdapter;
>+import org.eclipse.uml2.common.util.DerivedUnionEObjectEList;
>+import org.eclipse.uml2.uml.Activity;
>+import org.eclipse.uml2.uml.ActivityEdge;
>+import org.eclipse.uml2.uml.ActivityNode;
>+import org.eclipse.uml2.uml.ActivityPartition;
> import org.eclipse.uml2.uml.ClearStructuralFeatureAction;
>+import org.eclipse.uml2.uml.Comment;
>+import org.eclipse.uml2.uml.Constraint;
>+import org.eclipse.uml2.uml.Dependency;
>+import org.eclipse.uml2.uml.ExceptionHandler;
>+import org.eclipse.uml2.uml.InputPin;
>+import org.eclipse.uml2.uml.InterruptibleActivityRegion;
>+import org.eclipse.uml2.uml.OutputPin;
>+import org.eclipse.uml2.uml.StringExpression;
>+import org.eclipse.uml2.uml.StructuralFeature;
>+import org.eclipse.uml2.uml.StructuredActivityNode;
>+import org.eclipse.uml2.uml.Type;
> import org.eclipse.uml2.uml.UMLPackage;
>+import org.eclipse.uml2.uml.VisibilityKind;
>+import org.eclipse.uml2.uml.internal.operations.ClearStructuralFeatureActionOperations;
> 
> /**
> * 
> * An implementation of the model object 'Clear Structural Feature Action'.
> * 
> * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.ClearStructuralFeatureActionImpl#getOutputs Output}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.ClearStructuralFeatureActionImpl#getResult Result}</li>
>+ * </ul>
> * 
> *
> * @generated
>@@ -31,6 +66,16 @@
> 		implements ClearStructuralFeatureAction {
> 
> 	/**
>+	 * The cached value of the '{@link #getResult() Result}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getResult()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected OutputPin result;
>+
>+	/**
> 	 * 
> 	 * 
> 	 * @generated
>@@ -49,4 +94,568 @@
> 		return UMLPackage.Literals.CLEAR_STRUCTURAL_FEATURE_ACTION;
> 	}
> 
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public EList<OutputPin> getOutputs() {
>+		CacheAdapter cache = getCacheAdapter();
>+		if (cache != null) {
>+			Resource eResource = eResource();
>+			@SuppressWarnings("unchecked")
>+			EList<OutputPin> outputs = (EList<OutputPin>) cache.get(eResource,
>+				this, UMLPackage.Literals.ACTION__OUTPUT);
>+			if (outputs == null) {
>+				cache.put(eResource, this, UMLPackage.Literals.ACTION__OUTPUT,
>+					outputs = new DerivedUnionEObjectEList<OutputPin>(
>+						OutputPin.class, this,
>+						UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OUTPUT,
>+						OUTPUT_ESUBSETS));
>+			}
>+			return outputs;
>+		}
>+		return new DerivedUnionEObjectEList<OutputPin>(OutputPin.class, this,
>+			UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OUTPUT, OUTPUT_ESUBSETS);
>+	}
>+
>+	/**
>+	 * The array of subset feature identifiers for the '{@link #getOutputs() Output}' reference list.
>+	 * 
>+	 * 
>+	 * @see #getOutputs()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT};
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public OutputPin getResult() {
>+		if (result != null && result.eIsProxy()) {
>+			InternalEObject oldResult = (InternalEObject) result;
>+			result = (OutputPin) eResolveProxy(oldResult);
>+			if (result != oldResult) {
>+				InternalEObject newResult = (InternalEObject) result;
>+				NotificationChain msgs = oldResult.eInverseRemove(this,
>+					EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT,
>+					null, null);
>+				if (newResult.eInternalContainer() == null) {
>+					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT,
>+						null, msgs);
>+				}
>+				if (msgs != null)
>+					msgs.dispatch();
>+				if (eNotificationRequired())
>+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
>+						UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT,
>+						oldResult, result));
>+			}
>+		}
>+		return result;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public OutputPin basicGetResult() {
>+		return result;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetResult(OutputPin newResult,
>+			NotificationChain msgs) {
>+		OutputPin oldResult = result;
>+		result = newResult;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this,
>+				Notification.SET,
>+				UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT, oldResult,
>+				newResult);
>+			if (msgs == null)
>+				msgs = notification;
>+			else
>+				msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setResult(OutputPin newResult) {
>+		if (newResult != result) {
>+			NotificationChain msgs = null;
>+			if (result != null)
>+				msgs = ((InternalEObject) result).eInverseRemove(this,
>+					EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT,
>+					null, msgs);
>+			if (newResult != null)
>+				msgs = ((InternalEObject) newResult).eInverseAdd(this,
>+					EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT,
>+					null, msgs);
>+			msgs = basicSetResult(newResult, msgs);
>+			if (msgs != null)
>+				msgs.dispatch();
>+		} else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET,
>+				UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT, newResult,
>+				newResult));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public OutputPin createResult(String name, Type type) {
>+		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
>+		setResult(newResult);
>+		if (name != null)
>+			newResult.setName(name);
>+		if (type != null)
>+			newResult.setType(type);
>+		return newResult;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateTypeOfResult(DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return ClearStructuralFeatureActionOperations.validateTypeOfResult(
>+			this, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateMultiplicityOfResult(DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return ClearStructuralFeatureActionOperations
>+			.validateMultiplicityOfResult(this, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd,
>+			int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS :
>+				return ((InternalEList<?>) getEAnnotations()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT :
>+				return ((InternalEList<?>) getOwnedComments()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__CLIENT_DEPENDENCY :
>+				return ((InternalEList<?>) getClientDependencies())
>+					.basicRemove(otherEnd, msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__NAME_EXPRESSION :
>+				return basicSetNameExpression(null, msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE :
>+				return basicSetInStructuredNode(null, msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__ACTIVITY :
>+				return basicSetActivity(null, msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OUTGOING :
>+				return ((InternalEList<?>) getOutgoings()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__INCOMING :
>+				return ((InternalEList<?>) getIncomings()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_PARTITION :
>+				return ((InternalEList<?>) getInPartitions()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION :
>+				return ((InternalEList<?>) getInInterruptibleRegions())
>+					.basicRemove(otherEnd, msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__HANDLER :
>+				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
>+					msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__LOCAL_PRECONDITION :
>+				return ((InternalEList<?>) getLocalPreconditions())
>+					.basicRemove(otherEnd, msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION :
>+				return ((InternalEList<?>) getLocalPostconditions())
>+					.basicRemove(otherEnd, msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OBJECT :
>+				return basicSetObject(null, msgs);
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT :
>+				return basicSetResult(null, msgs);
>+		}
>+		return eDynamicInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS :
>+				return getEAnnotations();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OWNED_ELEMENT :
>+				return getOwnedElements();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OWNER :
>+				if (resolve)
>+					return getOwner();
>+				return basicGetOwner();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT :
>+				return getOwnedComments();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__NAME :
>+				return getName();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__VISIBILITY :
>+				return getVisibility();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__QUALIFIED_NAME :
>+				return getQualifiedName();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__CLIENT_DEPENDENCY :
>+				return getClientDependencies();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__NAMESPACE :
>+				if (resolve)
>+					return getNamespace();
>+				return basicGetNamespace();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__NAME_EXPRESSION :
>+				if (resolve)
>+					return getNameExpression();
>+				return basicGetNameExpression();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IS_LEAF :
>+				return isLeaf()
>+					? Boolean.TRUE
>+					: Boolean.FALSE;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__REDEFINED_ELEMENT :
>+				return getRedefinedElements();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__REDEFINITION_CONTEXT :
>+				return getRedefinitionContexts();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE :
>+				if (resolve)
>+					return getInStructuredNode();
>+				return basicGetInStructuredNode();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__ACTIVITY :
>+				if (resolve)
>+					return getActivity();
>+				return basicGetActivity();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OUTGOING :
>+				return getOutgoings();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__INCOMING :
>+				return getIncomings();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_PARTITION :
>+				return getInPartitions();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION :
>+				return getInInterruptibleRegions();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_GROUP :
>+				return getInGroups();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__REDEFINED_NODE :
>+				return getRedefinedNodes();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__HANDLER :
>+				return getHandlers();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OUTPUT :
>+				return getOutputs();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__INPUT :
>+				return getInputs();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__CONTEXT :
>+				if (resolve)
>+					return getContext();
>+				return basicGetContext();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__LOCAL_PRECONDITION :
>+				return getLocalPreconditions();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION :
>+				return getLocalPostconditions();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__STRUCTURAL_FEATURE :
>+				if (resolve)
>+					return getStructuralFeature();
>+				return basicGetStructuralFeature();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OBJECT :
>+				if (resolve)
>+					return getObject();
>+				return basicGetObject();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT :
>+				if (resolve)
>+					return getResult();
>+				return basicGetResult();
>+		}
>+		return eDynamicGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS :
>+				getEAnnotations().clear();
>+				getEAnnotations().addAll(
>+					(Collection<? extends EAnnotation>) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT :
>+				getOwnedComments().clear();
>+				getOwnedComments().addAll(
>+					(Collection<? extends Comment>) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__NAME :
>+				setName((String) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__VISIBILITY :
>+				setVisibility((VisibilityKind) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__CLIENT_DEPENDENCY :
>+				getClientDependencies().clear();
>+				getClientDependencies().addAll(
>+					(Collection<? extends Dependency>) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__NAME_EXPRESSION :
>+				setNameExpression((StringExpression) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IS_LEAF :
>+				setIsLeaf(((Boolean) newValue).booleanValue());
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE :
>+				setInStructuredNode((StructuredActivityNode) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__ACTIVITY :
>+				setActivity((Activity) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OUTGOING :
>+				getOutgoings().clear();
>+				getOutgoings().addAll(
>+					(Collection<? extends ActivityEdge>) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__INCOMING :
>+				getIncomings().clear();
>+				getIncomings().addAll(
>+					(Collection<? extends ActivityEdge>) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_PARTITION :
>+				getInPartitions().clear();
>+				getInPartitions().addAll(
>+					(Collection<? extends ActivityPartition>) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION :
>+				getInInterruptibleRegions().clear();
>+				getInInterruptibleRegions()
>+					.addAll(
>+						(Collection<? extends InterruptibleActivityRegion>) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__REDEFINED_NODE :
>+				getRedefinedNodes().clear();
>+				getRedefinedNodes().addAll(
>+					(Collection<? extends ActivityNode>) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__HANDLER :
>+				getHandlers().clear();
>+				getHandlers().addAll(
>+					(Collection<? extends ExceptionHandler>) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__LOCAL_PRECONDITION :
>+				getLocalPreconditions().clear();
>+				getLocalPreconditions().addAll(
>+					(Collection<? extends Constraint>) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION :
>+				getLocalPostconditions().clear();
>+				getLocalPostconditions().addAll(
>+					(Collection<? extends Constraint>) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__STRUCTURAL_FEATURE :
>+				setStructuralFeature((StructuralFeature) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OBJECT :
>+				setObject((InputPin) newValue);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT :
>+				setResult((OutputPin) newValue);
>+				return;
>+		}
>+		eDynamicSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS :
>+				getEAnnotations().clear();
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT :
>+				getOwnedComments().clear();
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__NAME :
>+				unsetName();
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__VISIBILITY :
>+				unsetVisibility();
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__CLIENT_DEPENDENCY :
>+				getClientDependencies().clear();
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__NAME_EXPRESSION :
>+				setNameExpression((StringExpression) null);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IS_LEAF :
>+				setIsLeaf(IS_LEAF_EDEFAULT);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE :
>+				setInStructuredNode((StructuredActivityNode) null);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__ACTIVITY :
>+				setActivity((Activity) null);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OUTGOING :
>+				getOutgoings().clear();
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__INCOMING :
>+				getIncomings().clear();
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_PARTITION :
>+				getInPartitions().clear();
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION :
>+				getInInterruptibleRegions().clear();
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__REDEFINED_NODE :
>+				getRedefinedNodes().clear();
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__HANDLER :
>+				getHandlers().clear();
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__LOCAL_PRECONDITION :
>+				getLocalPreconditions().clear();
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION :
>+				getLocalPostconditions().clear();
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__STRUCTURAL_FEATURE :
>+				setStructuralFeature((StructuralFeature) null);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OBJECT :
>+				setObject((InputPin) null);
>+				return;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT :
>+				setResult((OutputPin) null);
>+				return;
>+		}
>+		eDynamicUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS :
>+				return eAnnotations != null && !eAnnotations.isEmpty();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OWNED_ELEMENT :
>+				return isSetOwnedElements();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OWNER :
>+				return isSetOwner();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT :
>+				return ownedComments != null && !ownedComments.isEmpty();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__NAME :
>+				return isSetName();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__VISIBILITY :
>+				return isSetVisibility();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__QUALIFIED_NAME :
>+				return QUALIFIED_NAME_EDEFAULT == null
>+					? getQualifiedName() != null
>+					: !QUALIFIED_NAME_EDEFAULT.equals(getQualifiedName());
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__CLIENT_DEPENDENCY :
>+				return clientDependencies != null
>+					&& !clientDependencies.isEmpty();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__NAMESPACE :
>+				return isSetNamespace();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__NAME_EXPRESSION :
>+				return nameExpression != null;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IS_LEAF :
>+				return ((eFlags & IS_LEAF_EFLAG) != 0) != IS_LEAF_EDEFAULT;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__REDEFINED_ELEMENT :
>+				return isSetRedefinedElements();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__REDEFINITION_CONTEXT :
>+				return isSetRedefinitionContexts();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE :
>+				return basicGetInStructuredNode() != null;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__ACTIVITY :
>+				return basicGetActivity() != null;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OUTGOING :
>+				return outgoings != null && !outgoings.isEmpty();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__INCOMING :
>+				return incomings != null && !incomings.isEmpty();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_PARTITION :
>+				return inPartitions != null && !inPartitions.isEmpty();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION :
>+				return inInterruptibleRegions != null
>+					&& !inInterruptibleRegions.isEmpty();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_GROUP :
>+				return isSetInGroups();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__REDEFINED_NODE :
>+				return redefinedNodes != null && !redefinedNodes.isEmpty();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__HANDLER :
>+				return handlers != null && !handlers.isEmpty();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OUTPUT :
>+				return isSetOutputs();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__INPUT :
>+				return isSetInputs();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__CONTEXT :
>+				return basicGetContext() != null;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__LOCAL_PRECONDITION :
>+				return localPreconditions != null
>+					&& !localPreconditions.isEmpty();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION :
>+				return localPostconditions != null
>+					&& !localPostconditions.isEmpty();
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__STRUCTURAL_FEATURE :
>+				return structuralFeature != null;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OBJECT :
>+				return object != null;
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT :
>+				return result != null;
>+		}
>+		return eDynamicIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean isSetOutputs() {
>+		return super.isSetOutputs()
>+			|| eIsSet(UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT);
>+	}
>+
> } //ClearStructuralFeatureActionImpl
>Index: src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java,v
>retrieving revision 1.29
>diff -u -r1.29 TransitionImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java	21 Apr 2008 16:32:42 -0000	1.29
>+++ src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java	24 Sep 2008 18:40:12 -0000
>@@ -80,12 +80,12 @@
> * <li>{@link org.eclipse.uml2.uml.internal.impl.TransitionImpl#getOwnedRules Owned Rule}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.TransitionImpl#getKind Kind}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.TransitionImpl#getContainer Container}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.TransitionImpl#getSource Source}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.TransitionImpl#getTarget Target}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.TransitionImpl#getRedefinedTransition Redefined Transition}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.TransitionImpl#getGuard Guard}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.TransitionImpl#getEffect Effect}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.TransitionImpl#getTriggers Trigger}</li>
>- * <li>{@link org.eclipse.uml2.uml.internal.impl.TransitionImpl#getTarget Target}</li>
>- * <li>{@link org.eclipse.uml2.uml.internal.impl.TransitionImpl#getSource Source}</li>
> * </ul>
> * 
> *
>@@ -164,64 +164,64 @@
> 	protected static final int KIND_EFLAG = 0x3 << KIND_EFLAG_OFFSET;
> 
> 	/**
>-	 * The cached value of the '{@link #getRedefinedTransition() Redefined Transition}' reference.
>+	 * The cached value of the '{@link #getSource() Source}' reference.
> 	 * 
> 	 * 
>-	 * @see #getRedefinedTransition()
>+	 * @see #getSource()
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Transition redefinedTransition;
>+	protected Vertex source;
> 
> 	/**
>-	 * The cached value of the '{@link #getGuard() Guard}' reference.
>+	 * The cached value of the '{@link #getTarget() Target}' reference.
> 	 * 
> 	 * 
>-	 * @see #getGuard()
>+	 * @see #getTarget()
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Constraint guard;
>+	protected Vertex target;
> 
> 	/**
>-	 * The cached value of the '{@link #getEffect() Effect}' containment reference.
>+	 * The cached value of the '{@link #getRedefinedTransition() Redefined Transition}' reference.
> 	 * 
> 	 * 
>-	 * @see #getEffect()
>+	 * @see #getRedefinedTransition()
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Behavior effect;
>+	protected Transition redefinedTransition;
> 
> 	/**
>-	 * The cached value of the '{@link #getTriggers() Trigger}' containment reference list.
>+	 * The cached value of the '{@link #getGuard() Guard}' reference.
> 	 * 
> 	 * 
>-	 * @see #getTriggers()
>+	 * @see #getGuard()
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected EList<Trigger> triggers;
>+	protected Constraint guard;
> 
> 	/**
>-	 * The cached value of the '{@link #getTarget() Target}' reference.
>+	 * The cached value of the '{@link #getEffect() Effect}' containment reference.
> 	 * 
> 	 * 
>-	 * @see #getTarget()
>+	 * @see #getEffect()
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Vertex target;
>+	protected Behavior effect;
> 
> 	/**
>-	 * The cached value of the '{@link #getSource() Source}' reference.
>+	 * The cached value of the '{@link #getTriggers() Trigger}' containment reference list.
> 	 * 
> 	 * 
>-	 * @see #getSource()
>+	 * @see #getTriggers()
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Vertex source;
>+	protected EList<Trigger> triggers;
> 
> 	/**
> 	 * 
>@@ -1172,6 +1172,14 @@
> 				if (resolve)
> 					return getContainer();
> 				return basicGetContainer();
>+			case UMLPackage.TRANSITION__SOURCE :
>+				if (resolve)
>+					return getSource();
>+				return basicGetSource();
>+			case UMLPackage.TRANSITION__TARGET :
>+				if (resolve)
>+					return getTarget();
>+				return basicGetTarget();
> 			case UMLPackage.TRANSITION__REDEFINED_TRANSITION :
> 				if (resolve)
> 					return getRedefinedTransition();
>@@ -1186,14 +1194,6 @@
> 				return basicGetEffect();
> 			case UMLPackage.TRANSITION__TRIGGER :
> 				return getTriggers();
>-			case UMLPackage.TRANSITION__TARGET :
>-				if (resolve)
>-					return getTarget();
>-				return basicGetTarget();
>-			case UMLPackage.TRANSITION__SOURCE :
>-				if (resolve)
>-					return getSource();
>-				return basicGetSource();
> 		}
> 		return eDynamicGet(featureID, resolve, coreType);
> 	}
>@@ -1255,6 +1255,12 @@
> 			case UMLPackage.TRANSITION__CONTAINER :
> 				setContainer((Region) newValue);
> 				return;
>+			case UMLPackage.TRANSITION__SOURCE :
>+				setSource((Vertex) newValue);
>+				return;
>+			case UMLPackage.TRANSITION__TARGET :
>+				setTarget((Vertex) newValue);
>+				return;
> 			case UMLPackage.TRANSITION__REDEFINED_TRANSITION :
> 				setRedefinedTransition((Transition) newValue);
> 				return;
>@@ -1268,12 +1274,6 @@
> 				getTriggers().clear();
> 				getTriggers().addAll((Collection<? extends Trigger>) newValue);
> 				return;
>-			case UMLPackage.TRANSITION__TARGET :
>-				setTarget((Vertex) newValue);
>-				return;
>-			case UMLPackage.TRANSITION__SOURCE :
>-				setSource((Vertex) newValue);
>-				return;
> 		}
> 		eDynamicSet(featureID, newValue);
> 	}
>@@ -1322,6 +1322,12 @@
> 			case UMLPackage.TRANSITION__CONTAINER :
> 				setContainer((Region) null);
> 				return;
>+			case UMLPackage.TRANSITION__SOURCE :
>+				setSource((Vertex) null);
>+				return;
>+			case UMLPackage.TRANSITION__TARGET :
>+				setTarget((Vertex) null);
>+				return;
> 			case UMLPackage.TRANSITION__REDEFINED_TRANSITION :
> 				setRedefinedTransition((Transition) null);
> 				return;
>@@ -1334,12 +1340,6 @@
> 			case UMLPackage.TRANSITION__TRIGGER :
> 				getTriggers().clear();
> 				return;
>-			case UMLPackage.TRANSITION__TARGET :
>-				setTarget((Vertex) null);
>-				return;
>-			case UMLPackage.TRANSITION__SOURCE :
>-				setSource((Vertex) null);
>-				return;
> 		}
> 		eDynamicUnset(featureID);
> 	}
>@@ -1397,6 +1397,10 @@
> 				return (eFlags & KIND_EFLAG) != KIND_EFLAG_DEFAULT;
> 			case UMLPackage.TRANSITION__CONTAINER :
> 				return basicGetContainer() != null;
>+			case UMLPackage.TRANSITION__SOURCE :
>+				return source != null;
>+			case UMLPackage.TRANSITION__TARGET :
>+				return target != null;
> 			case UMLPackage.TRANSITION__REDEFINED_TRANSITION :
> 				return redefinedTransition != null;
> 			case UMLPackage.TRANSITION__GUARD :
>@@ -1405,10 +1409,6 @@
> 				return effect != null;
> 			case UMLPackage.TRANSITION__TRIGGER :
> 				return triggers != null && !triggers.isEmpty();
>-			case UMLPackage.TRANSITION__TARGET :
>-				return target != null;
>-			case UMLPackage.TRANSITION__SOURCE :
>-				return source != null;
> 		}
> 		return eDynamicIsSet(featureID);
> 	}
>Index: src/org/eclipse/uml2/uml/internal/impl/ActivityParameterNodeImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityParameterNodeImpl.java,v
>retrieving revision 1.19
>diff -u -r1.19 ActivityParameterNodeImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/ActivityParameterNodeImpl.java	21 Apr 2008 16:32:41 -0000	1.19
>+++ src/org/eclipse/uml2/uml/internal/impl/ActivityParameterNodeImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -195,6 +195,28 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public boolean validateMaximumOneParameterNode(DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return ActivityParameterNodeOperations.validateMaximumOneParameterNode(
>+			this, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateMaximumTwoParameterNodes(
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return ActivityParameterNodeOperations
>+			.validateMaximumTwoParameterNodes(this, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	@Override
> 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
> 		switch (featureID) {
>Index: src/org/eclipse/uml2/uml/internal/impl/GeneralizationImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationImpl.java,v
>retrieving revision 1.19
>diff -u -r1.19 GeneralizationImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/GeneralizationImpl.java	25 Apr 2007 17:47:03 -0000	1.19
>+++ src/org/eclipse/uml2/uml/internal/impl/GeneralizationImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -77,7 +77,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected static final boolean IS_SUBSTITUTABLE_EDEFAULT = false;
>+	protected static final boolean IS_SUBSTITUTABLE_EDEFAULT = true;
> 
> 	/**
> 	 * The flag representing the value of the '{@link #isSubstitutable() Is Substitutable}' attribute.
>@@ -125,6 +125,7 @@
> 	 */
> 	protected GeneralizationImpl() {
> 		super();
>+		eFlags |= IS_SUBSTITUTABLE_EFLAG;
> 	}
> 
> 	/**
>Index: src/org/eclipse/uml2/uml/internal/impl/AddStructuralFeatureValueActionImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddStructuralFeatureValueActionImpl.java,v
>retrieving revision 1.27
>diff -u -r1.27 AddStructuralFeatureValueActionImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/AddStructuralFeatureValueActionImpl.java	21 Apr 2008 16:32:41 -0000	1.27
>+++ src/org/eclipse/uml2/uml/internal/impl/AddStructuralFeatureValueActionImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -47,6 +47,7 @@
> import org.eclipse.uml2.uml.ExceptionHandler;
> import org.eclipse.uml2.uml.InputPin;
> import org.eclipse.uml2.uml.InterruptibleActivityRegion;
>+import org.eclipse.uml2.uml.OutputPin;
> import org.eclipse.uml2.uml.StringExpression;
> import org.eclipse.uml2.uml.StructuralFeature;
> import org.eclipse.uml2.uml.StructuredActivityNode;
>@@ -361,6 +362,8 @@
> 				return basicSetObject(null, msgs);
> 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__VALUE :
> 				return basicSetValue(null, msgs);
>+			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__RESULT :
>+				return basicSetResult(null, msgs);
> 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT :
> 				return basicSetInsertAt(null, msgs);
> 		}
>@@ -455,6 +458,10 @@
> 				if (resolve)
> 					return getValue();
> 				return basicGetValue();
>+			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__RESULT :
>+				if (resolve)
>+					return getResult();
>+				return basicGetResult();
> 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REPLACE_ALL :
> 				return isReplaceAll()
> 					? Boolean.TRUE
>@@ -559,6 +566,9 @@
> 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__VALUE :
> 				setValue((InputPin) newValue);
> 				return;
>+			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__RESULT :
>+				setResult((OutputPin) newValue);
>+				return;
> 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REPLACE_ALL :
> 				setIsReplaceAll(((Boolean) newValue).booleanValue());
> 				return;
>@@ -637,6 +647,9 @@
> 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__VALUE :
> 				setValue((InputPin) null);
> 				return;
>+			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__RESULT :
>+				setResult((OutputPin) null);
>+				return;
> 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REPLACE_ALL :
> 				setIsReplaceAll(IS_REPLACE_ALL_EDEFAULT);
> 				return;
>@@ -721,6 +734,8 @@
> 				return object != null;
> 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__VALUE :
> 				return value != null;
>+			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__RESULT :
>+				return result != null;
> 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REPLACE_ALL :
> 				return ((eFlags & IS_REPLACE_ALL_EFLAG) != 0) != IS_REPLACE_ALL_EDEFAULT;
> 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT :
>Index: src/org/eclipse/uml2/uml/internal/impl/TimeExpressionImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeExpressionImpl.java,v
>retrieving revision 1.18
>diff -u -r1.18 TimeExpressionImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/TimeExpressionImpl.java	25 Apr 2007 17:47:01 -0000	1.18
>+++ src/org/eclipse/uml2/uml/internal/impl/TimeExpressionImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -15,6 +15,7 @@
> import java.util.Collection;
> import org.eclipse.emf.common.notify.Notification;
> 
>+import org.eclipse.emf.common.notify.NotificationChain;
> import org.eclipse.emf.common.util.EList;
> 
> import org.eclipse.emf.ecore.EAnnotation;
>@@ -25,6 +26,7 @@
> 
> import org.eclipse.emf.ecore.util.EObjectResolvingEList;
> 
>+import org.eclipse.emf.ecore.util.InternalEList;
> import org.eclipse.uml2.uml.Comment;
> import org.eclipse.uml2.uml.Dependency;
> import org.eclipse.uml2.uml.Observation;
>@@ -57,7 +59,7 @@
> 		implements TimeExpression {
> 
> 	/**
>-	 * The cached value of the '{@link #getExpr() Expr}' reference.
>+	 * The cached value of the '{@link #getExpr() Expr}' containment reference.
> 	 * 
> 	 * 
> 	 * @see #getExpr()
>@@ -105,6 +107,16 @@
> 			InternalEObject oldExpr = (InternalEObject) expr;
> 			expr = (ValueSpecification) eResolveProxy(oldExpr);
> 			if (expr != oldExpr) {
>+				InternalEObject newExpr = (InternalEObject) expr;
>+				NotificationChain msgs = oldExpr.eInverseRemove(this,
>+					EOPPOSITE_FEATURE_BASE - UMLPackage.TIME_EXPRESSION__EXPR,
>+					null, null);
>+				if (newExpr.eInternalContainer() == null) {
>+					msgs = newExpr.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.TIME_EXPRESSION__EXPR, null, msgs);
>+				}
>+				if (msgs != null)
>+					msgs.dispatch();
> 				if (eNotificationRequired())
> 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
> 						UMLPackage.TIME_EXPRESSION__EXPR, oldExpr, expr));
>@@ -127,12 +139,59 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public void setExpr(ValueSpecification newExpr) {
>+	public NotificationChain basicSetExpr(ValueSpecification newExpr,
>+			NotificationChain msgs) {
> 		ValueSpecification oldExpr = expr;
> 		expr = newExpr;
>-		if (eNotificationRequired())
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this,
>+				Notification.SET, UMLPackage.TIME_EXPRESSION__EXPR, oldExpr,
>+				newExpr);
>+			if (msgs == null)
>+				msgs = notification;
>+			else
>+				msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setExpr(ValueSpecification newExpr) {
>+		if (newExpr != expr) {
>+			NotificationChain msgs = null;
>+			if (expr != null)
>+				msgs = ((InternalEObject) expr).eInverseRemove(this,
>+					EOPPOSITE_FEATURE_BASE - UMLPackage.TIME_EXPRESSION__EXPR,
>+					null, msgs);
>+			if (newExpr != null)
>+				msgs = ((InternalEObject) newExpr).eInverseAdd(this,
>+					EOPPOSITE_FEATURE_BASE - UMLPackage.TIME_EXPRESSION__EXPR,
>+					null, msgs);
>+			msgs = basicSetExpr(newExpr, msgs);
>+			if (msgs != null)
>+				msgs.dispatch();
>+		} else if (eNotificationRequired())
> 			eNotify(new ENotificationImpl(this, Notification.SET,
>-				UMLPackage.TIME_EXPRESSION__EXPR, oldExpr, expr));
>+				UMLPackage.TIME_EXPRESSION__EXPR, newExpr, newExpr));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ValueSpecification createExpr(String name, Type type, EClass eClass) {
>+		ValueSpecification newExpr = (ValueSpecification) create(eClass);
>+		setExpr(newExpr);
>+		if (name != null)
>+			newExpr.setName(name);
>+		if (type != null)
>+			newExpr.setType(type);
>+		return newExpr;
> 	}
> 
> 	/**
>@@ -193,6 +252,36 @@
> 	 * @generated
> 	 */
> 	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd,
>+			int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case UMLPackage.TIME_EXPRESSION__EANNOTATIONS :
>+				return ((InternalEList<?>) getEAnnotations()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.TIME_EXPRESSION__OWNED_COMMENT :
>+				return ((InternalEList<?>) getOwnedComments()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.TIME_EXPRESSION__CLIENT_DEPENDENCY :
>+				return ((InternalEList<?>) getClientDependencies())
>+					.basicRemove(otherEnd, msgs);
>+			case UMLPackage.TIME_EXPRESSION__NAME_EXPRESSION :
>+				return basicSetNameExpression(null, msgs);
>+			case UMLPackage.TIME_EXPRESSION__OWNING_TEMPLATE_PARAMETER :
>+				return basicSetOwningTemplateParameter(null, msgs);
>+			case UMLPackage.TIME_EXPRESSION__TEMPLATE_PARAMETER :
>+				return basicSetTemplateParameter(null, msgs);
>+			case UMLPackage.TIME_EXPRESSION__EXPR :
>+				return basicSetExpr(null, msgs);
>+		}
>+		return eDynamicInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
> 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
> 		switch (featureID) {
> 			case UMLPackage.TIME_EXPRESSION__EANNOTATIONS :
>Index: src/org/eclipse/uml2/uml/internal/impl/ClassifierTemplateParameterImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierTemplateParameterImpl.java,v
>retrieving revision 1.21
>diff -u -r1.21 ClassifierTemplateParameterImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/ClassifierTemplateParameterImpl.java	25 Apr 2007 17:47:03 -0000	1.21
>+++ src/org/eclipse/uml2/uml/internal/impl/ClassifierTemplateParameterImpl.java	24 Sep 2008 18:40:11 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -20,11 +20,13 @@
> 
> import org.eclipse.emf.common.util.DiagnosticChain;
> 
>+import org.eclipse.emf.common.util.EList;
> import org.eclipse.emf.ecore.EAnnotation;
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.InternalEObject;
> 
> import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
> import org.eclipse.emf.ecore.resource.Resource;
> 
> import org.eclipse.uml2.uml.Classifier;
>@@ -44,8 +46,7 @@
> * The following features are implemented:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.ClassifierTemplateParameterImpl#isAllowSubstitutable Allow Substitutable}</li>
>- * <li>{@link org.eclipse.uml2.uml.internal.impl.ClassifierTemplateParameterImpl#getDefaultClassifier Default Classifier}</li>
>- * <li>{@link org.eclipse.uml2.uml.internal.impl.ClassifierTemplateParameterImpl#getConstrainingClassifier Constraining Classifier}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.ClassifierTemplateParameterImpl#getConstrainingClassifiers Constraining Classifier}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.ClassifierTemplateParameterImpl#getParameteredElement Parametered Element}</li>
> * </ul>
> * 
>@@ -77,24 +78,14 @@
> 	protected static final int ALLOW_SUBSTITUTABLE_EFLAG = 1 << 8;
> 
> 	/**
>-	 * The cached value of the '{@link #getDefaultClassifier() Default Classifier}' reference.
>+	 * The cached value of the '{@link #getConstrainingClassifiers() Constraining Classifier}' reference list.
> 	 * 
> 	 * 
>-	 * @see #getDefaultClassifier()
>+	 * @see #getConstrainingClassifiers()
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Classifier defaultClassifier;
>-
>-	/**
>-	 * The cached value of the '{@link #getConstrainingClassifier() Constraining Classifier}' reference.
>-	 * 
>-	 * 
>-	 * @see #getConstrainingClassifier()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected Classifier constrainingClassifier;
>+	protected EList<Classifier> constrainingClassifiers;
> 
> 	/**
> 	 * 
>@@ -147,29 +138,14 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public Classifier getDefaultClassifier() {
>-		if (defaultClassifier != null && defaultClassifier.eIsProxy()) {
>-			InternalEObject oldDefaultClassifier = (InternalEObject) defaultClassifier;
>-			defaultClassifier = (Classifier) eResolveProxy(oldDefaultClassifier);
>-			if (defaultClassifier != oldDefaultClassifier) {
>-				if (eNotificationRequired())
>-					eNotify(new ENotificationImpl(
>-						this,
>-						Notification.RESOLVE,
>-						UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__DEFAULT_CLASSIFIER,
>-						oldDefaultClassifier, defaultClassifier));
>-			}
>+	public EList<Classifier> getConstrainingClassifiers() {
>+		if (constrainingClassifiers == null) {
>+			constrainingClassifiers = new EObjectResolvingEList<Classifier>(
>+				Classifier.class,
>+				this,
>+				UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER);
> 		}
>-		return defaultClassifier;
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public Classifier basicGetDefaultClassifier() {
>-		return defaultClassifier;
>+		return constrainingClassifiers;
> 	}
> 
> 	/**
>@@ -177,13 +153,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public void setDefaultClassifier(Classifier newDefaultClassifier) {
>-		Classifier oldDefaultClassifier = defaultClassifier;
>-		defaultClassifier = newDefaultClassifier;
>-		if (eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET,
>-				UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__DEFAULT_CLASSIFIER,
>-				oldDefaultClassifier, defaultClassifier));
>+	public Classifier getConstrainingClassifier(String name) {
>+		return getConstrainingClassifier(name, false, null);
> 	}
> 
> 	/**
>@@ -191,45 +162,18 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public Classifier getConstrainingClassifier() {
>-		if (constrainingClassifier != null && constrainingClassifier.eIsProxy()) {
>-			InternalEObject oldConstrainingClassifier = (InternalEObject) constrainingClassifier;
>-			constrainingClassifier = (Classifier) eResolveProxy(oldConstrainingClassifier);
>-			if (constrainingClassifier != oldConstrainingClassifier) {
>-				if (eNotificationRequired())
>-					eNotify(new ENotificationImpl(
>-						this,
>-						Notification.RESOLVE,
>-						UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER,
>-						oldConstrainingClassifier, constrainingClassifier));
>-			}
>+	public Classifier getConstrainingClassifier(String name,
>+			boolean ignoreCase, EClass eClass) {
>+		constrainingClassifierLoop : for (Classifier constrainingClassifier : getConstrainingClassifiers()) {
>+			if (eClass != null && !eClass.isInstance(constrainingClassifier))
>+				continue constrainingClassifierLoop;
>+			if (name != null && !(ignoreCase
>+				? name.equalsIgnoreCase(constrainingClassifier.getName())
>+				: name.equals(constrainingClassifier.getName())))
>+				continue constrainingClassifierLoop;
>+			return constrainingClassifier;
> 		}
>-		return constrainingClassifier;
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public Classifier basicGetConstrainingClassifier() {
>-		return constrainingClassifier;
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setConstrainingClassifier(Classifier newConstrainingClassifier) {
>-		Classifier oldConstrainingClassifier = constrainingClassifier;
>-		constrainingClassifier = newConstrainingClassifier;
>-		if (eNotificationRequired())
>-			eNotify(new ENotificationImpl(
>-				this,
>-				Notification.SET,
>-				UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER,
>-				oldConstrainingClassifier, constrainingClassifier));
>+		return null;
> 	}
> 
> 	/**
>@@ -400,14 +344,8 @@
> 				return isAllowSubstitutable()
> 					? Boolean.TRUE
> 					: Boolean.FALSE;
>-			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__DEFAULT_CLASSIFIER :
>-				if (resolve)
>-					return getDefaultClassifier();
>-				return basicGetDefaultClassifier();
> 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER :
>-				if (resolve)
>-					return getConstrainingClassifier();
>-				return basicGetConstrainingClassifier();
>+				return getConstrainingClassifiers();
> 		}
> 		return eDynamicGet(featureID, resolve, coreType);
> 	}
>@@ -449,11 +387,10 @@
> 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__ALLOW_SUBSTITUTABLE :
> 				setAllowSubstitutable(((Boolean) newValue).booleanValue());
> 				return;
>-			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__DEFAULT_CLASSIFIER :
>-				setDefaultClassifier((Classifier) newValue);
>-				return;
> 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER :
>-				setConstrainingClassifier((Classifier) newValue);
>+				getConstrainingClassifiers().clear();
>+				getConstrainingClassifiers().addAll(
>+					(Collection<? extends Classifier>) newValue);
> 				return;
> 		}
> 		eDynamicSet(featureID, newValue);
>@@ -491,11 +428,8 @@
> 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__ALLOW_SUBSTITUTABLE :
> 				setAllowSubstitutable(ALLOW_SUBSTITUTABLE_EDEFAULT);
> 				return;
>-			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__DEFAULT_CLASSIFIER :
>-				setDefaultClassifier((Classifier) null);
>-				return;
> 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER :
>-				setConstrainingClassifier((Classifier) null);
>+				getConstrainingClassifiers().clear();
> 				return;
> 		}
> 		eDynamicUnset(featureID);
>@@ -529,10 +463,9 @@
> 				return ownedDefault != null;
> 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__ALLOW_SUBSTITUTABLE :
> 				return ((eFlags & ALLOW_SUBSTITUTABLE_EFLAG) != 0) != ALLOW_SUBSTITUTABLE_EDEFAULT;
>-			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__DEFAULT_CLASSIFIER :
>-				return defaultClassifier != null;
> 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER :
>-				return constrainingClassifier != null;
>+				return constrainingClassifiers != null
>+					&& !constrainingClassifiers.isEmpty();
> 		}
> 		return eDynamicIsSet(featureID);
> 	}
>Index: src/org/eclipse/uml2/uml/internal/impl/VertexImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VertexImpl.java,v
>retrieving revision 1.22
>diff -u -r1.22 VertexImpl.java
>--- src/org/eclipse/uml2/uml/internal/impl/VertexImpl.java	4 May 2007 20:35:34 -0000	1.22
>+++ src/org/eclipse/uml2/uml/internal/impl/VertexImpl.java	24 Sep 2008 18:40:12 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -48,8 +48,8 @@
> * The following features are implemented:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.VertexImpl#getNamespace Namespace}</li>
>- * <li>{@link org.eclipse.uml2.uml.internal.impl.VertexImpl#getIncomings Incoming}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.VertexImpl#getOutgoings Outgoing}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.VertexImpl#getIncomings Incoming}</li>
> * <li>{@link org.eclipse.uml2.uml.internal.impl.VertexImpl#getContainer Container}</li>
> * </ul>
> * 
>@@ -332,10 +332,10 @@
> 				if (resolve)
> 					return getNameExpression();
> 				return basicGetNameExpression();
>-			case UMLPackage.VERTEX__INCOMING :
>-				return getIncomings();
> 			case UMLPackage.VERTEX__OUTGOING :
> 				return getOutgoings();
>+			case UMLPackage.VERTEX__INCOMING :
>+				return getIncomings();
> 			case UMLPackage.VERTEX__CONTAINER :
> 				if (resolve)
> 					return getContainer();
>@@ -377,16 +377,6 @@
> 			case UMLPackage.VERTEX__NAME_EXPRESSION :
> 				setNameExpression((StringExpression) newValue);
> 				return;
>-			case UMLPackage.VERTEX__INCOMING :
>-				getIncomings().clear();
>-				getIncomings().addAll(
>-					(Collection<? extends Transition>) newValue);
>-				return;
>-			case UMLPackage.VERTEX__OUTGOING :
>-				getOutgoings().clear();
>-				getOutgoings().addAll(
>-					(Collection<? extends Transition>) newValue);
>-				return;
> 			case UMLPackage.VERTEX__CONTAINER :
> 				setContainer((Region) newValue);
> 				return;
>@@ -420,12 +410,6 @@
> 			case UMLPackage.VERTEX__NAME_EXPRESSION :
> 				setNameExpression((StringExpression) null);
> 				return;
>-			case UMLPackage.VERTEX__INCOMING :
>-				getIncomings().clear();
>-				return;
>-			case UMLPackage.VERTEX__OUTGOING :
>-				getOutgoings().clear();
>-				return;
> 			case UMLPackage.VERTEX__CONTAINER :
> 				setContainer((Region) null);
> 				return;
>@@ -464,10 +448,10 @@
> 				return isSetNamespace();
> 			case UMLPackage.VERTEX__NAME_EXPRESSION :
> 				return nameExpression != null;
>-			case UMLPackage.VERTEX__INCOMING :
>-				return !getIncomings().isEmpty();
> 			case UMLPackage.VERTEX__OUTGOING :
> 				return !getOutgoings().isEmpty();
>+			case UMLPackage.VERTEX__INCOMING :
>+				return !getIncomings().isEmpty();
> 			case UMLPackage.VERTEX__CONTAINER :
> 				return basicGetContainer() != null;
> 		}
>Index: src/org/eclipse/uml2/uml/internal/impl/uml.ecore
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/uml.ecore,v
>retrieving revision 1.66
>diff -u -r1.66 uml.ecore
>--- src/org/eclipse/uml2/uml/internal/impl/uml.ecore	9 Jan 2008 18:56:03 -0000	1.66
>+++ src/org/eclipse/uml2/uml/internal/impl/uml.ecore	24 Sep 2008 18:40:13 -0000
>@@ -2,7 +2,7 @@
> <ecore:EPackage xmi:version="2.0"
> xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="uml"
>- nsURI="http://www.eclipse.org/uml2/2.1.0/UML" nsPrefix="uml">
>+ nsURI="http://www.eclipse.org/uml2/3.0.0/UML" nsPrefix="uml">
> <eClassifiers xsi:type="ecore:EDataType" name="Integer" instanceClassName="int"/>
> <eClassifiers xsi:type="ecore:EDataType" name="Boolean" instanceClassName="boolean"/>
> <eClassifiers xsi:type="ecore:EDataType" name="String" instanceClassName="java.lang.String"/>
>@@ -908,9 +908,9 @@
> <eStructuralFeatures xsi:type="ecore:EReference" name="formal" ordered="false"
> lowerBound="1" eType="#//TemplateParameter"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="actual" ordered="false"
>- lowerBound="1" upperBound="-1" eType="#//ParameterableElement"/>
>+ lowerBound="1" eType="#//ParameterableElement"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="ownedActual" ordered="false"
>- upperBound="-1" eType="#//ParameterableElement" containment="true">
>+ eType="#//ParameterableElement" containment="true">
> <eAnnotations source="subsets" references="#//TemplateParameterSubstitution/actual #//Element/ownedElement"/>
> </eStructuralFeatures>
> <eStructuralFeatures xsi:type="ecore:EReference" name="templateBinding" ordered="false"
>@@ -929,7 +929,7 @@
> </eParameters>
> </eOperations>
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSubstitutable" ordered="false"
>- eType="#//Boolean" unsettable="true"/>
>+ eType="#//Boolean" defaultValueLiteral="true" unsettable="true"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="general" ordered="false"
> lowerBound="1" eType="#//Classifier">
> <eAnnotations source="subsets" references="#//DirectedRelationship/target"/>
>@@ -1135,15 +1135,6 @@
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="MultiplicityElement" abstract="true"
> eSuperTypes="#//Element">
>- <eOperations name="upper_gt_0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>- <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>- <eParameters name="context">
>- <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>- </eGenericType>
>- </eParameters>
>- </eOperations>
> <eOperations name="lower_ge_0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
> <eParameters name="context">
>@@ -1232,17 +1223,9 @@
> </contents>
> </eAnnotations>
> <eOperations name="getEnds" ordered="false" upperBound="-1" eType="#//ConnectorEnd"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="end" upperBound="-1" eType="#//ConnectorEnd"
>- volatile="true" transient="true" derived="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ConnectableElementTemplateParameter"
>- eSuperTypes="#//TemplateParameter">
>- <eAnnotations source="duplicates">
>- <contents xsi:type="ecore:EReference" name="parameteredElement" ordered="false"
>- lowerBound="1" eType="#//ParameterableElement" eOpposite="#//ConnectableElement/%duplicates%/templateParameter">
>- <eAnnotations source="redefines" references="#//TemplateParameter/parameteredElement"/>
>- </contents>
>- </eAnnotations>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="end" ordered="false" upperBound="-1"
>+ eType="#//ConnectorEnd" changeable="false" volatile="true" transient="true"
>+ derived="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="ConnectorEnd" eSuperTypes="#//MultiplicityElement">
> <eOperations name="multiplicity" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>@@ -1284,12 +1267,12 @@
> <eOperations name="getDefiningEnd" ordered="false" lowerBound="1" eType="#//Property"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="definingEnd" ordered="false"
> eType="#//Property" changeable="false" volatile="true" transient="true" derived="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="partWithPort" ordered="false"
>- eType="#//Property"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="role" ordered="false" lowerBound="1"
> eType="#//ConnectableElement"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="partWithPort" ordered="false"
>+ eType="#//Property"/>
> </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Property" eSuperTypes="#//StructuralFeature #//ConnectableElement #//DeploymentTarget #//TemplateableElement">
>+ <eClassifiers xsi:type="ecore:EClass" name="Property" eSuperTypes="#//StructuralFeature #//ConnectableElement #//DeploymentTarget">
> <eAnnotations source="duplicates">
> <contents xsi:type="ecore:EOperation" name="isConsistentWith" ordered="false"
> lowerBound="1" eType="#//Boolean">
>@@ -2147,12 +2130,18 @@
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="Vertex" abstract="true" eSuperTypes="#//NamedElement">
> <eOperations name="containingStateMachine" ordered="false" lowerBound="1" eType="#//StateMachine"/>
>- <eOperations name="getIncomings" ordered="false" upperBound="-1" eType="#//Transition"/>
> <eOperations name="getOutgoings" ordered="false" upperBound="-1" eType="#//Transition"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" ordered="false"
>- upperBound="-1" eType="#//Transition" volatile="true" transient="true" derived="true"/>
>+ <eOperations name="getIncomings" ordered="false" upperBound="-1" eType="#//Transition"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" ordered="false"
>- upperBound="-1" eType="#//Transition" volatile="true" transient="true" derived="true"/>
>+ upperBound="-1" eType="#//Transition" changeable="false" volatile="true" transient="true"
>+ derived="true">
>+ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
>+ <details key="name" value=""/>
>+ </eAnnotations>
>+ </eStructuralFeatures>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" ordered="false"
>+ upperBound="-1" eType="#//Transition" changeable="false" volatile="true" transient="true"
>+ derived="true"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="container" ordered="false"
> eType="#//Region" eOpposite="#//Region/subvertex">
> <eAnnotations source="subsets" references="#//NamedElement/namespace"/>
>@@ -2242,6 +2231,10 @@
> lowerBound="1" eType="#//Region" eOpposite="#//Region/transition">
> <eAnnotations source="subsets" references="#//NamedElement/namespace"/>
> </eStructuralFeatures>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"
>+ lowerBound="1" eType="#//Vertex"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"
>+ lowerBound="1" eType="#//Vertex"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedTransition" ordered="false"
> eType="#//Transition">
> <eAnnotations source="subsets" references="#//RedefinableElement/redefinedElement"/>
>@@ -2256,10 +2249,6 @@
> </eStructuralFeatures>
> <eStructuralFeatures xsi:type="ecore:EReference" name="trigger" ordered="false"
> upperBound="-1" eType="#//Trigger" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"
>- lowerBound="1" eType="#//Vertex"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"
>- lowerBound="1" eType="#//Vertex"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EEnum" name="TransitionKind">
> <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
>@@ -3012,6 +3001,15 @@
> <eLiterals name="shared" value="1"/>
> <eLiterals name="composite" value="2"/>
> </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ConnectableElementTemplateParameter"
>+ eSuperTypes="#//TemplateParameter">
>+ <eAnnotations source="duplicates">
>+ <contents xsi:type="ecore:EReference" name="parameteredElement" ordered="false"
>+ lowerBound="1" eType="#//ParameterableElement" eOpposite="#//ConnectableElement/%duplicates%/templateParameter">
>+ <eAnnotations source="redefines" references="#//TemplateParameter/parameteredElement"/>
>+ </contents>
>+ </eAnnotations>
>+ </eClassifiers>
> <eClassifiers xsi:type="ecore:EEnum" name="ParameterDirectionKind">
> <eLiterals name="in"/>
> <eLiterals name="inout" value="1"/>
>@@ -3216,10 +3214,8 @@
> </eOperations>
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="allowSubstitutable" ordered="false"
> lowerBound="1" eType="#//Boolean" defaultValueLiteral="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="defaultClassifier" ordered="false"
>- eType="#//Classifier"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="constrainingClassifier"
>- ordered="false" eType="#//Classifier"/>
>+ ordered="false" upperBound="-1" eType="#//Classifier"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="StringExpression" eSuperTypes="#//Expression #//TemplateableElement">
> <eAnnotations source="duplicates">
>@@ -4278,6 +4274,24 @@
> </eGenericType>
> </eParameters>
> </eOperations>
>+ <eOperations name="maximum_one_parameter_node" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="maximum_two_parameter_nodes" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
> <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" ordered="false"
> lowerBound="1" eType="#//Parameter"/>
> </eClassifiers>
>@@ -4882,7 +4896,7 @@
> </eOperations>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="DecisionNode" eSuperTypes="#//ControlNode">
>- <eOperations name="one_incoming_edge" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eOperations name="incoming_outgoing_edges" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
> <eParameters name="context">
> <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>@@ -4891,7 +4905,7 @@
> </eGenericType>
> </eParameters>
> </eOperations>
>- <eOperations name="input_parameter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eOperations name="edges" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
> <eParameters name="context">
> <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>@@ -4900,7 +4914,52 @@
> </eGenericType>
> </eParameters>
> </eOperations>
>- <eOperations name="edges" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eOperations name="decision_input_flow_incoming" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="parameters" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="zero_input_parameters" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="incoming_object_one_input_parameter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="incoming_control_one_input_parameter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="two_input_parameters" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
> <eParameters name="context">
> <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>@@ -4911,6 +4970,90 @@
> </eOperations>
> <eStructuralFeatures xsi:type="ecore:EReference" name="decisionInput" ordered="false"
> eType="#//Behavior"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="decisionInputFlow" ordered="false"
>+ eType="#//ObjectFlow"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ObjectFlow" eSuperTypes="#//ActivityEdge">
>+ <eOperations name="no_actions" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="compatible_types" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="same_upper_bounds" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="target" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="transformation_behaviour" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="selection_behaviour" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="input_and_output_parameter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="is_multicast_or_is_multireceive" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="isMulticast" ordered="false"
>+ lowerBound="1" eType="#//Boolean" defaultValueLiteral="false"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="isMultireceive" ordered="false"
>+ lowerBound="1" eType="#//Boolean" defaultValueLiteral="false"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="transformation" ordered="false"
>+ eType="#//Behavior"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="selection" ordered="false"
>+ eType="#//Behavior"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="ActivityFinalNode" eSuperTypes="#//FinalNode"/>
> <eClassifiers xsi:type="ecore:EClass" name="ComponentRealization" eSuperTypes="#//Realization">
>@@ -4919,7 +5062,7 @@
> <eAnnotations source="subsets" references="#//Element/owner #//Dependency/client"/>
> </eStructuralFeatures>
> <eStructuralFeatures xsi:type="ecore:EReference" name="realizingClassifier" ordered="false"
>- lowerBound="1" eType="#//Classifier">
>+ lowerBound="1" upperBound="-1" eType="#//Classifier">
> <eAnnotations source="subsets" references="#//Dependency/supplier"/>
> </eStructuralFeatures>
> </eClassifiers>
>@@ -5381,12 +5524,57 @@
> </eGenericType>
> </eParameters>
> </eOperations>
>+ <eOperations name="type_of_result" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="multiplicity_of_result" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
> <eStructuralFeatures xsi:type="ecore:EReference" name="value" ordered="false"
> lowerBound="1" eType="#//InputPin" containment="true">
> <eAnnotations source="subsets" references="#//Action/input"/>
> </eStructuralFeatures>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="result" ordered="false"
>+ eType="#//OutputPin" containment="true">
>+ <eAnnotations source="subsets" references="#//Action/output"/>
>+ </eStructuralFeatures>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ClearStructuralFeatureAction" eSuperTypes="#//StructuralFeatureAction">
>+ <eOperations name="type_of_result" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eOperations name="multiplicity_of_result" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>+ <eParameters name="context">
>+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>+ </eGenericType>
>+ </eParameters>
>+ </eOperations>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="result" ordered="false"
>+ eType="#//OutputPin" containment="true">
>+ <eAnnotations source="subsets" references="#//Action/output"/>
>+ </eStructuralFeatures>
> </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ClearStructuralFeatureAction" eSuperTypes="#//StructuralFeatureAction"/>
> <eClassifiers xsi:type="ecore:EClass" name="RemoveStructuralFeatureValueAction"
> eSuperTypes="#//WriteStructuralFeatureAction">
> <eOperations name="non_unique_removal" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>@@ -5770,7 +5958,8 @@
> <eAnnotations source="redefines" references="#//ValueSpecification/stringValue"/>
> </contents>
> </eAnnotations>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expr" ordered="false" eType="#//ValueSpecification"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expr" ordered="false" eType="#//ValueSpecification"
>+ containment="true"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="observation" ordered="false"
> upperBound="-1" eType="#//Observation"/>
> </eClassifiers>
>@@ -5782,7 +5971,8 @@
> <eAnnotations source="redefines" references="#//ValueSpecification/stringValue"/>
> </contents>
> </eAnnotations>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expr" ordered="false" eType="#//ValueSpecification"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expr" ordered="false" eType="#//ValueSpecification"
>+ containment="true"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="observation" ordered="false"
> upperBound="-1" eType="#//Observation"/>
> </eClassifiers>
>@@ -5952,7 +6142,7 @@
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isRelative" ordered="false"
> lowerBound="1" eType="#//Boolean" defaultValueLiteral="false"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="when" ordered="false" lowerBound="1"
>- eType="#//ValueSpecification" containment="true">
>+ eType="#//TimeExpression" containment="true">
> <eAnnotations source="subsets" references="#//Element/ownedElement"/>
> </eStructuralFeatures>
> </eClassifiers>
>@@ -6726,44 +6916,8 @@
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="isOrdered" ordered="false"
> lowerBound="1" eType="#//Boolean" defaultValueLiteral="false"/>
> </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="JoinNode" eSuperTypes="#//ControlNode">
>- <eOperations name="one_outgoing_edge" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>- <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>- <eParameters name="context">
>- <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>- </eGenericType>
>- </eParameters>
>- </eOperations>
>- <eOperations name="incoming_object_flow" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>- <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>- <eParameters name="context">
>- <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>- </eGenericType>
>- </eParameters>
>- </eOperations>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="isCombineDuplicate" ordered="false"
>- lowerBound="1" eType="#//Boolean" defaultValueLiteral="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="joinSpec" ordered="false"
>- lowerBound="1" eType="#//ValueSpecification" containment="true">
>- <eAnnotations source="subsets" references="#//Element/ownedElement"/>
>- </eStructuralFeatures>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="DataStoreNode" eSuperTypes="#//CentralBufferNode"/>
>- <eClassifiers xsi:type="ecore:EClass" name="ObjectFlow" eSuperTypes="#//ActivityEdge">
>- <eOperations name="no_actions" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>- <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>- <eParameters name="context">
>- <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>- <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
>- </eGenericType>
>- </eParameters>
>- </eOperations>
>- <eOperations name="compatible_types" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eClassifiers xsi:type="ecore:EClass" name="StartObjectBehaviorAction" eSuperTypes="#//CallAction">
>+ <eOperations name="type_of_object" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
> <eParameters name="context">
> <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>@@ -6772,7 +6926,7 @@
> </eGenericType>
> </eParameters>
> </eOperations>
>- <eOperations name="same_upper_bounds" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eOperations name="multiplicity_of_object" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
> <eParameters name="context">
> <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>@@ -6781,7 +6935,7 @@
> </eGenericType>
> </eParameters>
> </eOperations>
>- <eOperations name="target" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eOperations name="number_order_arguments" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
> <eParameters name="context">
> <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>@@ -6790,7 +6944,7 @@
> </eGenericType>
> </eParameters>
> </eOperations>
>- <eOperations name="transformation_behaviour" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eOperations name="number_order_results" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
> <eParameters name="context">
> <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>@@ -6799,7 +6953,7 @@
> </eGenericType>
> </eParameters>
> </eOperations>
>- <eOperations name="selection_behaviour" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eOperations name="type_ordering_multiplicity_match" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
> <eParameters name="context">
> <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>@@ -6808,7 +6962,13 @@
> </eGenericType>
> </eParameters>
> </eOperations>
>- <eOperations name="input_and_output_parameter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="object" ordered="false"
>+ lowerBound="1" eType="#//InputPin" containment="true">
>+ <eAnnotations source="subsets" references="#//Action/input"/>
>+ </eStructuralFeatures>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="JoinNode" eSuperTypes="#//ControlNode">
>+ <eOperations name="one_outgoing_edge" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
> <eParameters name="context">
> <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>@@ -6817,7 +6977,7 @@
> </eGenericType>
> </eParameters>
> </eOperations>
>- <eOperations name="is_multicast_or_is_multireceive" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
>+ <eOperations name="incoming_object_flow" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
> <eParameters name="context">
> <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
>@@ -6826,15 +6986,14 @@
> </eGenericType>
> </eParameters>
> </eOperations>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="isMulticast" ordered="false"
>- lowerBound="1" eType="#//Boolean" defaultValueLiteral="false"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="isMultireceive" ordered="false"
>- lowerBound="1" eType="#//Boolean" defaultValueLiteral="false"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="transformation" ordered="false"
>- eType="#//Behavior"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="selection" ordered="false"
>- eType="#//Behavior"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="isCombineDuplicate" ordered="false"
>+ lowerBound="1" eType="#//Boolean" defaultValueLiteral="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="joinSpec" ordered="false"
>+ lowerBound="1" eType="#//ValueSpecification" containment="true">
>+ <eAnnotations source="subsets" references="#//Element/ownedElement"/>
>+ </eStructuralFeatures>
> </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="DataStoreNode" eSuperTypes="#//CentralBufferNode"/>
> <eClassifiers xsi:type="ecore:EClass" name="ConditionalNode" eSuperTypes="#//StructuredActivityNode">
> <eOperations name="result_no_incoming" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
> <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
>Index: src/org/eclipse/uml2/uml/internal/operations/ComponentOperations.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ComponentOperations.java,v
>retrieving revision 1.14
>diff -u -r1.14 ComponentOperations.java
>--- src/org/eclipse/uml2/uml/internal/operations/ComponentOperations.java	3 May 2007 21:11:51 -0000	1.14
>+++ src/org/eclipse/uml2/uml/internal/operations/ComponentOperations.java	24 Sep 2008 18:40:13 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -249,14 +249,17 @@
> 			false, new UniqueEList.FastCompare<Interface>());
> 
> 		for (ComponentRealization realization : component.getRealizations()) {
>-			Classifier realizingClassifier = realization
>-				.getRealizingClassifier();
> 
>-			if (realizingClassifier != null) {
>-				usedInterfaces(component, realizingClassifier, false, requireds);
>+			for (Classifier realizingClassifier : realization
>+				.getRealizingClassifiers()) {
> 
>-				for (Classifier parent : realizingClassifier.allParents()) {
>-					usedInterfaces(component, parent, false, requireds);
>+				if (realizingClassifier != null) {
>+					usedInterfaces(component, realizingClassifier, false,
>+						requireds);
>+
>+					for (Classifier parent : realizingClassifier.allParents()) {
>+						usedInterfaces(component, parent, false, requireds);
>+					}
> 				}
> 			}
> 		}
>@@ -290,15 +293,16 @@
> 			false, new UniqueEList.FastCompare<Interface>());
> 
> 		for (ComponentRealization realization : component.getRealizations()) {
>-			Classifier realizingClassifier = realization
>-				.getRealizingClassifier();
>+			for (Classifier realizingClassifier : realization
>+				.getRealizingClassifiers()) {
> 
>-			if (realizingClassifier != null) {
>-				realizedInterfaces(component, realizingClassifier, false,
>-					provideds);
>+				if (realizingClassifier != null) {
>+					realizedInterfaces(component, realizingClassifier, false,
>+						provideds);
> 
>-				for (Classifier parent : realizingClassifier.allParents()) {
>-					realizedInterfaces(component, parent, false, provideds);
>+					for (Classifier parent : realizingClassifier.allParents()) {
>+						realizedInterfaces(component, parent, false, provideds);
>+					}
> 				}
> 			}
> 		}
>Index: src/org/eclipse/uml2/uml/internal/operations/ConnectableElementOperations.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectableElementOperations.java,v
>retrieving revision 1.5
>diff -u -r1.5 ConnectableElementOperations.java
>--- src/org/eclipse/uml2/uml/internal/operations/ConnectableElementOperations.java	4 May 2007 20:35:34 -0000	1.5
>+++ src/org/eclipse/uml2/uml/internal/operations/ConnectableElementOperations.java	24 Sep 2008 18:40:13 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2006, 2007 IBM Corporation and others.
>+ * Copyright (c) 2006, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -118,6 +118,10 @@
> 	/**
> 	 * 
> 	 * 
>+	 * 
>+	 * result = ConnectorEnd.allInstances()->select(e | e.role=self)
>+	 * @param connectableElement The receiving 'Connectable Element' model object.
>+	 * 
> 	 * @generated NOT
> 	 */
> 	public static EList<ConnectorEnd> getEnds(
>Index: src/org/eclipse/uml2/uml/internal/operations/BehavioredClassifierOperations.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BehavioredClassifierOperations.java,v
>retrieving revision 1.12
>diff -u -r1.12 BehavioredClassifierOperations.java
>--- src/org/eclipse/uml2/uml/internal/operations/BehavioredClassifierOperations.java	19 Aug 2008 18:41:04 -0000	1.12
>+++ src/org/eclipse/uml2/uml/internal/operations/BehavioredClassifierOperations.java	24 Sep 2008 18:40:13 -0000
>@@ -151,7 +151,7 @@
> 					allRealizedInterfaces);
> 			}
> 		}
>-		
>+
> 		for (int i = 0, size = allRealizedInterfaces.size(); i < size; i++) {
> 
> 			for (Classifier parent : allRealizedInterfaces.get(i).allParents()) {
>@@ -161,7 +161,7 @@
> 				}
> 			}
> 		}
>-			
>+
> 		return allRealizedInterfaces;
> 	}
> 
>Index: src/org/eclipse/uml2/uml/internal/operations/TransitionOperations.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TransitionOperations.java,v
>retrieving revision 1.12
>diff -u -r1.12 TransitionOperations.java
>--- src/org/eclipse/uml2/uml/internal/operations/TransitionOperations.java	25 Mar 2008 13:41:38 -0000	1.12
>+++ src/org/eclipse/uml2/uml/internal/operations/TransitionOperations.java	24 Sep 2008 18:40:13 -0000
>@@ -210,9 +210,7 @@
> 	 * 
> 	 * 
> 	 * Transitions outgoing pseudostates may not have a trigger.
>-	 * source.oclIsKindOf(Pseudostate) and
>-	 * ((source.kind <> #junction) and (source.kind <> #join) and (source.kind <> #initial)) implies trigger->isEmpty()
>-	 * 
>+	 * source.oclIsKindOf(Pseudostate) and (source.kind <> #initial)) implies trigger->isEmpty()
> 	 * @param transition The receiving 'Transition' model object.
> 	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
> 	 * @param context The cache of context-specific information.
>Index: src/org/eclipse/uml2/uml/internal/operations/ActivityParameterNodeOperations.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityParameterNodeOperations.java,v
>retrieving revision 1.8
>diff -u -r1.8 ActivityParameterNodeOperations.java
>--- src/org/eclipse/uml2/uml/internal/operations/ActivityParameterNodeOperations.java	3 May 2007 21:11:51 -0000	1.8
>+++ src/org/eclipse/uml2/uml/internal/operations/ActivityParameterNodeOperations.java	24 Sep 2008 18:40:13 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -35,6 +35,8 @@
> * <li>{@link org.eclipse.uml2.uml.ActivityParameterNode#validateNoEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate No Edges}</li>
> * <li>{@link org.eclipse.uml2.uml.ActivityParameterNode#validateNoIncomingEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate No Incoming Edges}</li>
> * <li>{@link org.eclipse.uml2.uml.ActivityParameterNode#validateNoOutgoingEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate No Outgoing Edges}</li>
>+ * <li>{@link org.eclipse.uml2.uml.ActivityParameterNode#validateMaximumOneParameterNode(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Maximum One Parameter Node}</li>
>+ * <li>{@link org.eclipse.uml2.uml.ActivityParameterNode#validateMaximumTwoParameterNodes(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Maximum Two Parameter Nodes}</li>
> * </ul>
> * 
> *
>@@ -234,4 +236,76 @@
> 		return true;
> 	}
> 
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * A parameter with direction other than inout must have at most one activity parameter node in an activity.
>+	 * true
>+	 * @param activityParameterNode The receiving 'Activity Parameter Node' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateMaximumOneParameterNode(
>+			ActivityParameterNode activityParameterNode,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.ACTIVITY_PARAMETER_NODE__MAXIMUM_ONE_PARAMETER_NODE,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMaximumOneParameterNode", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityParameterNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{activityParameterNode}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * A parameter with direction inout must have at most two activity parameter nodes in an activity, one with incoming flows and one with outgoing flows.
>+	 * true
>+	 * @param activityParameterNode The receiving 'Activity Parameter Node' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateMaximumTwoParameterNodes(
>+			ActivityParameterNode activityParameterNode,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.ACTIVITY_PARAMETER_NODE__MAXIMUM_TWO_PARAMETER_NODES,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMaximumTwoParameterNodes", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityParameterNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{activityParameterNode}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+
> } // ActivityParameterNodeOperations
>\ No newline at end of file
>Index: src/org/eclipse/uml2/uml/internal/operations/DecisionNodeOperations.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DecisionNodeOperations.java,v
>retrieving revision 1.7
>diff -u -r1.7 DecisionNodeOperations.java
>--- src/org/eclipse/uml2/uml/internal/operations/DecisionNodeOperations.java	3 May 2007 21:11:52 -0000	1.7
>+++ src/org/eclipse/uml2/uml/internal/operations/DecisionNodeOperations.java	24 Sep 2008 18:40:13 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -19,7 +19,6 @@
> import org.eclipse.emf.common.util.DiagnosticChain;
> 
> import org.eclipse.uml2.uml.DecisionNode;
>-import org.eclipse.uml2.uml.UMLPlugin;
> 
> import org.eclipse.uml2.uml.util.UMLValidator;
> 
>@@ -31,9 +30,14 @@
> * 
> * The following operations are supported:
> * <ul>
>- * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateOneIncomingEdge(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate One Incoming Edge}</li>
>- * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateInputParameter(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Input Parameter}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateIncomingOutgoingEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Incoming Outgoing Edges}</li>
> * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Edges}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateDecisionInputFlowIncoming(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Decision Input Flow Incoming}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateParameters(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Parameters}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateZeroInputParameters(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Zero Input Parameters}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateIncomingObjectOneInputParameter(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Incoming Object One Input Parameter}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateIncomingControlOneInputParameter(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Incoming Control One Input Parameter}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateTwoInputParameters(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Two Input Parameters}</li>
> * </ul>
> * 
> *
>@@ -55,32 +59,213 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * A decision node has one incoming edge.
>+	 * A decision node has one or two incoming edges and at least one outgoing edge.
> 	 * true
> 	 * @param decisionNode The receiving 'Decision Node' model object.
> 	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
> 	 * @param context The cache of context-specific information.
> 	 * 
>-	 * @generated NOT
>+	 * @generated
>+	 */
>+	public static boolean validateIncomingOutgoingEdges(
>+			DecisionNode decisionNode, DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.DECISION_NODE__INCOMING_OUTGOING_EDGES,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateIncomingOutgoingEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(decisionNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{decisionNode}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The edges coming into and out of a decision node, other than the decision input flow (if any), must be either all object flows or all control flows.
>+	 * true
>+	 * @param decisionNode The receiving 'Decision Node' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
> 	 */
>-	public static boolean validateOneIncomingEdge(DecisionNode decisionNode,
>+	public static boolean validateEdges(DecisionNode decisionNode,
> 			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.DECISION_NODE__EDGES,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(decisionNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{decisionNode}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
> 
>-		if (decisionNode.getIncomings().size() != 1) {
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The decisionInputFlow of a decision node must be an incoming edge of the decision node.
>+	 * true
>+	 * @param decisionNode The receiving 'Decision Node' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateDecisionInputFlowIncoming(
>+			DecisionNode decisionNode, DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.DECISION_NODE__DECISION_INPUT_FLOW_INCOMING,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateDecisionInputFlowIncoming", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(decisionNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{decisionNode}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
> 
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * A decision input behavior has no output parameters, no in-out parameters and one return parameter.
>+	 * true
>+	 * @param decisionNode The receiving 'Decision Node' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateParameters(DecisionNode decisionNode,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
> 			if (diagnostics != null) {
>-				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
>-					UMLValidator.DIAGNOSTIC_SOURCE,
>-					UMLValidator.DECISION_NODE__ONE_INCOMING_EDGE,
>-					UMLPlugin.INSTANCE.getString(
>-						"_UI_DecisionNode_OneIncomingEdge_diagnostic", //$NON-NLS-1$
>-						getMessageSubstitutions(context, decisionNode)),
>-					new Object[]{decisionNode}));
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.DECISION_NODE__PARAMETERS,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateParameters", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(decisionNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{decisionNode}));
> 			}
>+			return false;
>+		}
>+		return true;
>+	}
> 
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * If the decision node has no decision input flow and an incoming control flow, then a decision input behavior has zero input parameters.
>+	 * true
>+	 * @param decisionNode The receiving 'Decision Node' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateZeroInputParameters(
>+			DecisionNode decisionNode, DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.DECISION_NODE__ZERO_INPUT_PARAMETERS,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateZeroInputParameters", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(decisionNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{decisionNode}));
>+			}
> 			return false;
> 		}
>+		return true;
>+	}
> 
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * If the decision node has no decision input flow and an incoming object flow, then a decision input behavior has one input parameter whose type is the same as or a supertype of the type of object tokens offered on the incoming edge.
>+	 * true
>+	 * @param decisionNode The receiving 'Decision Node' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateIncomingObjectOneInputParameter(
>+			DecisionNode decisionNode, DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.DECISION_NODE__INCOMING_OBJECT_ONE_INPUT_PARAMETER,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateIncomingObjectOneInputParameter", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(decisionNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{decisionNode}));
>+			}
>+			return false;
>+		}
> 		return true;
> 	}
> 
>@@ -88,7 +273,7 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * A decision input behavior has zero or one input parameter and one output parameter. Any input parameter must be the same as or a supertype of the type of object tokens coming along the incoming edge. The behavior cannot have side effects.
>+	 * If the decision node has a decision input flow and an incoming control flow, then a decision input behavior has one input parameter whose type is the same as or a supertype of the type of object tokens offered on the decision input flow.
> 	 * true
> 	 * @param decisionNode The receiving 'Decision Node' model object.
> 	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>@@ -96,8 +281,9 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static boolean validateInputParameter(DecisionNode decisionNode,
>-			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+	public static boolean validateIncomingControlOneInputParameter(
>+			DecisionNode decisionNode, DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
> 		// TODO: implement this method
> 		// -> specify the condition that violates the invariant
> 		// -> verify the details of the diagnostic, including severity and message
>@@ -108,10 +294,10 @@
> 					.add(new BasicDiagnostic(
> 						Diagnostic.ERROR,
> 						UMLValidator.DIAGNOSTIC_SOURCE,
>-						UMLValidator.DECISION_NODE__INPUT_PARAMETER,
>+						UMLValidator.DECISION_NODE__INCOMING_CONTROL_ONE_INPUT_PARAMETER,
> 						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
> 							.getString(
>-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInputParameter", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(decisionNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateIncomingControlOneInputParameter", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(decisionNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
> 						new Object[]{decisionNode}));
> 			}
> 			return false;
>@@ -123,7 +309,7 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * The edges coming into and out of a decision node must be either all object flows or all control flows.
>+	 * If the decision node has a decision input flow and an second incoming object flow, then a decision input behavior has two input parameters, the first of which has a type that is the same as or a supertype of the type of the type of object tokens offered on the nondecision input flow and the second of which has a type that is the same as or a supertype of the type of object tokens offered on the decision input flow.
> 	 * true
> 	 * @param decisionNode The receiving 'Decision Node' model object.
> 	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>@@ -131,7 +317,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public static boolean validateEdges(DecisionNode decisionNode,
>+	public static boolean validateTwoInputParameters(DecisionNode decisionNode,
> 			DiagnosticChain diagnostics, Map<Object, Object> context) {
> 		// TODO: implement this method
> 		// -> specify the condition that violates the invariant
>@@ -143,10 +329,10 @@
> 					.add(new BasicDiagnostic(
> 						Diagnostic.ERROR,
> 						UMLValidator.DIAGNOSTIC_SOURCE,
>-						UMLValidator.DECISION_NODE__EDGES,
>+						UMLValidator.DECISION_NODE__TWO_INPUT_PARAMETERS,
> 						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
> 							.getString(
>-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(decisionNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTwoInputParameters", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(decisionNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
> 						new Object[]{decisionNode}));
> 			}
> 			return false;
>Index: src/org/eclipse/uml2/uml/internal/operations/MultiplicityElementOperations.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MultiplicityElementOperations.java,v
>retrieving revision 1.18
>diff -u -r1.18 MultiplicityElementOperations.java
>--- src/org/eclipse/uml2/uml/internal/operations/MultiplicityElementOperations.java	3 May 2007 21:11:52 -0000	1.18
>+++ src/org/eclipse/uml2/uml/internal/operations/MultiplicityElementOperations.java	24 Sep 2008 18:40:13 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -35,7 +35,6 @@
> * 
> * The following operations are supported:
> * <ul>
>- * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Gt0}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateLowerGe0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Lower Ge0}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGeLower(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Ge Lower}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateValueSpecificationNoSideEffects(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Value Specification No Side Effects}</li>
>@@ -72,44 +71,6 @@
> 	 * 
> 	 * 
> 	 * 
>-	 * A multiplicity must define at least one valid cardinality that is greater than zero.
>-	 * upperBound()->notEmpty() implies upperBound() > 0
>-	 * @param multiplicityElement The receiving 'Multiplicity Element' model object.
>-	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>-	 * @param context The cache of context-specific information.
>-	 * 
>-	 * @generated NOT
>-	 */
>-	public static boolean validateUpperGt0(
>-			MultiplicityElement multiplicityElement,
>-			DiagnosticChain diagnostics, Map<Object, Object> context) {
>-		boolean result = true;
>-
>-		int upperBound = multiplicityElement.upperBound();
>-
>-		if (upperBound != LiteralUnlimitedNatural.UNLIMITED && upperBound < 1) {
>-			result = false;
>-
>-			if (diagnostics != null) {
>-				diagnostics
>-					.add(new BasicDiagnostic(Diagnostic.WARNING,
>-						UMLValidator.DIAGNOSTIC_SOURCE,
>-						UMLValidator.MULTIPLICITY_ELEMENT__UPPER_GT0,
>-						UMLPlugin.INSTANCE.getString(
>-							"_UI_MultiplicityElement_UpperGT0_diagnostic", //$NON-NLS-1$
>-							getMessageSubstitutions(context,
>-								multiplicityElement)), new Object[]{
>-							multiplicityElement, new Integer(upperBound)}));
>-			}
>-		}
>-
>-		return result;
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * 
> 	 * The lower bound must be a non-negative integer literal.
> 	 * lowerBound()->notEmpty() implies lowerBound() >= 0
> 	 * @param multiplicityElement The receiving 'Multiplicity Element' model object.
>Index: src/org/eclipse/uml2/uml/internal/operations/VertexOperations.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/VertexOperations.java,v
>retrieving revision 1.8
>diff -u -r1.8 VertexOperations.java
>--- src/org/eclipse/uml2/uml/internal/operations/VertexOperations.java	23 Jun 2007 18:28:33 -0000	1.8
>+++ src/org/eclipse/uml2/uml/internal/operations/VertexOperations.java	24 Sep 2008 18:40:13 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -38,8 +38,8 @@
> * The following operations are supported:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.Vertex#containingStateMachine() Containing State Machine}</li>
>- * <li>{@link org.eclipse.uml2.uml.Vertex#getIncomings() Get Incomings}</li>
> * <li>{@link org.eclipse.uml2.uml.Vertex#getOutgoings() Get Outgoings}</li>
>+ * <li>{@link org.eclipse.uml2.uml.Vertex#getIncomings() Get Incomings}</li>
> * </ul>
> * 
> *
>@@ -181,6 +181,10 @@
> 	/**
> 	 * 
> 	 * 
>+	 * 
>+	 * result = Transition.allInstances()->select(t | t.target=self)
>+	 * @param vertex The receiving 'Vertex' model object.
>+	 * 
> 	 * @generated NOT
> 	 */
> 	public static EList<Transition> getIncomings(Vertex vertex) {
>@@ -275,6 +279,10 @@
> 	/**
> 	 * 
> 	 * 
>+	 * 
>+	 * result = Transition.allInstances()->select(t | t.source=self)
>+	 * @param vertex The receiving 'Vertex' model object.
>+	 * 
> 	 * @generated NOT
> 	 */
> 	public static EList<Transition> getOutgoings(Vertex vertex) {
>Index: src/org/eclipse/uml2/uml/internal/operations/WriteStructuralFeatureActionOperations.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/WriteStructuralFeatureActionOperations.java,v
>retrieving revision 1.6
>diff -u -r1.6 WriteStructuralFeatureActionOperations.java
>--- src/org/eclipse/uml2/uml/internal/operations/WriteStructuralFeatureActionOperations.java	3 May 2007 21:11:52 -0000	1.6
>+++ src/org/eclipse/uml2/uml/internal/operations/WriteStructuralFeatureActionOperations.java	24 Sep 2008 18:40:13 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -31,6 +31,8 @@
> * The following operations are supported:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#validateInputPin(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Input Pin}</li>
>+ * <li>{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#validateTypeOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Type Of Result}</li>
>+ * <li>{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#validateMultiplicityOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity Of Result}</li>
> * <li>{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#validateMultiplicity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity}</li>
> * </ul>
> * 
>@@ -89,6 +91,78 @@
> 	 * 
> 	 * 
> 	 * 
>+	 * The type of the result output pin is the same as the type of the inherited object input pin.
>+	 * result->notEmpty() implies self.result.type = self.object.type
>+	 * @param writeStructuralFeatureAction The receiving 'Write Structural Feature Action' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateTypeOfResult(
>+			WriteStructuralFeatureAction writeStructuralFeatureAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.WRITE_STRUCTURAL_FEATURE_ACTION__TYPE_OF_RESULT,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeOfResult", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(writeStructuralFeatureAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{writeStructuralFeatureAction}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The multiplicity of the result output pin must be 1..1.
>+	 * result->notEmpty() implies self.result.multiplicity.is(1,1)
>+	 * @param writeStructuralFeatureAction The receiving 'Write Structural Feature Action' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateMultiplicityOfResult(
>+			WriteStructuralFeatureAction writeStructuralFeatureAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.WRITE_STRUCTURAL_FEATURE_ACTION__MULTIPLICITY_OF_RESULT,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicityOfResult", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(writeStructuralFeatureAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{writeStructuralFeatureAction}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
> 	 * The multiplicity of the input pin is 1..1.
> 	 * self.value.multiplicity.is(1,1)
> 	 * @param writeStructuralFeatureAction The receiving 'Write Structural Feature Action' model object.
>Index: src/org/eclipse/uml2/uml/resource/UML22UMLResourceHandler.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/UML22UMLResourceHandler.java,v
>retrieving revision 1.34
>diff -u -r1.34 UML22UMLResourceHandler.java
>--- src/org/eclipse/uml2/uml/resource/UML22UMLResourceHandler.java	12 Jun 2007 12:53:20 -0000	1.34
>+++ src/org/eclipse/uml2/uml/resource/UML22UMLResourceHandler.java	24 Sep 2008 18:40:13 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2006, 2007 IBM Corporation and others.
>+ * Copyright (c) 2006, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -140,6 +140,8 @@
> 	protected static final String STEREOTYPE__OPAQUE_EXPRESSION = "OpaqueExpression"; //$NON-NLS-1$
> 
> 	protected static final String STEREOTYPE__TEMPLATE_SIGNATURE = "TemplateSignature"; //$NON-NLS-1$
>+	
>+	protected static final String STEREOTYPE__TIME_EVENT = "TimeEvent"; //$NON-NLS-1$
> 
> 	protected static final String TAG_DEFINITION__BEHAVIOR = "behavior"; //$NON-NLS-1$
> 
>@@ -160,6 +162,8 @@
> 	protected static final String TAG_DEFINITION__SIGNATURE = "signature"; //$NON-NLS-1$
> 
> 	protected static final String TAG_DEFINITION__SYMBOL = "symbol"; //$NON-NLS-1$
>+	
>+	protected static final String TAG_DEFINITION__WHEN = "when"; //$NON-NLS-1$
> 
> 	protected static final String UML2_UML_PACKAGE_2_0_NS_URI = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$
> 
>@@ -1771,15 +1775,18 @@
> 								eObject = getEObject(extension, resource,
> 									"when", true); //$NON-NLS-1$
> 
>+								//
>+								// TODO: Double check. 
>+								// In addition, add cases for defaultClassifier etc.
>+								//
> 								if (eObject instanceof ValueSpecification) {
>+									
> 									event = (TimeEvent) trigger
> 										.getNearestPackage()
> 										.createPackagedElement(
> 											trigger.getName(),
> 											UMLPackage.Literals.TIME_EVENT);
>-									((TimeEvent) event)
>-										.setWhen((ValueSpecification) eObject);
>-
>+																		
> 									Object value = getValue(extension
> 										.getAnyAttribute(), "isRelative", true); //$NON-NLS-1$
> 
>@@ -1788,6 +1795,18 @@
> 											.setIsRelative(Boolean.valueOf(
> 												(String) value).booleanValue());
> 									}
>+									
>+									if (eObject instanceof TimeExpression) {
>+										((TimeEvent) event)
>+											.setWhen((TimeExpression) eObject);
>+										
>+									} else {
>+										UMLUtil.setTaggedValue(event,
>+											getUML2Stereotype(event,
>+												STEREOTYPE__TIME_EVENT),
>+											TAG_DEFINITION__WHEN,
>+											(TimeExpression) eObject);
>+									}
> 								}
> 							}
> 						}
>Index: src/org/eclipse/uml2/uml/resource/UML22UMLResource.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/UML22UMLResource.java,v
>retrieving revision 1.6
>diff -u -r1.6 UML22UMLResource.java
>--- src/org/eclipse/uml2/uml/resource/UML22UMLResource.java	21 Apr 2008 13:28:47 -0000	1.6
>+++ src/org/eclipse/uml2/uml/resource/UML22UMLResource.java	24 Sep 2008 18:40:13 -0000
>@@ -49,10 +49,10 @@
> 
> 	String ECORE_PROFILE_URI = "pathmap://UML2_PROFILES/Ecore.profile.uml2"; //$NON-NLS-1$
> 
>-	String UML2_PROFILE_NS_URI = "http://www.eclipse.org/uml2/schemas/UML2/0"; //$NON-NLS-1$
>+	String UML2_PROFILE_NS_URI = "http://www.eclipse.org/uml2/schemas/UML2/1"; //$NON-NLS-1$
> 
> 	String UML2_PROFILE_URI = UMLResource.PROFILES_PATHMAP + "UML2." + PROFILE_FILE_EXTENSION; //$NON-NLS-1$
> 
> 	String UML2_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2"; //$NON-NLS-1$
>-
>+			
> }
>Index: src/org/eclipse/uml2/uml/resource/UMLResource.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/UMLResource.java,v
>retrieving revision 1.9
>diff -u -r1.9 UMLResource.java
>--- src/org/eclipse/uml2/uml/resource/UMLResource.java	21 Apr 2008 13:28:47 -0000	1.9
>+++ src/org/eclipse/uml2/uml/resource/UMLResource.java	24 Sep 2008 18:40:13 -0000
>@@ -95,6 +95,7 @@
> 
> 	String UML_2_0_0_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2.uml_2_0_0"; //$NON-NLS-1$
> 
>-	String UML_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2.uml_2_1_0"; //$NON-NLS-1$
>-
>+	String UML_2_1_0_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2.uml_2_1_0"; //$NON-NLS-1$
>+	
>+			
> } // UMLResource
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/plugin.xml,v
>retrieving revision 1.11
>diff -u -r1.11 plugin.xml
>--- plugin.xml	21 Apr 2008 13:28:48 -0000	1.11
>+++ plugin.xml	24 Sep 2008 18:40:07 -0000
>@@ -165,6 +165,22 @@
> </describer>
> </content-type>
> <content-type
>+ base-type="org.omg.uml"
>+ file-extensions="xmi"
>+ id="org.omg.uml_2_2"
>+ name="%_UI_OMG_UML_2_2_0_content_type"
>+ priority="normal">
>+ <describer
>+ class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
>+ <parameter
>+ name="namespace"
>+ value="http://schema.omg.org/spec/UML/2.2" />
>+ <parameter
>+ name="kind"
>+ value="xmi" />
>+ </describer>
>+ </content-type>
>+ <content-type
> base-type="org.eclipse.emf.ecore.xmi"
> file-extensions="cmof,xmi"
> id="org.omg.mof.cmof"
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/plugin.properties,v
>retrieving revision 1.22
>diff -u -r1.22 plugin.properties
>--- plugin.properties	6 May 2008 21:42:15 -0000	1.22
>+++ plugin.properties	24 Sep 2008 18:40:07 -0000
>@@ -202,12 +202,14 @@
> _UI_UML_content_type = UML2 UML File
> _UI_UML_2_0_0_content_type = UML2 2.0.0 UML File
> _UI_UML_2_1_0_content_type = UML2 2.1.0 UML File
>+_UI_UML_3_0_0_content_type = UML2 3.0.0 UML File
> 
> _UI_UML2_content_type = UML2 1.0.0 File
> 
> _UI_OMG_UML_content_type = OMG UML File
> _UI_OMG_UML_2_1_content_type = OMG UML 2.1 File
> _UI_OMG_UML_2_1_1_content_type = OMG UML 2.1.1 File
>+_UI_OMG_UML_2_2_content_type = OMG UML 2.2 File
> 
> _UI_OMG_CMOF_content_type = OMG CMOF 2.0 File
> 
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF,v
>retrieving revision 1.17
>diff -u -r1.17 MANIFEST.MF
>--- META-INF/MANIFEST.MF	19 Aug 2008 18:41:04 -0000	1.17
>+++ META-INF/MANIFEST.MF	24 Sep 2008 18:40:07 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.uml2.uml; singleton:=true
>-Bundle-Version: 2.2.100.qualifier
>+Bundle-Version: 3.0.0.qualifier
> Bundle-ClassPath: .
> Bundle-Activator: org.eclipse.uml2.uml.UMLPlugin$Implementation
> Bundle-Vendor: %providerName
>Index: src/org/eclipse/uml2/uml/StartObjectBehaviorAction.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/StartObjectBehaviorAction.java
>diff -N src/org/eclipse/uml2/uml/StartObjectBehaviorAction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/StartObjectBehaviorAction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,175 @@
>+/*
>+ * Copyright (c) 2008 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - initial API and implementation
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.uml2.uml;
>+
>+import java.util.Map;
>+
>+import org.eclipse.emf.common.util.DiagnosticChain;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Start Object Behavior Action'.
>+ * 
>+ *
>+ * 
>+ * StartObjectBehaviorAction is an action that starts the execution either of a directly instantiated behavior or of the classifier behavior of an object. Argument values may be supplied for the input parameters of the behavior. If the behavior is invoked synchronously, then output values may be obtained for output parameters.
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#getObject Object}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.uml2.uml.UMLPackage#getStartObjectBehaviorAction()
>+ * @model
>+ * @generated
>+ */
>+public interface StartObjectBehaviorAction
>+		extends CallAction {
>+
>+	/**
>+	 * Returns the value of the 'Object' containment reference.
>+	 * 
>+	 * This feature subsets the following features:
>+	 * <ul>
>+	 * <li>'{@link org.eclipse.uml2.uml.Action#getInputs() Input}'</li>
>+	 * </ul>
>+	 * 
>+	 * 
>+	 * 
>+	 * 
>+	 * Holds the object which is either a behavior to be started or has a classifier behavior to be started.
>+	 * 
>+	 * @return the value of the 'Object' containment reference.
>+	 * @see #setObject(InputPin)
>+	 * @see org.eclipse.uml2.uml.UMLPackage#getStartObjectBehaviorAction_Object()
>+	 * @model containment="true" resolveProxies="true" required="true" ordered="false"
>+	 * @generated
>+	 */
>+	InputPin getObject();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#getObject Object}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Object' containment reference.
>+	 * @see #getObject()
>+	 * @generated
>+	 */
>+	void setObject(InputPin value);
>+
>+	/**
>+	 * Creates a new {@link org.eclipse.uml2.uml.InputPin}, with the specified 'Name', and 'Type', and sets the 'Object' containment reference.
>+	 * 
>+	 * 
>+	 * @param name The 'Name' for the new {@link org.eclipse.uml2.uml.InputPin}, or <code>null</code>.
>+	 * @param type The 'Type' for the new {@link org.eclipse.uml2.uml.InputPin}, or <code>null</code>.
>+	 * @param eClass The Ecore class of the {@link org.eclipse.uml2.uml.InputPin} to create.
>+	 * @return The new {@link org.eclipse.uml2.uml.InputPin}.
>+	 * @see #getObject()
>+	 * @generated
>+	 */
>+	InputPin createObject(String name, Type type, EClass eClass);
>+
>+	/**
>+	 * Creates a new {@link org.eclipse.uml2.uml.InputPin},with the specified 'Name', and 'Type', and sets the 'Object' containment reference.
>+	 * 
>+	 * 
>+	 * @param name The 'Name' for the new {@link org.eclipse.uml2.uml.InputPin}, or <code>null</code>.
>+	 * @param type The 'Type' for the new {@link org.eclipse.uml2.uml.InputPin}, or <code>null</code>.
>+	 * @return The new {@link org.eclipse.uml2.uml.InputPin}.
>+	 * @see #getObject()
>+	 * @generated
>+	 */
>+	InputPin createObject(String name, Type type);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The type of the object input pin must be either a Behavior or a BehavioredClassifier with a classifier behavior.
>+	 * true
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateTypeOfObject(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The multiplicity of the object input pin must be [1..1].
>+	 * true
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateMultiplicityOfObject(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The number and order of the argument pins must be the same as the number and order of the in and in-out parameters of the invoked behavior. Pins are matched to parameters by order.
>+	 * true
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateNumberOrderArguments(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The number and order of result pins must be the same as the number and order of the in-out, out and return parameters of the invoked behavior. Pins are matched to parameters by order.
>+	 * true
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateNumberOrderResults(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The type, ordering, and multiplicity of an argument or result pin must be the same as the corresponding parameter of the behavior.
>+	 * true
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	boolean validateTypeOrderingMultiplicityMatch(DiagnosticChain diagnostics,
>+			Map<Object, Object> context);
>+
>+} // StartObjectBehaviorAction
>Index: src/org/eclipse/uml2/uml/resource/UML2122UML30ResourceHandler.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/resource/UML2122UML30ResourceHandler.java
>diff -N src/org/eclipse/uml2/uml/resource/UML2122UML30ResourceHandler.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/resource/UML2122UML30ResourceHandler.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,329 @@
>+/*
>+ * Copyright (c) 2008 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - initial API and implementation
>+ *
>+ */
>+
>+package org.eclipse.uml2.uml.resource;
>+
>+import java.io.InputStream;
>+import java.util.Collection;
>+import java.util.Iterator;
>+import java.util.Map;
>+
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.common.util.URI;
>+import org.eclipse.emf.common.util.UniqueEList;
>+import org.eclipse.emf.ecore.EAnnotation;
>+import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.resource.Resource;
>+import org.eclipse.emf.ecore.resource.ResourceSet;
>+import org.eclipse.emf.ecore.util.ExtendedMetaData;
>+import org.eclipse.emf.ecore.util.FeatureMap;
>+import org.eclipse.emf.ecore.xmi.XMLResource;
>+import org.eclipse.emf.ecore.xmi.impl.BasicResourceHandler;
>+import org.eclipse.emf.ecore.xml.type.AnyType;
>+import org.eclipse.uml2.common.util.UML2Util;
>+import org.eclipse.uml2.uml.ClassifierTemplateParameter;
>+import org.eclipse.uml2.uml.Element;
>+import org.eclipse.uml2.uml.ParameterableElement;
>+import org.eclipse.uml2.uml.Profile;
>+import org.eclipse.uml2.uml.Property;
>+import org.eclipse.uml2.uml.Stereotype;
>+import org.eclipse.uml2.uml.TimeEvent;
>+import org.eclipse.uml2.uml.TimeExpression;
>+import org.eclipse.uml2.uml.UMLPackage;
>+import org.eclipse.uml2.uml.util.UMLSwitch;
>+import org.eclipse.uml2.uml.util.UMLUtil;
>+
>+public class UML2122UML30ResourceHandler
>+		extends BasicResourceHandler {
>+
>+	protected static final boolean DEBUG = true;
>+
>+	protected static final String STEREOTYPE__TIME_EVENT = "TimeEvent"; //$NON-NLS-1$
>+
>+	protected static final String STEREOTYPE__PROPERTY = "Property"; //$NON-NLS-1$
>+
>+	protected static final String STEREOTYPE__CLASSIFIER_TEMPLATE_PARAMETER = "ClassifierTemplateParameter"; //$NON-NLS-1$
>+
>+	protected static final String TAG_DEFINITION__WHEN = "when"; //$NON-NLS-1$
>+
>+	protected static final String TAG_DEFINITION__DEFAULT_CLASSIFER = "defaultClassifier"; //$NON-NLS-1$
>+
>+	protected static final String TAG_DEFINITION__TEMPLATE_BINDING = "templateBinding"; //$NON-NLS-1$
>+
>+	protected static final String TAG_DEFINITION__OWNED_TEMPLATE_SIGNATURE = "ownedTemplateSignature"; //$NON-NLS-1$
>+
>+
>+	protected AnyType getExtension(XMLResource resource, EObject eObject) {
>+		return resource.getEObjectToExtensionMap().get(eObject);
>+	}
>+
>+	protected AnyType putExtension(XMLResource resource, EObject eObject,
>+			AnyType extension) {
>+		return resource.getEObjectToExtensionMap().put(eObject, extension);
>+	}
>+
>+	protected AnyType removeExtension(XMLResource resource, EObject eObject) {
>+		return resource.getEObjectToExtensionMap().remove(eObject);
>+	}
>+
>+	protected Object getValue(FeatureMap featureMap, String name) {
>+		return getValue(featureMap, name, false);
>+	}
>+
>+	protected Object getValue(FeatureMap featureMap, String name, boolean remove) {
>+
>+		for (Iterator<FeatureMap.Entry> entries = featureMap.iterator(); entries
>+			.hasNext();) {
>+
>+			FeatureMap.Entry entry = entries.next();
>+
>+			if (name.equals(entry.getEStructuralFeature().getName())) {
>+
>+				if (remove) {
>+					entries.remove();
>+				}
>+
>+				return entry.getValue();
>+			}
>+		}
>+
>+		return null;
>+	}
>+
>+	private EObject getEObject(AnyType extension, Resource resource,
>+			String name, boolean remove) {
>+
>+		if (extension != null) {
>+			Object value = getValue(extension.getAnyAttribute(), name, remove);
>+
>+			if (value == null) {
>+				value = getValue(extension.getMixed(), name, remove);
>+
>+				if (value instanceof EObject) {
>+					return (EObject) value;
>+				}
>+			} else if (value instanceof String && resource != null) {
>+				return resource.getEObject((String) value);
>+			}
>+		}
>+
>+		return null;
>+	}
>+
>+	protected Collection<Object> getValues(FeatureMap featureMap, String name) {
>+		return getValues(featureMap, name, false);
>+	}
>+
>+	protected Collection<Object> getValues(FeatureMap featureMap, String name,
>+			boolean remove) {
>+		Collection<Object> values = new UniqueEList.FastCompare<Object>();
>+
>+		for (Iterator<FeatureMap.Entry> entries = featureMap.iterator(); entries
>+			.hasNext();) {
>+
>+			FeatureMap.Entry entry = entries.next();
>+
>+			if (name.equals(entry.getEStructuralFeature().getName())) {
>+
>+				if (remove) {
>+					entries.remove();
>+				}
>+
>+				values.add(entry.getValue());
>+			}
>+		}
>+
>+		return values;
>+	}
>+
>+	private Collection<EObject> getEObjects(AnyType extension,
>+			Resource resource, String name, boolean remove) {
>+		Collection<EObject> eObjects = new UniqueEList.FastCompare<EObject>();
>+
>+		if (extension != null) {
>+			Collection<Object> values = getValues(extension.getAnyAttribute(),
>+				name, remove);
>+
>+			if (values.isEmpty()) {
>+				values = getValues(extension.getMixed(), name, remove);
>+
>+				for (Object value : values) {
>+
>+					if (value instanceof EObject) {
>+						eObjects.add((EObject) value);
>+					}
>+				}
>+			} else if (resource != null) {
>+
>+				for (Object value : values) {
>+
>+					if (value instanceof String) {
>+						EObject eObject = resource.getEObject((String) value);
>+
>+						if (eObject != null) {
>+							eObjects.add(eObject);
>+						}
>+					}
>+				}
>+			}
>+		}
>+
>+		return eObjects;
>+	}
>+
>+	protected Profile getUML2Profile(Element element) {
>+		Resource eResource = element.eResource();
>+
>+		if (eResource != null) {
>+			ResourceSet resourceSet = eResource.getResourceSet();
>+
>+			if (resourceSet != null) {
>+				return UML2Util.load(resourceSet, URI
>+					.createURI(UML22UMLResource.UML2_PROFILE_URI),
>+					UMLPackage.Literals.PROFILE);
>+			}
>+		}
>+
>+		return null;
>+	}
>+
>+	protected Stereotype getUML2Stereotype(Element element, String name) {
>+		Profile uml2Profile = getUML2Profile(element);
>+
>+		return uml2Profile != null
>+			? uml2Profile.getOwnedStereotype(name)
>+			: null;
>+	}
>+	
>+	
>+	
>+	@Override
>+	public void postLoad(final XMLResource resource, InputStream inputStream,
>+			Map<?, ?> options) {
>+
>+		final EList<EObject> resourceContents = resource.getContents();
>+
>+		UMLSwitch<Object> umlSwitch = new UMLSwitch<Object>() {
>+
>+			@Override
>+			public Object caseTimeEvent(TimeEvent timeEvent) {
>+
>+				AnyType extension = getExtension(resource, timeEvent);
>+				if (extension != null) {
>+					EObject value = getEObject(extension, resource,
>+						"when", true); //$NON-NLS-1$
>+
>+					if (value instanceof TimeExpression) {
>+						timeEvent.setWhen((TimeExpression) value);
>+
>+					} else {
>+						UMLUtil.setTaggedValue(timeEvent, getUML2Stereotype(
>+							timeEvent, STEREOTYPE__TIME_EVENT),
>+							TAG_DEFINITION__WHEN, value);
>+					}
>+				}
>+
>+				return super.caseTimeEvent(timeEvent);
>+			}
>+
>+			@Override
>+			public Object caseProperty(Property property) {
>+				AnyType extension = getExtension(resource, property);
>+				if (extension != null) {
>+
>+					EObject ownedTemplateSignature = getEObject(extension,
>+						resource, "ownedTemplateSignature", true); //$NON-NLS-1$
>+
>+					UMLUtil.setTaggedValue(property, getUML2Stereotype(
>+						property, STEREOTYPE__PROPERTY),
>+						TAG_DEFINITION__OWNED_TEMPLATE_SIGNATURE,
>+						ownedTemplateSignature);
>+
>+					Collection<EObject> templateBindings = getEObjects(
>+						extension, resource, "templateBinding", true); //$NON-NLS-1$
>+
>+					if (!templateBindings.isEmpty()) {
>+						UMLUtil.setTaggedValue(property, getUML2Stereotype(
>+							property, STEREOTYPE__PROPERTY),
>+							TAG_DEFINITION__TEMPLATE_BINDING, templateBindings);
>+					}
>+				}
>+
>+				return super.caseProperty(property);
>+			}
>+
>+			@Override
>+			public Object caseClassifierTemplateParameter(
>+					ClassifierTemplateParameter classifierTemplateParameter) {
>+
>+				AnyType extension = getExtension(resource,
>+					classifierTemplateParameter);
>+
>+				if (extension != null) {
>+					EObject value = getEObject(extension, resource,
>+						"defaultClassifier", true); //$NON-NLS-1$
>+
>+					if (classifierTemplateParameter.getDefault() == null) {
>+
>+						classifierTemplateParameter
>+							.setDefault((ParameterableElement) value);
>+
>+					} else {
>+						UMLUtil.setTaggedValue(classifierTemplateParameter,
>+							getUML2Stereotype(classifierTemplateParameter,
>+								STEREOTYPE__CLASSIFIER_TEMPLATE_PARAMETER),
>+							TAG_DEFINITION__DEFAULT_CLASSIFER, value);
>+					}
>+				}
>+				return super
>+					.caseClassifierTemplateParameter(classifierTemplateParameter);
>+			}
>+
>+			@Override
>+			public Object defaultCase(EObject eObject) {
>+				AnyType extension = getExtension(resource, eObject);
>+
>+				if (extension != null) {
>+
>+					if (extension.getAnyAttribute().isEmpty()
>+						&& extension.getMixed().isEmpty()) {
>+
>+						removeExtension(resource, eObject);
>+					} else if (DEBUG) {
>+						System.out.println(eObject);
>+						System.out.println("->"); //$NON-NLS-1$
>+						System.out.println(extension);
>+
>+						EAnnotation eAnnotation = UML2Util.createEAnnotation(
>+							null, ExtendedMetaData.ANNOTATION_URI);
>+
>+						eAnnotation.getContents().add(extension);
>+						eAnnotation.getReferences().add(eObject);
>+
>+						resourceContents.add(eAnnotation);
>+					}
>+				}
>+
>+				for (EObject eContent : eObject.eContents()) {
>+					doSwitch(eContent);
>+				}
>+
>+				return eObject;
>+			}
>+		};
>+
>+		for (int i = 0; i < resourceContents.size(); i++) {
>+			umlSwitch.doSwitch(resourceContents.get(i));
>+		}
>+
>+	}
>+}
>Index: src/org/eclipse/uml2/uml/internal/resource/UML212UML30LoadImpl.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/internal/resource/UML212UML30LoadImpl.java
>diff -N src/org/eclipse/uml2/uml/internal/resource/UML212UML30LoadImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/internal/resource/UML212UML30LoadImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,28 @@
>+/*
>+ * Copyright (c) 2008 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - initial API and implementation
>+ *
>+ */
>+package org.eclipse.uml2.uml.internal.resource;
>+
>+import org.eclipse.emf.ecore.xmi.XMLHelper;
>+import org.xml.sax.helpers.DefaultHandler;
>+
>+public class UML212UML30LoadImpl
>+		extends UMLLoadImpl {
>+
>+	public UML212UML30LoadImpl(XMLHelper helper) {
>+		super(helper);
>+	}
>+
>+	@Override
>+	protected DefaultHandler makeDefaultHandler() {
>+		return new UML212UML30Handler(resource, helper, options);
>+	}
>+}
>Index: src/org/eclipse/uml2/uml/internal/operations/StartObjectBehaviorActionOperations.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/internal/operations/StartObjectBehaviorActionOperations.java
>diff -N src/org/eclipse/uml2/uml/internal/operations/StartObjectBehaviorActionOperations.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/internal/operations/StartObjectBehaviorActionOperations.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,235 @@
>+/*
>+ * Copyright (c) 2008 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - initial API and implementation
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.uml2.uml.internal.operations;
>+
>+import java.util.Map;
>+
>+import org.eclipse.emf.common.util.BasicDiagnostic;
>+import org.eclipse.emf.common.util.Diagnostic;
>+import org.eclipse.emf.common.util.DiagnosticChain;
>+
>+import org.eclipse.uml2.uml.StartObjectBehaviorAction;
>+
>+import org.eclipse.uml2.uml.util.UMLValidator;
>+
>+/**
>+ * 
>+ * A static utility class that provides operations related to 'Start Object Behavior Action' model objects.
>+ * 
>+ *
>+ * 
>+ * The following operations are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateTypeOfObject(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Type Of Object}</li>
>+ * <li>{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateMultiplicityOfObject(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity Of Object}</li>
>+ * <li>{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateNumberOrderArguments(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Number Order Arguments}</li>
>+ * <li>{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateNumberOrderResults(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Number Order Results}</li>
>+ * <li>{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateTypeOrderingMultiplicityMatch(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Type Ordering Multiplicity Match}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class StartObjectBehaviorActionOperations
>+		extends CallActionOperations {
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected StartObjectBehaviorActionOperations() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The type of the object input pin must be either a Behavior or a BehavioredClassifier with a classifier behavior.
>+	 * true
>+	 * @param startObjectBehaviorAction The receiving 'Start Object Behavior Action' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateTypeOfObject(
>+			StartObjectBehaviorAction startObjectBehaviorAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.START_OBJECT_BEHAVIOR_ACTION__TYPE_OF_OBJECT,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeOfObject", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(startObjectBehaviorAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{startObjectBehaviorAction}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The multiplicity of the object input pin must be [1..1].
>+	 * true
>+	 * @param startObjectBehaviorAction The receiving 'Start Object Behavior Action' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateMultiplicityOfObject(
>+			StartObjectBehaviorAction startObjectBehaviorAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.START_OBJECT_BEHAVIOR_ACTION__MULTIPLICITY_OF_OBJECT,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicityOfObject", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(startObjectBehaviorAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{startObjectBehaviorAction}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The number and order of the argument pins must be the same as the number and order of the in and in-out parameters of the invoked behavior. Pins are matched to parameters by order.
>+	 * true
>+	 * @param startObjectBehaviorAction The receiving 'Start Object Behavior Action' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateNumberOrderArguments(
>+			StartObjectBehaviorAction startObjectBehaviorAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.START_OBJECT_BEHAVIOR_ACTION__NUMBER_ORDER_ARGUMENTS,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNumberOrderArguments", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(startObjectBehaviorAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{startObjectBehaviorAction}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The number and order of result pins must be the same as the number and order of the in-out, out and return parameters of the invoked behavior. Pins are matched to parameters by order.
>+	 * true
>+	 * @param startObjectBehaviorAction The receiving 'Start Object Behavior Action' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateNumberOrderResults(
>+			StartObjectBehaviorAction startObjectBehaviorAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.START_OBJECT_BEHAVIOR_ACTION__NUMBER_ORDER_RESULTS,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNumberOrderResults", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(startObjectBehaviorAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{startObjectBehaviorAction}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The type, ordering, and multiplicity of an argument or result pin must be the same as the corresponding parameter of the behavior.
>+	 * true
>+	 * @param startObjectBehaviorAction The receiving 'Start Object Behavior Action' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateTypeOrderingMultiplicityMatch(
>+			StartObjectBehaviorAction startObjectBehaviorAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.START_OBJECT_BEHAVIOR_ACTION__TYPE_ORDERING_MULTIPLICITY_MATCH,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeOrderingMultiplicityMatch", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(startObjectBehaviorAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{startObjectBehaviorAction}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+} // StartObjectBehaviorActionOperations
>Index: src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceImpl.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceImpl.java
>diff -N src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,29 @@
>+/*
>+ * Copyright (c) 2008 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - initial API and implementation
>+ *
>+ */
>+
>+package org.eclipse.uml2.uml.internal.resource;
>+
>+import org.eclipse.emf.common.util.URI;
>+import org.eclipse.emf.ecore.xmi.XMLLoad;
>+
>+public class UML212UML30ResourceImpl
>+		extends UMLResourceImpl {
>+
>+	public UML212UML30ResourceImpl(URI uri) {
>+		super(uri);
>+	}
>+
>+	@Override
>+	protected XMLLoad createXMLLoad() {
>+		return new UML212UML30LoadImpl(createXMLHelper());
>+	}
>+}
>Index: src/org/eclipse/uml2/uml/resource/UML212UML30Resource.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/resource/UML212UML30Resource.java
>diff -N src/org/eclipse/uml2/uml/resource/UML212UML30Resource.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/resource/UML212UML30Resource.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,29 @@
>+/*
>+ * Copyright (c) 2008 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - initial API and implementation
>+ *
>+ */
>+package org.eclipse.uml2.uml.resource;
>+
>+import org.eclipse.emf.ecore.resource.Resource;
>+import org.eclipse.uml2.uml.internal.resource.UML212UML30ResourceFactoryImpl;
>+
>+public interface UML212UML30Resource
>+		extends UMLResource {
>+
>+	public interface Factory
>+			extends Resource.Factory {
>+
>+		public static final Factory INSTANCE = new UML212UML30ResourceFactoryImpl();
>+	}
>+
>+	String UML_METAMODEL_NS_URI = "http://www.eclipse.org/uml2/2.1.0/UML"; //$NON-NLS-1$
>+
>+	String UML2_3_0_0_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2.uml_3_0_0"; //$NON-NLS-1$
>+}
>Index: src/org/eclipse/uml2/uml/resource/UML212UML30ExtendedMetaData.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/resource/UML212UML30ExtendedMetaData.java
>diff -N src/org/eclipse/uml2/uml/resource/UML212UML30ExtendedMetaData.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/resource/UML212UML30ExtendedMetaData.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,59 @@
>+/*
>+ * Copyright (c) 2008 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - initial API and implementation
>+ *
>+ */
>+package org.eclipse.uml2.uml.resource;
>+
>+import java.util.HashMap;
>+import java.util.Map;
>+
>+import org.eclipse.emf.ecore.EClassifier;
>+import org.eclipse.emf.ecore.EPackage;
>+import org.eclipse.emf.mapping.ecore2xml.Ecore2XMLRegistry;
>+import org.eclipse.emf.mapping.ecore2xml.util.Ecore2XMLExtendedMetaData;
>+import org.eclipse.uml2.uml.UMLPackage;
>+
>+public class UML212UML30ExtendedMetaData
>+		extends Ecore2XMLExtendedMetaData {
>+
>+	protected static Map<String, Map<EClassifier, String>> featureToTypeMap = null;
>+
>+	public static Map<String, Map<EClassifier, String>> getFeatureToTypeMap() {
>+
>+		if (featureToTypeMap == null) {
>+			featureToTypeMap = new HashMap<String, Map<EClassifier, String>>();
>+
>+			Map<EClassifier, String> typeMap = null;
>+
>+			typeMap = new HashMap<EClassifier, String>();
>+			typeMap.put(UMLPackage.Literals.PROPERTY, "uml:TemplateSignature"); //$NON-NLS-1$
>+			featureToTypeMap.put("ownedTemplateSignature", typeMap); //$NON-NLS-1$
>+
>+			typeMap = new HashMap<EClassifier, String>();
>+			typeMap.put(UMLPackage.Literals.PROPERTY, "uml:TemplateBinding"); //$NON-NLS-1$
>+			featureToTypeMap.put("templateBinding", typeMap); //$NON-NLS-1$
>+
>+			typeMap = new HashMap<EClassifier, String>();
>+			typeMap.put(UMLPackage.Literals.CLASSIFIER_TEMPLATE_PARAMETER,
>+				"uml:Classifier"); //$NON-NLS-1$
>+			featureToTypeMap.put("defaultClassifier", typeMap); //$NON-NLS-1$
>+		}
>+
>+		return featureToTypeMap;
>+	}
>+	
>+	
>+	public UML212UML30ExtendedMetaData(EPackage.Registry ePackageRegistry,
>+			Ecore2XMLRegistry ecore2xmlRegistry) {
>+		super(ePackageRegistry, ecore2xmlRegistry);
>+	}
>+	
>+	
>+}
>Index: src/org/eclipse/uml2/uml/internal/operations/ClearStructuralFeatureActionOperations.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/internal/operations/ClearStructuralFeatureActionOperations.java
>diff -N src/org/eclipse/uml2/uml/internal/operations/ClearStructuralFeatureActionOperations.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/internal/operations/ClearStructuralFeatureActionOperations.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,124 @@
>+/*
>+ * Copyright (c) 2008 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - initial API and implementation
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.uml2.uml.internal.operations;
>+
>+import java.util.Map;
>+
>+import org.eclipse.emf.common.util.BasicDiagnostic;
>+import org.eclipse.emf.common.util.Diagnostic;
>+import org.eclipse.emf.common.util.DiagnosticChain;
>+
>+import org.eclipse.uml2.uml.ClearStructuralFeatureAction;
>+
>+import org.eclipse.uml2.uml.util.UMLValidator;
>+
>+/**
>+ * 
>+ * A static utility class that provides operations related to 'Clear Structural Feature Action' model objects.
>+ * 
>+ *
>+ * 
>+ * The following operations are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.uml2.uml.ClearStructuralFeatureAction#validateTypeOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Type Of Result}</li>
>+ * <li>{@link org.eclipse.uml2.uml.ClearStructuralFeatureAction#validateMultiplicityOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity Of Result}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ClearStructuralFeatureActionOperations
>+		extends StructuralFeatureActionOperations {
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected ClearStructuralFeatureActionOperations() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The type of the result output pin is the same as the type of the inherited object input pin.
>+	 * result->notEmpty() implies self.result.type = self.object.type
>+	 * @param clearStructuralFeatureAction The receiving 'Clear Structural Feature Action' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateTypeOfResult(
>+			ClearStructuralFeatureAction clearStructuralFeatureAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.CLEAR_STRUCTURAL_FEATURE_ACTION__TYPE_OF_RESULT,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeOfResult", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(clearStructuralFeatureAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{clearStructuralFeatureAction}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * 
>+	 * The multiplicity of the result output pin must be 1..1.
>+	 * result->notEmpty() implies self.result.multiplicity.is(1,1)
>+	 * @param clearStructuralFeatureAction The receiving 'Clear Structural Feature Action' model object.
>+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
>+	 * @param context The cache of context-specific information.
>+	 * 
>+	 * @generated
>+	 */
>+	public static boolean validateMultiplicityOfResult(
>+			ClearStructuralFeatureAction clearStructuralFeatureAction,
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		// TODO: implement this method
>+		// -> specify the condition that violates the invariant
>+		// -> verify the details of the diagnostic, including severity and message
>+		// Ensure that you remove @generated or mark it @generated NOT
>+		if (false) {
>+			if (diagnostics != null) {
>+				diagnostics
>+					.add(new BasicDiagnostic(
>+						Diagnostic.ERROR,
>+						UMLValidator.DIAGNOSTIC_SOURCE,
>+						UMLValidator.CLEAR_STRUCTURAL_FEATURE_ACTION__MULTIPLICITY_OF_RESULT,
>+						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
>+							.getString(
>+								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicityOfResult", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(clearStructuralFeatureAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
>+						new Object[]{clearStructuralFeatureAction}));
>+			}
>+			return false;
>+		}
>+		return true;
>+	}
>+
>+} // ClearStructuralFeatureActionOperations
>Index: src/org/eclipse/uml2/uml/internal/resource/UML212UML30Handler.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/internal/resource/UML212UML30Handler.java
>diff -N src/org/eclipse/uml2/uml/internal/resource/UML212UML30Handler.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/internal/resource/UML212UML30Handler.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,68 @@
>+/*
>+ * Copyright (c) 2008 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - initial API and implementation
>+ *
>+ */
>+package org.eclipse.uml2.uml.internal.resource;
>+
>+import java.util.Map;
>+
>+import org.eclipse.emf.ecore.EClassifier;
>+import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EStructuralFeature;
>+import org.eclipse.emf.ecore.xmi.XMLHelper;
>+import org.eclipse.emf.ecore.xmi.XMLResource;
>+import org.eclipse.emf.ecore.xml.type.AnyType;
>+import org.eclipse.uml2.uml.resource.UML212UML30ExtendedMetaData;
>+
>+public class UML212UML30Handler
>+		extends UMLHandler {
>+
>+	public UML212UML30Handler(XMLResource xmiResource, XMLHelper helper,
>+			Map<?, ?> options) {
>+		super(xmiResource, helper, options);
>+	}
>+
>+	@Override
>+	protected void createObject(EObject peekObject, EStructuralFeature feature) {
>+
>+		if (!isNull()) {
>+			String xsiType = getXSIType();
>+
>+			Map<String, Map<EClassifier, String>> featureToTypeMap = xsiType == null
>+				? UML212UML30ExtendedMetaData.getFeatureToTypeMap()
>+				: null;
>+
>+			Map<EClassifier, String> typeMap = featureToTypeMap == null
>+				? null
>+				: featureToTypeMap.get(feature.getName());
>+
>+			if (typeMap != null) {
>+				EObject eObject = peekObject instanceof AnyType
>+					? (EObject) objects.get(objects.size() - 2)
>+					: peekObject;
>+
>+				for (Map.Entry<EClassifier, String> entry : typeMap.entrySet()) {
>+
>+					if (entry.getKey().isInstance(eObject)) {
>+						xsiType = entry.getValue();
>+						break;
>+					}
>+				}
>+			}
>+
>+			if (xsiType != null) {
>+				createObjectFromTypeName(peekObject, xsiType, feature);
>+			} else {
>+				super.createObject(peekObject, feature);
>+			}
>+		}
>+	}
>+
>+}
>Index: src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceFactoryImpl.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceFactoryImpl.java
>diff -N src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceFactoryImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceFactoryImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,97 @@
>+/*
>+ * Copyright (c) 2008 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - initial API and implementation
>+ *
>+ */
>+package org.eclipse.uml2.uml.internal.resource;
>+
>+import java.util.Map;
>+
>+import org.eclipse.emf.common.util.URI;
>+import org.eclipse.emf.ecore.EPackage;
>+import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
>+import org.eclipse.emf.ecore.resource.Resource;
>+import org.eclipse.emf.ecore.resource.ResourceSet;
>+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
>+import org.eclipse.emf.ecore.util.EcoreUtil;
>+import org.eclipse.emf.ecore.util.ExtendedMetaData;
>+import org.eclipse.emf.ecore.xmi.XMLResource;
>+import org.eclipse.emf.mapping.ecore2xml.Ecore2XMLPackage;
>+import org.eclipse.emf.mapping.ecore2xml.Ecore2XMLRegistry;
>+import org.eclipse.emf.mapping.ecore2xml.impl.Ecore2XMLRegistryImpl;
>+import org.eclipse.uml2.uml.UMLPackage;
>+import org.eclipse.uml2.uml.resource.UML212UML30Resource;
>+import org.eclipse.uml2.uml.resource.UML2122UML30ResourceHandler;
>+import org.eclipse.uml2.uml.resource.UML22UMLExtendedMetaData;
>+import org.eclipse.uml2.uml.resource.UML22UMLResource;
>+import org.eclipse.uml2.uml.resource.UMLResource;
>+
>+public class UML212UML30ResourceFactoryImpl
>+		extends UMLResourceFactoryImpl
>+		implements UML212UML30Resource.Factory {
>+
>+	public UML212UML30ResourceFactoryImpl() {
>+		super();
>+	}
>+
>+	@Override
>+	public Resource createResourceGen(URI uri) {
>+		UML212UML30ResourceImpl result = new UML212UML30ResourceImpl(
>+			uri);
>+		result.setEncoding(UML22UMLResource.DEFAULT_ENCODING);
>+		return result;
>+	}
>+
>+	@Override
>+	public Resource createResource(URI uri) {
>+		UMLResource resource = (UMLResource) super.createResource(uri);
>+
>+		Map<Object, Object> defaultLoadOptions = resource
>+			.getDefaultLoadOptions();
>+
>+		EPackage.Registry ePackageRegistry = new EPackageRegistryImpl(
>+			EPackage.Registry.INSTANCE);
>+		ePackageRegistry.put(UML212UML30Resource.UML_METAMODEL_NS_URI,
>+			UMLPackage.eINSTANCE);
>+
>+		ePackageRegistry
>+			.put(
>+				"platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore", UMLPackage.eINSTANCE); //$NON-NLS-1$
>+
>+		ResourceSet resourceSet = new ResourceSetImpl();
>+		resourceSet.setPackageRegistry(ePackageRegistry);
>+
>+		Ecore2XMLRegistry ecore2xmlRegistry = new Ecore2XMLRegistryImpl(
>+			Ecore2XMLRegistry.INSTANCE);
>+		ecore2xmlRegistry
>+			.put(
>+				UML212UML30Resource.UML_METAMODEL_NS_URI,
>+				EcoreUtil
>+					.getObjectByType(
>+						resourceSet
>+							.getResource(
>+								URI
>+									.createURI("platform:/plugin/org.eclipse.uml2.uml/model/UML21_2_UML30.ecore2xml"), //$NON-NLS-1$
>+								true).getContents(),
>+						Ecore2XMLPackage.Literals.XML_MAP));
>+
>+		ExtendedMetaData extendedMetaData = new UML22UMLExtendedMetaData(
>+			ePackageRegistry, ecore2xmlRegistry);
>+
>+		defaultLoadOptions.put(XMLResource.OPTION_EXTENDED_META_DATA,
>+			extendedMetaData);
>+		defaultLoadOptions.put(XMLResource.OPTION_LAX_FEATURE_PROCESSING,
>+			Boolean.FALSE);
>+		defaultLoadOptions.put(XMLResource.OPTION_RESOURCE_HANDLER,
>+			new UML2122UML30ResourceHandler());
>+
>+		return resource;
>+	}
>+
>+}
>Index: src/org/eclipse/uml2/uml/internal/impl/StartObjectBehaviorActionImpl.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/internal/impl/StartObjectBehaviorActionImpl.java
>diff -N src/org/eclipse/uml2/uml/internal/impl/StartObjectBehaviorActionImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/internal/impl/StartObjectBehaviorActionImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,740 @@
>+/*
>+ * Copyright (c) 2008 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - initial API and implementation
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.uml2.uml.internal.impl;
>+
>+import java.util.Collection;
>+import java.util.Map;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+import org.eclipse.emf.common.notify.NotificationChain;
>+
>+import org.eclipse.emf.common.util.DiagnosticChain;
>+import org.eclipse.emf.common.util.EList;
>+
>+import org.eclipse.emf.ecore.EAnnotation;
>+import org.eclipse.emf.ecore.EClass;
>+import org.eclipse.emf.ecore.InternalEObject;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+
>+import org.eclipse.emf.ecore.resource.Resource;
>+
>+import org.eclipse.emf.ecore.util.InternalEList;
>+
>+import org.eclipse.uml2.common.util.CacheAdapter;
>+import org.eclipse.uml2.common.util.DerivedUnionEObjectEList;
>+
>+import org.eclipse.uml2.uml.Activity;
>+import org.eclipse.uml2.uml.ActivityEdge;
>+import org.eclipse.uml2.uml.ActivityNode;
>+import org.eclipse.uml2.uml.ActivityPartition;
>+import org.eclipse.uml2.uml.Comment;
>+import org.eclipse.uml2.uml.Constraint;
>+import org.eclipse.uml2.uml.Dependency;
>+import org.eclipse.uml2.uml.ExceptionHandler;
>+import org.eclipse.uml2.uml.InputPin;
>+import org.eclipse.uml2.uml.InterruptibleActivityRegion;
>+import org.eclipse.uml2.uml.OutputPin;
>+import org.eclipse.uml2.uml.Port;
>+import org.eclipse.uml2.uml.StartObjectBehaviorAction;
>+import org.eclipse.uml2.uml.StringExpression;
>+import org.eclipse.uml2.uml.StructuredActivityNode;
>+import org.eclipse.uml2.uml.Type;
>+import org.eclipse.uml2.uml.UMLPackage;
>+import org.eclipse.uml2.uml.VisibilityKind;
>+
>+import org.eclipse.uml2.uml.internal.operations.StartObjectBehaviorActionOperations;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Start Object Behavior Action'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.StartObjectBehaviorActionImpl#getInputs Input}</li>
>+ * <li>{@link org.eclipse.uml2.uml.internal.impl.StartObjectBehaviorActionImpl#getObject Object}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class StartObjectBehaviorActionImpl
>+		extends CallActionImpl
>+		implements StartObjectBehaviorAction {
>+
>+	/**
>+	 * The cached value of the '{@link #getObject() Object}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getObject()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected InputPin object;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected StartObjectBehaviorActionImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return UMLPackage.Literals.START_OBJECT_BEHAVIOR_ACTION;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public EList<InputPin> getInputs() {
>+		CacheAdapter cache = getCacheAdapter();
>+		if (cache != null) {
>+			Resource eResource = eResource();
>+			@SuppressWarnings("unchecked")
>+			EList<InputPin> inputs = (EList<InputPin>) cache.get(eResource,
>+				this, UMLPackage.Literals.ACTION__INPUT);
>+			if (inputs == null) {
>+				cache.put(eResource, this, UMLPackage.Literals.ACTION__INPUT,
>+					inputs = new DerivedUnionEObjectEList<InputPin>(
>+						InputPin.class, this,
>+						UMLPackage.START_OBJECT_BEHAVIOR_ACTION__INPUT,
>+						INPUT_ESUBSETS));
>+			}
>+			return inputs;
>+		}
>+		return new DerivedUnionEObjectEList<InputPin>(InputPin.class, this,
>+			UMLPackage.START_OBJECT_BEHAVIOR_ACTION__INPUT, INPUT_ESUBSETS);
>+	}
>+
>+	/**
>+	 * The array of subset feature identifiers for the '{@link #getInputs() Input}' reference list.
>+	 * 
>+	 * 
>+	 * @see #getInputs()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final int[] INPUT_ESUBSETS = new int[]{
>+		UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ARGUMENT,
>+		UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT};
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public InputPin getObject() {
>+		if (object != null && object.eIsProxy()) {
>+			InternalEObject oldObject = (InternalEObject) object;
>+			object = (InputPin) eResolveProxy(oldObject);
>+			if (object != oldObject) {
>+				InternalEObject newObject = (InternalEObject) object;
>+				NotificationChain msgs = oldObject.eInverseRemove(this,
>+					EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT,
>+					null, null);
>+				if (newObject.eInternalContainer() == null) {
>+					msgs = newObject.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT,
>+						null, msgs);
>+				}
>+				if (msgs != null)
>+					msgs.dispatch();
>+				if (eNotificationRequired())
>+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
>+						UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT,
>+						oldObject, object));
>+			}
>+		}
>+		return object;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public InputPin basicGetObject() {
>+		return object;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetObject(InputPin newObject,
>+			NotificationChain msgs) {
>+		InputPin oldObject = object;
>+		object = newObject;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this,
>+				Notification.SET,
>+				UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT, oldObject,
>+				newObject);
>+			if (msgs == null)
>+				msgs = notification;
>+			else
>+				msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setObject(InputPin newObject) {
>+		if (newObject != object) {
>+			NotificationChain msgs = null;
>+			if (object != null)
>+				msgs = ((InternalEObject) object).eInverseRemove(this,
>+					EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT,
>+					null, msgs);
>+			if (newObject != null)
>+				msgs = ((InternalEObject) newObject).eInverseAdd(this,
>+					EOPPOSITE_FEATURE_BASE
>+						- UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT,
>+					null, msgs);
>+			msgs = basicSetObject(newObject, msgs);
>+			if (msgs != null)
>+				msgs.dispatch();
>+		} else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET,
>+				UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT, newObject,
>+				newObject));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public InputPin createObject(String name, Type type, EClass eClass) {
>+		InputPin newObject = (InputPin) create(eClass);
>+		setObject(newObject);
>+		if (name != null)
>+			newObject.setName(name);
>+		if (type != null)
>+			newObject.setType(type);
>+		return newObject;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public InputPin createObject(String name, Type type) {
>+		return createObject(name, type, UMLPackage.Literals.INPUT_PIN);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateTypeOfObject(DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return StartObjectBehaviorActionOperations.validateTypeOfObject(this,
>+			diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateMultiplicityOfObject(DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return StartObjectBehaviorActionOperations
>+			.validateMultiplicityOfObject(this, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateNumberOrderArguments(DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return StartObjectBehaviorActionOperations
>+			.validateNumberOrderArguments(this, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateNumberOrderResults(DiagnosticChain diagnostics,
>+			Map<Object, Object> context) {
>+		return StartObjectBehaviorActionOperations.validateNumberOrderResults(
>+			this, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public boolean validateTypeOrderingMultiplicityMatch(
>+			DiagnosticChain diagnostics, Map<Object, Object> context) {
>+		return StartObjectBehaviorActionOperations
>+			.validateTypeOrderingMultiplicityMatch(this, diagnostics, context);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd,
>+			int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__EANNOTATIONS :
>+				return ((InternalEList<?>) getEAnnotations()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OWNED_COMMENT :
>+				return ((InternalEList<?>) getOwnedComments()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__CLIENT_DEPENDENCY :
>+				return ((InternalEList<?>) getClientDependencies())
>+					.basicRemove(otherEnd, msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__NAME_EXPRESSION :
>+				return basicSetNameExpression(null, msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_STRUCTURED_NODE :
>+				return basicSetInStructuredNode(null, msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ACTIVITY :
>+				return basicSetActivity(null, msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OUTGOING :
>+				return ((InternalEList<?>) getOutgoings()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__INCOMING :
>+				return ((InternalEList<?>) getIncomings()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_PARTITION :
>+				return ((InternalEList<?>) getInPartitions()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_INTERRUPTIBLE_REGION :
>+				return ((InternalEList<?>) getInInterruptibleRegions())
>+					.basicRemove(otherEnd, msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__HANDLER :
>+				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
>+					msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__LOCAL_PRECONDITION :
>+				return ((InternalEList<?>) getLocalPreconditions())
>+					.basicRemove(otherEnd, msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__LOCAL_POSTCONDITION :
>+				return ((InternalEList<?>) getLocalPostconditions())
>+					.basicRemove(otherEnd, msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ARGUMENT :
>+				return ((InternalEList<?>) getArguments()).basicRemove(
>+					otherEnd, msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__RESULT :
>+				return ((InternalEList<?>) getResults()).basicRemove(otherEnd,
>+					msgs);
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT :
>+				return basicSetObject(null, msgs);
>+		}
>+		return eDynamicInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__EANNOTATIONS :
>+				return getEAnnotations();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OWNED_ELEMENT :
>+				return getOwnedElements();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OWNER :
>+				if (resolve)
>+					return getOwner();
>+				return basicGetOwner();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OWNED_COMMENT :
>+				return getOwnedComments();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__NAME :
>+				return getName();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__VISIBILITY :
>+				return getVisibility();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__QUALIFIED_NAME :
>+				return getQualifiedName();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__CLIENT_DEPENDENCY :
>+				return getClientDependencies();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__NAMESPACE :
>+				if (resolve)
>+					return getNamespace();
>+				return basicGetNamespace();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__NAME_EXPRESSION :
>+				if (resolve)
>+					return getNameExpression();
>+				return basicGetNameExpression();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IS_LEAF :
>+				return isLeaf()
>+					? Boolean.TRUE
>+					: Boolean.FALSE;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__REDEFINED_ELEMENT :
>+				return getRedefinedElements();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__REDEFINITION_CONTEXT :
>+				return getRedefinitionContexts();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_STRUCTURED_NODE :
>+				if (resolve)
>+					return getInStructuredNode();
>+				return basicGetInStructuredNode();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ACTIVITY :
>+				if (resolve)
>+					return getActivity();
>+				return basicGetActivity();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OUTGOING :
>+				return getOutgoings();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__INCOMING :
>+				return getIncomings();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_PARTITION :
>+				return getInPartitions();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_INTERRUPTIBLE_REGION :
>+				return getInInterruptibleRegions();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_GROUP :
>+				return getInGroups();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__REDEFINED_NODE :
>+				return getRedefinedNodes();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__HANDLER :
>+				return getHandlers();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OUTPUT :
>+				return getOutputs();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__INPUT :
>+				return getInputs();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__CONTEXT :
>+				if (resolve)
>+					return getContext();
>+				return basicGetContext();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__LOCAL_PRECONDITION :
>+				return getLocalPreconditions();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__LOCAL_POSTCONDITION :
>+				return getLocalPostconditions();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ARGUMENT :
>+				return getArguments();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ON_PORT :
>+				if (resolve)
>+					return getOnPort();
>+				return basicGetOnPort();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IS_SYNCHRONOUS :
>+				return isSynchronous()
>+					? Boolean.TRUE
>+					: Boolean.FALSE;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__RESULT :
>+				return getResults();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT :
>+				if (resolve)
>+					return getObject();
>+				return basicGetObject();
>+		}
>+		return eDynamicGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__EANNOTATIONS :
>+				getEAnnotations().clear();
>+				getEAnnotations().addAll(
>+					(Collection<? extends EAnnotation>) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OWNED_COMMENT :
>+				getOwnedComments().clear();
>+				getOwnedComments().addAll(
>+					(Collection<? extends Comment>) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__NAME :
>+				setName((String) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__VISIBILITY :
>+				setVisibility((VisibilityKind) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__CLIENT_DEPENDENCY :
>+				getClientDependencies().clear();
>+				getClientDependencies().addAll(
>+					(Collection<? extends Dependency>) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__NAME_EXPRESSION :
>+				setNameExpression((StringExpression) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IS_LEAF :
>+				setIsLeaf(((Boolean) newValue).booleanValue());
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_STRUCTURED_NODE :
>+				setInStructuredNode((StructuredActivityNode) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ACTIVITY :
>+				setActivity((Activity) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OUTGOING :
>+				getOutgoings().clear();
>+				getOutgoings().addAll(
>+					(Collection<? extends ActivityEdge>) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__INCOMING :
>+				getIncomings().clear();
>+				getIncomings().addAll(
>+					(Collection<? extends ActivityEdge>) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_PARTITION :
>+				getInPartitions().clear();
>+				getInPartitions().addAll(
>+					(Collection<? extends ActivityPartition>) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_INTERRUPTIBLE_REGION :
>+				getInInterruptibleRegions().clear();
>+				getInInterruptibleRegions()
>+					.addAll(
>+						(Collection<? extends InterruptibleActivityRegion>) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__REDEFINED_NODE :
>+				getRedefinedNodes().clear();
>+				getRedefinedNodes().addAll(
>+					(Collection<? extends ActivityNode>) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__HANDLER :
>+				getHandlers().clear();
>+				getHandlers().addAll(
>+					(Collection<? extends ExceptionHandler>) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__LOCAL_PRECONDITION :
>+				getLocalPreconditions().clear();
>+				getLocalPreconditions().addAll(
>+					(Collection<? extends Constraint>) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__LOCAL_POSTCONDITION :
>+				getLocalPostconditions().clear();
>+				getLocalPostconditions().addAll(
>+					(Collection<? extends Constraint>) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ARGUMENT :
>+				getArguments().clear();
>+				getArguments()
>+					.addAll((Collection<? extends InputPin>) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ON_PORT :
>+				setOnPort((Port) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IS_SYNCHRONOUS :
>+				setIsSynchronous(((Boolean) newValue).booleanValue());
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__RESULT :
>+				getResults().clear();
>+				getResults().addAll((Collection<? extends OutputPin>) newValue);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT :
>+				setObject((InputPin) newValue);
>+				return;
>+		}
>+		eDynamicSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__EANNOTATIONS :
>+				getEAnnotations().clear();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OWNED_COMMENT :
>+				getOwnedComments().clear();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__NAME :
>+				unsetName();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__VISIBILITY :
>+				unsetVisibility();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__CLIENT_DEPENDENCY :
>+				getClientDependencies().clear();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__NAME_EXPRESSION :
>+				setNameExpression((StringExpression) null);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IS_LEAF :
>+				setIsLeaf(IS_LEAF_EDEFAULT);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_STRUCTURED_NODE :
>+				setInStructuredNode((StructuredActivityNode) null);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ACTIVITY :
>+				setActivity((Activity) null);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OUTGOING :
>+				getOutgoings().clear();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__INCOMING :
>+				getIncomings().clear();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_PARTITION :
>+				getInPartitions().clear();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_INTERRUPTIBLE_REGION :
>+				getInInterruptibleRegions().clear();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__REDEFINED_NODE :
>+				getRedefinedNodes().clear();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__HANDLER :
>+				getHandlers().clear();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__LOCAL_PRECONDITION :
>+				getLocalPreconditions().clear();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__LOCAL_POSTCONDITION :
>+				getLocalPostconditions().clear();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ARGUMENT :
>+				getArguments().clear();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ON_PORT :
>+				setOnPort((Port) null);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IS_SYNCHRONOUS :
>+				setIsSynchronous(IS_SYNCHRONOUS_EDEFAULT);
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__RESULT :
>+				getResults().clear();
>+				return;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT :
>+				setObject((InputPin) null);
>+				return;
>+		}
>+		eDynamicUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__EANNOTATIONS :
>+				return eAnnotations != null && !eAnnotations.isEmpty();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OWNED_ELEMENT :
>+				return isSetOwnedElements();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OWNER :
>+				return isSetOwner();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OWNED_COMMENT :
>+				return ownedComments != null && !ownedComments.isEmpty();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__NAME :
>+				return isSetName();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__VISIBILITY :
>+				return isSetVisibility();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__QUALIFIED_NAME :
>+				return QUALIFIED_NAME_EDEFAULT == null
>+					? getQualifiedName() != null
>+					: !QUALIFIED_NAME_EDEFAULT.equals(getQualifiedName());
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__CLIENT_DEPENDENCY :
>+				return clientDependencies != null
>+					&& !clientDependencies.isEmpty();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__NAMESPACE :
>+				return isSetNamespace();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__NAME_EXPRESSION :
>+				return nameExpression != null;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IS_LEAF :
>+				return ((eFlags & IS_LEAF_EFLAG) != 0) != IS_LEAF_EDEFAULT;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__REDEFINED_ELEMENT :
>+				return isSetRedefinedElements();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__REDEFINITION_CONTEXT :
>+				return isSetRedefinitionContexts();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_STRUCTURED_NODE :
>+				return basicGetInStructuredNode() != null;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ACTIVITY :
>+				return basicGetActivity() != null;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OUTGOING :
>+				return outgoings != null && !outgoings.isEmpty();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__INCOMING :
>+				return incomings != null && !incomings.isEmpty();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_PARTITION :
>+				return inPartitions != null && !inPartitions.isEmpty();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_INTERRUPTIBLE_REGION :
>+				return inInterruptibleRegions != null
>+					&& !inInterruptibleRegions.isEmpty();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_GROUP :
>+				return isSetInGroups();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__REDEFINED_NODE :
>+				return redefinedNodes != null && !redefinedNodes.isEmpty();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__HANDLER :
>+				return handlers != null && !handlers.isEmpty();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OUTPUT :
>+				return isSetOutputs();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__INPUT :
>+				return isSetInputs();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__CONTEXT :
>+				return basicGetContext() != null;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__LOCAL_PRECONDITION :
>+				return localPreconditions != null
>+					&& !localPreconditions.isEmpty();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__LOCAL_POSTCONDITION :
>+				return localPostconditions != null
>+					&& !localPostconditions.isEmpty();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ARGUMENT :
>+				return arguments != null && !arguments.isEmpty();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ON_PORT :
>+				return onPort != null;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IS_SYNCHRONOUS :
>+				return ((eFlags & IS_SYNCHRONOUS_EFLAG) != 0) != IS_SYNCHRONOUS_EDEFAULT;
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__RESULT :
>+				return results != null && !results.isEmpty();
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT :
>+				return object != null;
>+		}
>+		return eDynamicIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean isSetInputs() {
>+		return super.isSetInputs()
>+			|| eIsSet(UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT);
>+	}
>+
>+} //StartObjectBehaviorActionImpl
>#P org.eclipse.uml2.uml.tests
>Index: src/org/eclipse/uml2/uml/tests/UMLTests.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/UMLTests.java,v
>retrieving revision 1.5
>diff -u -r1.5 UMLTests.java
>--- src/org/eclipse/uml2/uml/tests/UMLTests.java	9 Jan 2008 18:52:23 -0000	1.5
>+++ src/org/eclipse/uml2/uml/tests/UMLTests.java	24 Sep 2008 18:40:22 -0000
>@@ -61,7 +61,6 @@
> 		suite.addTestSuite(AbstractionTest.class);
> 		suite.addTestSuite(OpaqueExpressionTest.class);
> 		suite.addTestSuite(ParameterTest.class);
>-		suite.addTestSuite(ConnectableElementTemplateParameterTest.class);
> 		suite.addTestSuite(ConnectorEndTest.class);
> 		suite.addTestSuite(PropertyTest.class);
> 		suite.addTestSuite(DeploymentTest.class);
>@@ -94,6 +93,7 @@
> 		suite.addTestSuite(ParameterSetTest.class);
> 		suite.addTestSuite(DataTypeTest.class);
> 		suite.addTestSuite(OperationTemplateParameterTest.class);
>+		suite.addTestSuite(ConnectableElementTemplateParameterTest.class);
> 		suite.addTestSuite(CollaborationUseTest.class);
> 		suite.addTestSuite(CollaborationTest.class);
> 		suite.addTestSuite(UseCaseTest.class);
>@@ -170,6 +170,7 @@
> 		suite.addTestSuite(CentralBufferNodeTest.class);
> 		suite.addTestSuite(MergeNodeTest.class);
> 		suite.addTestSuite(DecisionNodeTest.class);
>+		suite.addTestSuite(ObjectFlowTest.class);
> 		suite.addTestSuite(ActivityFinalNodeTest.class);
> 		suite.addTestSuite(ComponentRealizationTest.class);
> 		suite.addTestSuite(ComponentTest.class);
>@@ -231,9 +232,9 @@
> 		suite.addTestSuite(ReplyActionTest.class);
> 		suite.addTestSuite(UnmarshallActionTest.class);
> 		suite.addTestSuite(ReduceActionTest.class);
>+		suite.addTestSuite(StartObjectBehaviorActionTest.class);
> 		suite.addTestSuite(JoinNodeTest.class);
> 		suite.addTestSuite(DataStoreNodeTest.class);
>-		suite.addTestSuite(ObjectFlowTest.class);
> 		suite.addTestSuite(ConditionalNodeTest.class);
> 		suite.addTestSuite(ClauseTest.class);
> 		suite.addTestSuite(LoopNodeTest.class);
>Index: src/org/eclipse/uml2/uml/tests/ConnectableElementTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ConnectableElementTest.java,v
>retrieving revision 1.5
>diff -u -r1.5 ConnectableElementTest.java
>--- src/org/eclipse/uml2/uml/tests/ConnectableElementTest.java	4 May 2007 20:35:57 -0000	1.5
>+++ src/org/eclipse/uml2/uml/tests/ConnectableElementTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>Index: src/org/eclipse/uml2/uml/tests/VariableTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/VariableTest.java,v
>retrieving revision 1.9
>diff -u -r1.9 VariableTest.java
>--- src/org/eclipse/uml2/uml/tests/VariableTest.java	14 Feb 2007 20:06:14 -0000	1.9
>+++ src/org/eclipse/uml2/uml/tests/VariableTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -31,7 +31,6 @@
> * 
> * The following operations are tested:
> * <ul>
>- * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Gt0}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateLowerGe0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Lower Ge0}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGeLower(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Ge Lower}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateValueSpecificationNoSideEffects(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Value Specification No Side Effects}</li>
>@@ -155,18 +154,6 @@
> 	}
> 
> 	/**
>-	 * Tests the '{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Gt0}' operation.
>-	 * 
>-	 * 
>-	 * @see org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>-	 * @generated
>-	 */
>-	public void testValidateUpperGt0__DiagnosticChain_Map() {
>-		// TODO: implement this feature getter test method
>-		// Ensure that you remove @generated or mark it @generated NOT
>-	}
>-
>-	/**
> 	 * Tests the '{@link org.eclipse.uml2.uml.MultiplicityElement#validateLowerGe0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Lower Ge0}' operation.
> 	 * 
> 	 * 
>Index: src/org/eclipse/uml2/uml/tests/VertexTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/VertexTest.java,v
>retrieving revision 1.5
>diff -u -r1.5 VertexTest.java
>--- src/org/eclipse/uml2/uml/tests/VertexTest.java	4 May 2007 20:35:57 -0000	1.5
>+++ src/org/eclipse/uml2/uml/tests/VertexTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -21,8 +21,8 @@
> * 
> * The following features are tested:
> * <ul>
>- * <li>{@link org.eclipse.uml2.uml.Vertex#getIncomings() Incoming}</li>
> * <li>{@link org.eclipse.uml2.uml.Vertex#getOutgoings() Outgoing}</li>
>+ * <li>{@link org.eclipse.uml2.uml.Vertex#getIncomings() Incoming}</li>
> * </ul>
> * 
> * 
>Index: src/org/eclipse/uml2/uml/tests/MultiplicityElementTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/MultiplicityElementTest.java,v
>retrieving revision 1.9
>diff -u -r1.9 MultiplicityElementTest.java
>--- src/org/eclipse/uml2/uml/tests/MultiplicityElementTest.java	14 Feb 2007 20:06:13 -0000	1.9
>+++ src/org/eclipse/uml2/uml/tests/MultiplicityElementTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -31,7 +31,6 @@
> * 
> * The following operations are tested:
> * <ul>
>- * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Gt0}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateLowerGe0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Lower Ge0}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGeLower(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Ge Lower}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateValueSpecificationNoSideEffects(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Value Specification No Side Effects}</li>
>@@ -143,18 +142,6 @@
> 	}
> 
> 	/**
>-	 * Tests the '{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Gt0}' operation.
>-	 * 
>-	 * 
>-	 * @see org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>-	 * @generated
>-	 */
>-	public void testValidateUpperGt0__DiagnosticChain_Map() {
>-		// TODO: implement this feature getter test method
>-		// Ensure that you remove @generated or mark it @generated NOT
>-	}
>-
>-	/**
> 	 * Tests the '{@link org.eclipse.uml2.uml.MultiplicityElement#validateLowerGe0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Lower Ge0}' operation.
> 	 * 
> 	 * 
>Index: src/org/eclipse/uml2/uml/tests/WriteStructuralFeatureActionTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/WriteStructuralFeatureActionTest.java,v
>retrieving revision 1.5
>diff -u -r1.5 WriteStructuralFeatureActionTest.java
>--- src/org/eclipse/uml2/uml/tests/WriteStructuralFeatureActionTest.java	14 Feb 2007 20:06:12 -0000	1.5
>+++ src/org/eclipse/uml2/uml/tests/WriteStructuralFeatureActionTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -22,6 +22,8 @@
> * The following operations are tested:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#validateInputPin(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Input Pin}</li>
>+ * <li>{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#validateTypeOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Type Of Result}</li>
>+ * <li>{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#validateMultiplicityOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity Of Result}</li>
> * <li>{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#validateMultiplicity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity}</li>
> * </ul>
> * 
>@@ -64,6 +66,30 @@
> 	}
> 
> 	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#validateTypeOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Type Of Result}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.WriteStructuralFeatureAction#validateTypeOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateTypeOfResult__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#validateMultiplicityOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity Of Result}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.WriteStructuralFeatureAction#validateMultiplicityOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateMultiplicityOfResult__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+	/**
> 	 * Tests the '{@link org.eclipse.uml2.uml.WriteStructuralFeatureAction#validateMultiplicity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity}' operation.
> 	 * 
> 	 * 
>Index: src/org/eclipse/uml2/uml/tests/StateTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/StateTest.java,v
>retrieving revision 1.7
>diff -u -r1.7 StateTest.java
>--- src/org/eclipse/uml2/uml/tests/StateTest.java	4 May 2007 20:35:57 -0000	1.7
>+++ src/org/eclipse/uml2/uml/tests/StateTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -25,8 +25,8 @@
> * The following features are tested:
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.State#getRedefinitionContexts() Redefinition Context}</li>
>- * <li>{@link org.eclipse.uml2.uml.Vertex#getIncomings() Incoming}</li>
> * <li>{@link org.eclipse.uml2.uml.Vertex#getOutgoings() Outgoing}</li>
>+ * <li>{@link org.eclipse.uml2.uml.Vertex#getIncomings() Incoming}</li>
> * <li>{@link org.eclipse.uml2.uml.State#isComposite() Is Composite}</li>
> * <li>{@link org.eclipse.uml2.uml.State#isOrthogonal() Is Orthogonal}</li>
> * <li>{@link org.eclipse.uml2.uml.State#isSimple() Is Simple}</li>
>Index: src/org/eclipse/uml2/uml/tests/PinTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PinTest.java,v
>retrieving revision 1.9
>diff -u -r1.9 PinTest.java
>--- src/org/eclipse/uml2/uml/tests/PinTest.java	14 Feb 2007 20:06:14 -0000	1.9
>+++ src/org/eclipse/uml2/uml/tests/PinTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -31,7 +31,6 @@
> * 
> * The following operations are tested:
> * <ul>
>- * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Gt0}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateLowerGe0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Lower Ge0}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGeLower(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Ge Lower}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateValueSpecificationNoSideEffects(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Value Specification No Side Effects}</li>
>@@ -154,18 +153,6 @@
> 	}
> 
> 	/**
>-	 * Tests the '{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Gt0}' operation.
>-	 * 
>-	 * 
>-	 * @see org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>-	 * @generated
>-	 */
>-	public void testValidateUpperGt0__DiagnosticChain_Map() {
>-		// TODO: implement this feature getter test method
>-		// Ensure that you remove @generated or mark it @generated NOT
>-	}
>-
>-	/**
> 	 * Tests the '{@link org.eclipse.uml2.uml.MultiplicityElement#validateLowerGe0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Lower Ge0}' operation.
> 	 * 
> 	 * 
>Index: src/org/eclipse/uml2/uml/tests/StructuralFeatureTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/StructuralFeatureTest.java,v
>retrieving revision 1.8
>diff -u -r1.8 StructuralFeatureTest.java
>--- src/org/eclipse/uml2/uml/tests/StructuralFeatureTest.java	14 Feb 2007 20:06:14 -0000	1.8
>+++ src/org/eclipse/uml2/uml/tests/StructuralFeatureTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -28,7 +28,6 @@
> * 
> * The following operations are tested:
> * <ul>
>- * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Gt0}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateLowerGe0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Lower Ge0}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGeLower(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Ge Lower}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateValueSpecificationNoSideEffects(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Value Specification No Side Effects}</li>
>@@ -117,18 +116,6 @@
> 	}
> 
> 	/**
>-	 * Tests the '{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Gt0}' operation.
>-	 * 
>-	 * 
>-	 * @see org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>-	 * @generated
>-	 */
>-	public void testValidateUpperGt0__DiagnosticChain_Map() {
>-		// TODO: implement this feature getter test method
>-		// Ensure that you remove @generated or mark it @generated NOT
>-	}
>-
>-	/**
> 	 * Tests the '{@link org.eclipse.uml2.uml.MultiplicityElement#validateLowerGe0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Lower Ge0}' operation.
> 	 * 
> 	 * 
>Index: src/org/eclipse/uml2/uml/tests/ParameterTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ParameterTest.java,v
>retrieving revision 1.11
>diff -u -r1.11 ParameterTest.java
>--- src/org/eclipse/uml2/uml/tests/ParameterTest.java	14 Feb 2007 20:06:14 -0000	1.11
>+++ src/org/eclipse/uml2/uml/tests/ParameterTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -39,7 +39,6 @@
> * 
> * The following operations are tested:
> * <ul>
>- * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Gt0}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateLowerGe0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Lower Ge0}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGeLower(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Ge Lower}</li>
> * <li>{@link org.eclipse.uml2.uml.MultiplicityElement#validateValueSpecificationNoSideEffects(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Value Specification No Side Effects}</li>
>@@ -231,18 +230,6 @@
> 	}
> 
> 	/**
>-	 * Tests the '{@link org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Upper Gt0}' operation.
>-	 * 
>-	 * 
>-	 * @see org.eclipse.uml2.uml.MultiplicityElement#validateUpperGt0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>-	 * @generated
>-	 */
>-	public void testValidateUpperGt0__DiagnosticChain_Map() {
>-		// TODO: implement this feature getter test method
>-		// Ensure that you remove @generated or mark it @generated NOT
>-	}
>-
>-	/**
> 	 * Tests the '{@link org.eclipse.uml2.uml.MultiplicityElement#validateLowerGe0(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Lower Ge0}' operation.
> 	 * 
> 	 * 
>Index: src/org/eclipse/uml2/uml/tests/TransitionTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/TransitionTest.java,v
>retrieving revision 1.6
>diff -u -r1.6 TransitionTest.java
>--- src/org/eclipse/uml2/uml/tests/TransitionTest.java	14 Feb 2007 20:06:13 -0000	1.6
>+++ src/org/eclipse/uml2/uml/tests/TransitionTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>Index: src/org/eclipse/uml2/uml/tests/DecisionNodeTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/DecisionNodeTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 DecisionNodeTest.java
>--- src/org/eclipse/uml2/uml/tests/DecisionNodeTest.java	14 Feb 2007 20:06:13 -0000	1.3
>+++ src/org/eclipse/uml2/uml/tests/DecisionNodeTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -24,9 +24,14 @@
> * 
> * The following operations are tested:
> * <ul>
>- * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateOneIncomingEdge(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate One Incoming Edge}</li>
>- * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateInputParameter(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Input Parameter}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateIncomingOutgoingEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Incoming Outgoing Edges}</li>
> * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Edges}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateDecisionInputFlowIncoming(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Decision Input Flow Incoming}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateParameters(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Parameters}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateZeroInputParameters(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Zero Input Parameters}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateIncomingObjectOneInputParameter(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Incoming Object One Input Parameter}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateIncomingControlOneInputParameter(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Incoming Control One Input Parameter}</li>
>+ * <li>{@link org.eclipse.uml2.uml.DecisionNode#validateTwoInputParameters(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Two Input Parameters}</li>
> * </ul>
> * 
> * @generated
>@@ -89,37 +94,97 @@
> 	}
> 
> 	/**
>-	 * Tests the '{@link org.eclipse.uml2.uml.DecisionNode#validateOneIncomingEdge(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate One Incoming Edge}' operation.
>+	 * Tests the '{@link org.eclipse.uml2.uml.DecisionNode#validateIncomingOutgoingEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Incoming Outgoing Edges}' operation.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.uml2.uml.DecisionNode#validateOneIncomingEdge(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @see org.eclipse.uml2.uml.DecisionNode#validateIncomingOutgoingEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
> 	 * @generated
> 	 */
>-	public void testValidateOneIncomingEdge__DiagnosticChain_Map() {
>+	public void testValidateIncomingOutgoingEdges__DiagnosticChain_Map() {
> 		// TODO: implement this feature getter test method
> 		// Ensure that you remove @generated or mark it @generated NOT
> 	}
> 
> 	/**
>-	 * Tests the '{@link org.eclipse.uml2.uml.DecisionNode#validateInputParameter(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Input Parameter}' operation.
>+	 * Tests the '{@link org.eclipse.uml2.uml.DecisionNode#validateEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Edges}' operation.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.uml2.uml.DecisionNode#validateInputParameter(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @see org.eclipse.uml2.uml.DecisionNode#validateEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
> 	 * @generated
> 	 */
>-	public void testValidateInputParameter__DiagnosticChain_Map() {
>+	public void testValidateEdges__DiagnosticChain_Map() {
> 		// TODO: implement this feature getter test method
> 		// Ensure that you remove @generated or mark it @generated NOT
> 	}
> 
> 	/**
>-	 * Tests the '{@link org.eclipse.uml2.uml.DecisionNode#validateEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Edges}' operation.
>+	 * Tests the '{@link org.eclipse.uml2.uml.DecisionNode#validateDecisionInputFlowIncoming(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Decision Input Flow Incoming}' operation.
> 	 * 
> 	 * 
>-	 * @see org.eclipse.uml2.uml.DecisionNode#validateEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @see org.eclipse.uml2.uml.DecisionNode#validateDecisionInputFlowIncoming(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
> 	 * @generated
> 	 */
>-	public void testValidateEdges__DiagnosticChain_Map() {
>+	public void testValidateDecisionInputFlowIncoming__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.DecisionNode#validateParameters(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Parameters}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.DecisionNode#validateParameters(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateParameters__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.DecisionNode#validateZeroInputParameters(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Zero Input Parameters}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.DecisionNode#validateZeroInputParameters(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateZeroInputParameters__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.DecisionNode#validateIncomingObjectOneInputParameter(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Incoming Object One Input Parameter}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.DecisionNode#validateIncomingObjectOneInputParameter(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateIncomingObjectOneInputParameter__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.DecisionNode#validateIncomingControlOneInputParameter(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Incoming Control One Input Parameter}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.DecisionNode#validateIncomingControlOneInputParameter(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateIncomingControlOneInputParameter__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.DecisionNode#validateTwoInputParameters(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Two Input Parameters}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.DecisionNode#validateTwoInputParameters(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateTwoInputParameters__DiagnosticChain_Map() {
> 		// TODO: implement this feature getter test method
> 		// Ensure that you remove @generated or mark it @generated NOT
> 	}
>Index: src/org/eclipse/uml2/uml/tests/PropertyTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PropertyTest.java,v
>retrieving revision 1.12
>diff -u -r1.12 PropertyTest.java
>--- src/org/eclipse/uml2/uml/tests/PropertyTest.java	4 May 2007 20:35:57 -0000	1.12
>+++ src/org/eclipse/uml2/uml/tests/PropertyTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -48,8 +48,6 @@
> * <ul>
> * <li>{@link org.eclipse.uml2.uml.Property#isCompatibleWith(org.eclipse.uml2.uml.ParameterableElement) Is Compatible With}</li>
> * <li>{@link org.eclipse.uml2.uml.ParameterableElement#isTemplateParameter() Is Template Parameter}</li>
>- * <li>{@link org.eclipse.uml2.uml.TemplateableElement#parameterableElements() Parameterable Elements}</li>
>- * <li>{@link org.eclipse.uml2.uml.TemplateableElement#isTemplate() Is Template}</li>
> * <li>{@link org.eclipse.uml2.uml.Property#validateMultiplicityOfComposite(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity Of Composite}</li>
> * <li>{@link org.eclipse.uml2.uml.Property#validateSubsettingContextConforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Subsetting Context Conforms}</li>
> * <li>{@link org.eclipse.uml2.uml.Property#validateRedefinedPropertyInherited(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Redefined Property Inherited}</li>
>@@ -289,33 +287,6 @@
> 	}
> 
> 	/**
>-	 * Tests the '{@link org.eclipse.uml2.uml.TemplateableElement#parameterableElements() Parameterable Elements}' operation.
>-	 * 
>-	 * 
>-	 * @see org.eclipse.uml2.uml.TemplateableElement#parameterableElements()
>-	 * @generated
>-	 */
>-	public void testParameterableElements() {
>-		// TODO: implement this feature getter test method
>-		// Ensure that you remove @generated or mark it @generated NOT
>-	}
>-
>-	/**
>-	 * Tests the '{@link org.eclipse.uml2.uml.TemplateableElement#isTemplate() Is Template}' operation.
>-	 * 
>-	 * 
>-	 * @see org.eclipse.uml2.uml.TemplateableElement#isTemplate()
>-	 * @generated NOT
>-	 */
>-	public void testIsTemplate() {
>-		assertFalse(getFixture().isTemplate());
>-
>-		getFixture().createOwnedTemplateSignature();
>-
>-		assertTrue(getFixture().isTemplate());
>-	}
>-
>-	/**
> 	 * Tests the '{@link org.eclipse.uml2.uml.Property#validateMultiplicityOfComposite(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity Of Composite}' operation.
> 	 * 
> 	 * 
>Index: src/org/eclipse/uml2/uml/tests/ActivityParameterNodeTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ActivityParameterNodeTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 ActivityParameterNodeTest.java
>--- src/org/eclipse/uml2/uml/tests/ActivityParameterNodeTest.java	14 Feb 2007 20:06:13 -0000	1.3
>+++ src/org/eclipse/uml2/uml/tests/ActivityParameterNodeTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -29,6 +29,8 @@
> * <li>{@link org.eclipse.uml2.uml.ActivityParameterNode#validateNoEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate No Edges}</li>
> * <li>{@link org.eclipse.uml2.uml.ActivityParameterNode#validateNoIncomingEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate No Incoming Edges}</li>
> * <li>{@link org.eclipse.uml2.uml.ActivityParameterNode#validateNoOutgoingEdges(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate No Outgoing Edges}</li>
>+ * <li>{@link org.eclipse.uml2.uml.ActivityParameterNode#validateMaximumOneParameterNode(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Maximum One Parameter Node}</li>
>+ * <li>{@link org.eclipse.uml2.uml.ActivityParameterNode#validateMaximumTwoParameterNodes(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Maximum Two Parameter Nodes}</li>
> * </ul>
> * 
> * @generated
>@@ -150,4 +152,28 @@
> 		// Ensure that you remove @generated or mark it @generated NOT
> 	}
> 
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.ActivityParameterNode#validateMaximumOneParameterNode(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Maximum One Parameter Node}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.ActivityParameterNode#validateMaximumOneParameterNode(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateMaximumOneParameterNode__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.ActivityParameterNode#validateMaximumTwoParameterNodes(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Maximum Two Parameter Nodes}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.ActivityParameterNode#validateMaximumTwoParameterNodes(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateMaximumTwoParameterNodes__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
> } //ActivityParameterNodeTest
>Index: src/org/eclipse/uml2/uml/tests/ConnectorEndTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ConnectorEndTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 ConnectorEndTest.java
>--- src/org/eclipse/uml2/uml/tests/ConnectorEndTest.java	14 Feb 2007 20:06:14 -0000	1.3
>+++ src/org/eclipse/uml2/uml/tests/ConnectorEndTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>Index: src/org/eclipse/uml2/uml/tests/ClearStructuralFeatureActionTest.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ClearStructuralFeatureActionTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 ClearStructuralFeatureActionTest.java
>--- src/org/eclipse/uml2/uml/tests/ClearStructuralFeatureActionTest.java	14 Feb 2007 20:06:12 -0000	1.3
>+++ src/org/eclipse/uml2/uml/tests/ClearStructuralFeatureActionTest.java	24 Sep 2008 18:40:22 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -21,6 +21,13 @@
> * 
> * A test case for the model object 'Clear Structural Feature Action'.
> * 
>+ * 
>+ * The following operations are tested:
>+ * <ul>
>+ * <li>{@link org.eclipse.uml2.uml.ClearStructuralFeatureAction#validateTypeOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Type Of Result}</li>
>+ * <li>{@link org.eclipse.uml2.uml.ClearStructuralFeatureAction#validateMultiplicityOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity Of Result}</li>
>+ * </ul>
>+ * 
> * @generated
> */
> public class ClearStructuralFeatureActionTest
>@@ -80,4 +87,28 @@
> 		setFixture(null);
> 	}
> 
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.ClearStructuralFeatureAction#validateTypeOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Type Of Result}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.ClearStructuralFeatureAction#validateTypeOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateTypeOfResult__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.ClearStructuralFeatureAction#validateMultiplicityOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity Of Result}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.ClearStructuralFeatureAction#validateMultiplicityOfResult(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateMultiplicityOfResult__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
> } //ClearStructuralFeatureActionTest
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/tests/org.eclipse.uml2.uml.tests/META-INF/MANIFEST.MF,v
>retrieving revision 1.7
>diff -u -r1.7 MANIFEST.MF
>--- META-INF/MANIFEST.MF	21 Feb 2008 18:43:10 -0000	1.7
>+++ META-INF/MANIFEST.MF	24 Sep 2008 18:40:22 -0000
>@@ -2,14 +2,14 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.uml2.uml.tests; singleton:=true
>-Bundle-Version: 2.2.0.qualifier
>+Bundle-Version: 2.3.0.qualifier
> Bundle-ClassPath: uml2.uml.tests.jar
> Bundle-Vendor: %providerName
> Bundle-Localization: plugin
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Export-Package: org.eclipse.uml2.uml.tests
> Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
>- org.eclipse.uml2.uml;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
>+ org.eclipse.uml2.uml;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
> org.eclipse.emf.ecore.xmi;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
> org.junit;bundle-version="[3.8.1,4.0.0)";visibility:=reexport
> Eclipse-LazyStart: true
>Index: src/org/eclipse/uml2/uml/tests/StartObjectBehaviorActionTest.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/tests/StartObjectBehaviorActionTest.java
>diff -N src/org/eclipse/uml2/uml/tests/StartObjectBehaviorActionTest.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/tests/StartObjectBehaviorActionTest.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,153 @@
>+/*
>+ * Copyright (c) 2008 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - initial API and implementation
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.uml2.uml.tests;
>+
>+import junit.textui.TestRunner;
>+
>+import org.eclipse.uml2.uml.StartObjectBehaviorAction;
>+import org.eclipse.uml2.uml.UMLFactory;
>+
>+/**
>+ * 
>+ * A test case for the model object 'Start Object Behavior Action'.
>+ * 
>+ * 
>+ * The following operations are tested:
>+ * <ul>
>+ * <li>{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateTypeOfObject(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Type Of Object}</li>
>+ * <li>{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateMultiplicityOfObject(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity Of Object}</li>
>+ * <li>{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateNumberOrderArguments(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Number Order Arguments}</li>
>+ * <li>{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateNumberOrderResults(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Number Order Results}</li>
>+ * <li>{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateTypeOrderingMultiplicityMatch(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Type Ordering Multiplicity Match}</li>
>+ * </ul>
>+ * 
>+ * @generated
>+ */
>+public class StartObjectBehaviorActionTest
>+		extends CallActionTest {
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public static void main(String[] args) {
>+		TestRunner.run(StartObjectBehaviorActionTest.class);
>+	}
>+
>+	/**
>+	 * Constructs a new Start Object Behavior Action test case with the given name.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public StartObjectBehaviorActionTest(String name) {
>+		super(name);
>+	}
>+
>+	/**
>+	 * Returns the fixture for this Start Object Behavior Action test case.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected StartObjectBehaviorAction getFixture() {
>+		return (StartObjectBehaviorAction) fixture;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @see junit.framework.TestCase#setUp()
>+	 * @generated
>+	 */
>+	@Override
>+	protected void setUp()
>+			throws Exception {
>+		setFixture(UMLFactory.eINSTANCE.createStartObjectBehaviorAction());
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @see junit.framework.TestCase#tearDown()
>+	 * @generated
>+	 */
>+	@Override
>+	protected void tearDown()
>+			throws Exception {
>+		setFixture(null);
>+	}
>+
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateTypeOfObject(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Type Of Object}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.StartObjectBehaviorAction#validateTypeOfObject(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateTypeOfObject__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateMultiplicityOfObject(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Multiplicity Of Object}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.StartObjectBehaviorAction#validateMultiplicityOfObject(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateMultiplicityOfObject__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateNumberOrderArguments(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Number Order Arguments}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.StartObjectBehaviorAction#validateNumberOrderArguments(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateNumberOrderArguments__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateNumberOrderResults(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Number Order Results}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.StartObjectBehaviorAction#validateNumberOrderResults(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateNumberOrderResults__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+	/**
>+	 * Tests the '{@link org.eclipse.uml2.uml.StartObjectBehaviorAction#validateTypeOrderingMultiplicityMatch(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Validate Type Ordering Multiplicity Match}' operation.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.uml2.uml.StartObjectBehaviorAction#validateTypeOrderingMultiplicityMatch(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
>+	 * @generated
>+	 */
>+	public void testValidateTypeOrderingMultiplicityMatch__DiagnosticChain_Map() {
>+		// TODO: implement this feature getter test method
>+		// Ensure that you remove @generated or mark it @generated NOT
>+	}
>+
>+} //StartObjectBehaviorActionTest
>#P org.eclipse.uml2.uml.edit
>Index: src/org/eclipse/uml2/uml/edit/providers/StateItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/StateItemProvider.java,v
>retrieving revision 1.13
>diff -u -r1.13 StateItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/StateItemProvider.java	1 Feb 2008 14:04:52 -0000	1.13
>+++ src/org/eclipse/uml2/uml/edit/providers/StateItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -73,8 +73,8 @@
> 			addIsLeafPropertyDescriptor(object);
> 			addRedefinedElementPropertyDescriptor(object);
> 			addRedefinitionContextPropertyDescriptor(object);
>-			addIncomingPropertyDescriptor(object);
> 			addOutgoingPropertyDescriptor(object);
>+			addIncomingPropertyDescriptor(object);
> 			addContainerPropertyDescriptor(object);
> 			addIsCompositePropertyDescriptor(object);
> 			addIsOrthogonalPropertyDescriptor(object);
>Index: src/org/eclipse/uml2/uml/edit/providers/TimeExpressionItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/TimeExpressionItemProvider.java,v
>retrieving revision 1.11
>diff -u -r1.11 TimeExpressionItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/TimeExpressionItemProvider.java	1 Feb 2008 14:04:56 -0000	1.11
>+++ src/org/eclipse/uml2/uml/edit/providers/TimeExpressionItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -19,6 +19,7 @@
> import org.eclipse.emf.common.notify.AdapterFactory;
> import org.eclipse.emf.common.notify.Notification;
> 
>+import org.eclipse.emf.ecore.EStructuralFeature;
> import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
> import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
> import org.eclipse.emf.edit.provider.IItemColorProvider;
>@@ -32,6 +33,7 @@
> 
> import org.eclipse.uml2.common.util.UML2Util;
> import org.eclipse.uml2.uml.TimeExpression;
>+import org.eclipse.uml2.uml.UMLFactory;
> import org.eclipse.uml2.uml.UMLPackage;
> 
> /**
>@@ -112,6 +114,37 @@
> 	}
> 
> 	/**
>+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
>+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
>+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Collection<? extends EStructuralFeature> getChildrenFeatures(
>+			Object object) {
>+		if (childrenFeatures == null) {
>+			super.getChildrenFeatures(object);
>+			childrenFeatures.add(UMLPackage.Literals.TIME_EXPRESSION__EXPR);
>+		}
>+		return childrenFeatures;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EStructuralFeature getChildFeature(Object object, Object child) {
>+		// Check the type of the specified child object and return the proper feature to use for
>+		// adding (see {@link AddCommand}) it as a child.
>+
>+		return super.getChildFeature(object, child);
>+	}
>+
>+	/**
> 	 * This returns TimeExpression.gif.
> 	 * 
> 	 * 
>@@ -158,7 +191,7 @@
> 		switch (notification.getFeatureID(TimeExpression.class)) {
> 			case UMLPackage.TIME_EXPRESSION__EXPR :
> 				fireNotifyChanged(new ViewerNotification(notification,
>-					notification.getNotifier(), false, true));
>+					notification.getNotifier(), true, false));
> 				return;
> 		}
> 		super.notifyChanged(notification);
>@@ -175,6 +208,85 @@
> 	protected void collectNewChildDescriptors(
> 			Collection<Object> newChildDescriptors, Object object) {
> 		super.collectNewChildDescriptors(newChildDescriptors, object);
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createOpaqueExpression()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createExpression()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createStringExpression()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createLiteralInteger()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createLiteralString()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createLiteralBoolean()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createLiteralNull()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createInstanceValue()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createLiteralUnlimitedNatural()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createTimeExpression()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createDuration()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createInterval()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createDurationInterval()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.TIME_EXPRESSION__EXPR, UMLFactory.eINSTANCE
>+				.createTimeInterval()));
>+	}
>+
>+	/**
>+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String getCreateChildText(Object owner, Object feature,
>+			Object child, Collection<?> selection) {
>+		Object childFeature = feature;
>+		Object childObject = child;
>+
>+		boolean qualify = childFeature == UMLPackage.Literals.NAMED_ELEMENT__NAME_EXPRESSION
>+			|| childFeature == UMLPackage.Literals.TIME_EXPRESSION__EXPR;
>+
>+		if (qualify) {
>+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
>+				new Object[]{getTypeText(childObject),
>+					getFeatureText(childFeature), getTypeText(owner)});
>+		}
>+		return super.getCreateChildText(owner, feature, child, selection);
> 	}
> 
> }
>\ No newline at end of file
>Index: src/org/eclipse/uml2/uml/edit/providers/WriteStructuralFeatureActionItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/WriteStructuralFeatureActionItemProvider.java,v
>retrieving revision 1.7
>diff -u -r1.7 WriteStructuralFeatureActionItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/WriteStructuralFeatureActionItemProvider.java	1 Feb 2008 14:04:54 -0000	1.7
>+++ src/org/eclipse/uml2/uml/edit/providers/WriteStructuralFeatureActionItemProvider.java	24 Sep 2008 18:40:24 -0000
>@@ -110,6 +110,8 @@
> 			super.getChildrenFeatures(object);
> 			childrenFeatures
> 				.add(UMLPackage.Literals.WRITE_STRUCTURAL_FEATURE_ACTION__VALUE);
>+			childrenFeatures
>+				.add(UMLPackage.Literals.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT);
> 		}
> 		return childrenFeatures;
> 	}
>@@ -154,6 +156,7 @@
> 
> 		switch (notification.getFeatureID(WriteStructuralFeatureAction.class)) {
> 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__VALUE :
>+			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT :
> 				fireNotifyChanged(new ViewerNotification(notification,
> 					notification.getNotifier(), true, false));
> 				return;
>@@ -184,6 +187,10 @@
> 		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.WRITE_STRUCTURAL_FEATURE_ACTION__VALUE,
> 			UMLFactory.eINSTANCE.createActionInputPin()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT,
>+			UMLFactory.eINSTANCE.createOutputPin()));
> 	}
> 
> 	/**
>Index: src/org/eclipse/uml2/uml/edit/providers/DecisionNodeItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/DecisionNodeItemProvider.java,v
>retrieving revision 1.10
>diff -u -r1.10 DecisionNodeItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/DecisionNodeItemProvider.java	1 Feb 2008 14:04:53 -0000	1.10
>+++ src/org/eclipse/uml2/uml/edit/providers/DecisionNodeItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -66,6 +66,7 @@
> 			super.getPropertyDescriptors(object);
> 
> 			addDecisionInputPropertyDescriptor(object);
>+			addDecisionInputFlowPropertyDescriptor(object);
> 		}
> 		return itemPropertyDescriptors;
> 	}
>@@ -90,6 +91,25 @@
> 	}
> 
> 	/**
>+	 * This adds a property descriptor for the Decision Input Flow feature.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected void addDecisionInputFlowPropertyDescriptor(Object object) {
>+		itemPropertyDescriptors
>+			.add(createItemPropertyDescriptor(
>+				((ComposeableAdapterFactory) adapterFactory)
>+					.getRootAdapterFactory(),
>+				getResourceLocator(),
>+				getString("_UI_DecisionNode_decisionInputFlow_feature"), //$NON-NLS-1$
>+				getString(
>+					"_UI_PropertyDescriptor_description", "_UI_DecisionNode_decisionInputFlow_feature", "_UI_DecisionNode_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>+				UMLPackage.Literals.DECISION_NODE__DECISION_INPUT_FLOW, true,
>+				false, true, null, null, null));
>+	}
>+
>+	/**
> 	 * This returns DecisionNode.gif.
> 	 * 
> 	 * 
>Index: src/org/eclipse/uml2/uml/edit/providers/ConnectorEndItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ConnectorEndItemProvider.java,v
>retrieving revision 1.11
>diff -u -r1.11 ConnectorEndItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/ConnectorEndItemProvider.java	1 Feb 2008 14:04:57 -0000	1.11
>+++ src/org/eclipse/uml2/uml/edit/providers/ConnectorEndItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -66,8 +66,8 @@
> 			super.getPropertyDescriptors(object);
> 
> 			addDefiningEndPropertyDescriptor(object);
>-			addPartWithPortPropertyDescriptor(object);
> 			addRolePropertyDescriptor(object);
>+			addPartWithPortPropertyDescriptor(object);
> 		}
> 		return itemPropertyDescriptors;
> 	}
>@@ -88,9 +88,7 @@
> 				getString(
> 					"_UI_PropertyDescriptor_description", "_UI_ConnectorEnd_definingEnd_feature", "_UI_ConnectorEnd_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 				UMLPackage.Literals.CONNECTOR_END__DEFINING_END, false, false,
>-				false, null, null,
>-				new String[]{"org.eclipse.ui.views.properties.expert" //$NON-NLS-1$
>-				}));
>+				false, null, null, null));
> 	}
> 
> 	/**
>Index: src/org/eclipse/uml2/uml/edit/providers/DurationItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/DurationItemProvider.java,v
>retrieving revision 1.11
>diff -u -r1.11 DurationItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/DurationItemProvider.java	1 Feb 2008 14:04:56 -0000	1.11
>+++ src/org/eclipse/uml2/uml/edit/providers/DurationItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -19,6 +19,7 @@
> import org.eclipse.emf.common.notify.AdapterFactory;
> import org.eclipse.emf.common.notify.Notification;
> 
>+import org.eclipse.emf.ecore.EStructuralFeature;
> import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
> import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
> import org.eclipse.emf.edit.provider.IItemColorProvider;
>@@ -32,6 +33,7 @@
> 
> import org.eclipse.uml2.common.util.UML2Util;
> import org.eclipse.uml2.uml.Duration;
>+import org.eclipse.uml2.uml.UMLFactory;
> import org.eclipse.uml2.uml.UMLPackage;
> 
> /**
>@@ -112,6 +114,37 @@
> 	}
> 
> 	/**
>+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
>+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
>+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Collection<? extends EStructuralFeature> getChildrenFeatures(
>+			Object object) {
>+		if (childrenFeatures == null) {
>+			super.getChildrenFeatures(object);
>+			childrenFeatures.add(UMLPackage.Literals.DURATION__EXPR);
>+		}
>+		return childrenFeatures;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EStructuralFeature getChildFeature(Object object, Object child) {
>+		// Check the type of the specified child object and return the proper feature to use for
>+		// adding (see {@link AddCommand}) it as a child.
>+
>+		return super.getChildFeature(object, child);
>+	}
>+
>+	/**
> 	 * This returns Duration.gif.
> 	 * 
> 	 * 
>@@ -158,7 +191,7 @@
> 		switch (notification.getFeatureID(Duration.class)) {
> 			case UMLPackage.DURATION__EXPR :
> 				fireNotifyChanged(new ViewerNotification(notification,
>-					notification.getNotifier(), false, true));
>+					notification.getNotifier(), true, false));
> 				return;
> 		}
> 		super.notifyChanged(notification);
>@@ -175,6 +208,85 @@
> 	protected void collectNewChildDescriptors(
> 			Collection<Object> newChildDescriptors, Object object) {
> 		super.collectNewChildDescriptors(newChildDescriptors, object);
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createOpaqueExpression()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createExpression()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createStringExpression()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createLiteralInteger()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createLiteralString()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createLiteralBoolean()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createLiteralNull()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createInstanceValue()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createLiteralUnlimitedNatural()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createTimeExpression()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createDuration()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createInterval()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createDurationInterval()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.DURATION__EXPR, UMLFactory.eINSTANCE
>+				.createTimeInterval()));
>+	}
>+
>+	/**
>+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String getCreateChildText(Object owner, Object feature,
>+			Object child, Collection<?> selection) {
>+		Object childFeature = feature;
>+		Object childObject = child;
>+
>+		boolean qualify = childFeature == UMLPackage.Literals.NAMED_ELEMENT__NAME_EXPRESSION
>+			|| childFeature == UMLPackage.Literals.DURATION__EXPR;
>+
>+		if (qualify) {
>+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
>+				new Object[]{getTypeText(childObject),
>+					getFeatureText(childFeature), getTypeText(owner)});
>+		}
>+		return super.getCreateChildText(owner, feature, child, selection);
> 	}
> 
> }
>\ No newline at end of file
>Index: src/org/eclipse/uml2/uml/edit/providers/TemplateSignatureItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/TemplateSignatureItemProvider.java,v
>retrieving revision 1.16
>diff -u -r1.16 TemplateSignatureItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/TemplateSignatureItemProvider.java	1 Feb 2008 14:04:54 -0000	1.16
>+++ src/org/eclipse/uml2/uml/edit/providers/TemplateSignatureItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -239,11 +239,11 @@
> 
> 		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.TEMPLATE_SIGNATURE__OWNED_PARAMETER,
>-			UMLFactory.eINSTANCE.createConnectableElementTemplateParameter()));
>+			UMLFactory.eINSTANCE.createOperationTemplateParameter()));
> 
> 		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.TEMPLATE_SIGNATURE__OWNED_PARAMETER,
>-			UMLFactory.eINSTANCE.createOperationTemplateParameter()));
>+			UMLFactory.eINSTANCE.createConnectableElementTemplateParameter()));
> 
> 		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.TEMPLATE_SIGNATURE__OWNED_PARAMETER,
>Index: src/org/eclipse/uml2/uml/edit/providers/VertexItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/VertexItemProvider.java,v
>retrieving revision 1.8
>diff -u -r1.8 VertexItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/VertexItemProvider.java	1 Feb 2008 14:04:51 -0000	1.8
>+++ src/org/eclipse/uml2/uml/edit/providers/VertexItemProvider.java	24 Sep 2008 18:40:24 -0000
>@@ -65,8 +65,8 @@
> 		if (itemPropertyDescriptors == null) {
> 			super.getPropertyDescriptors(object);
> 
>-			addIncomingPropertyDescriptor(object);
> 			addOutgoingPropertyDescriptor(object);
>+			addIncomingPropertyDescriptor(object);
> 			addContainerPropertyDescriptor(object);
> 		}
> 		return itemPropertyDescriptors;
>Index: src/org/eclipse/uml2/uml/edit/providers/ActionInputPinItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ActionInputPinItemProvider.java,v
>retrieving revision 1.16
>diff -u -r1.16 ActionInputPinItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/ActionInputPinItemProvider.java	1 Feb 2008 14:04:50 -0000	1.16
>+++ src/org/eclipse/uml2/uml/edit/providers/ActionInputPinItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -337,6 +337,10 @@
> 
> 		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.ACTION_INPUT_PIN__FROM_ACTION,
>+			UMLFactory.eINSTANCE.createStartObjectBehaviorAction()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.ACTION_INPUT_PIN__FROM_ACTION,
> 			UMLFactory.eINSTANCE.createConditionalNode()));
> 
> 		newChildDescriptors.add(createChildParameter(
>Index: src/org/eclipse/uml2/uml/edit/providers/ComponentRealizationItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ComponentRealizationItemProvider.java,v
>retrieving revision 1.11
>diff -u -r1.11 ComponentRealizationItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/ComponentRealizationItemProvider.java	1 Feb 2008 14:04:50 -0000	1.11
>+++ src/org/eclipse/uml2/uml/edit/providers/ComponentRealizationItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -38,6 +38,7 @@
> 
> import org.eclipse.emf.edit.provider.ViewerNotification;
> 
>+import org.eclipse.uml2.common.edit.command.SubsetAddCommand;
> import org.eclipse.uml2.common.edit.command.SubsetSupersetReplaceCommand;
> import org.eclipse.uml2.common.edit.command.SubsetSupersetSetCommand;
> import org.eclipse.uml2.common.edit.command.SupersetRemoveCommand;
>@@ -154,7 +155,7 @@
> 
> 		return (!UML2Util.isEmpty(label)
> 			? appendString(text, label)
>-			: appendLabel(text, componentRealization.getRealizingClassifier()))
>+			: appendLabel(text, componentRealization.getRealizingClassifiers()))
> 			.toString();
> 	}
> 
>@@ -192,6 +193,27 @@
> 	}
> 
> 	/**
>+	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createAddCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection, int)
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected Command createAddCommand(EditingDomain domain, EObject owner,
>+			EStructuralFeature feature, Collection<?> collection, int index) {
>+		if (feature == UMLPackage.Literals.COMPONENT_REALIZATION__REALIZING_CLASSIFIER) {
>+			return new SubsetAddCommand(
>+				domain,
>+				owner,
>+				feature,
>+				new EStructuralFeature[]{UMLPackage.Literals.DEPENDENCY__SUPPLIER},
>+				collection, index);
>+		}
>+		return super
>+			.createAddCommand(domain, owner, feature, collection, index);
>+	}
>+
>+	/**
> 	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createRemoveCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection)
> 	 * 
> 	 * 
>@@ -228,6 +250,14 @@
> 	@Override
> 	protected Command createReplaceCommand(EditingDomain domain, EObject owner,
> 			EStructuralFeature feature, EObject value, Collection<?> collection) {
>+		if (feature == UMLPackage.Literals.COMPONENT_REALIZATION__REALIZING_CLASSIFIER) {
>+			return new SubsetSupersetReplaceCommand(
>+				domain,
>+				owner,
>+				feature,
>+				new EStructuralFeature[]{UMLPackage.Literals.DEPENDENCY__SUPPLIER},
>+				null, value, collection);
>+		}
> 		if (feature == UMLPackage.Literals.DEPENDENCY__CLIENT) {
> 			return new SubsetSupersetReplaceCommand(
> 				domain,
>@@ -267,27 +297,21 @@
> 				new EStructuralFeature[]{UMLPackage.Literals.DEPENDENCY__CLIENT},
> 				null, value);
> 		}
>-		if (feature == UMLPackage.Literals.COMPONENT_REALIZATION__REALIZING_CLASSIFIER) {
>-			return new SubsetSupersetSetCommand(
>-				domain,
>-				owner,
>-				feature,
>-				new EStructuralFeature[]{UMLPackage.Literals.DEPENDENCY__SUPPLIER},
>-				null, value);
>-		}
> 		return super.createSetCommand(domain, owner, feature, value);
> 	}
> 
> 	@Override
> 	public Object getForeground(Object object) {
>-		ComponentRealization componentRealization = (ComponentRealization) object;
>-		Classifier realizingClassifier = componentRealization
>-			.getRealizingClassifier();
>-		return realizingClassifier != null && realizingClassifier.eIsProxy()
>-			? IItemColorProvider.GRAYED_OUT_COLOR
>-			: (componentRealization.eIsProxy()
>-				? IItemColorProvider.GRAYED_OUT_COLOR
>-				: null);
>+
>+		for (Classifier realizingClassifier : ((ComponentRealization) object)
>+			.getRealizingClassifiers()) {
>+
>+			if (realizingClassifier.eIsProxy()) {
>+				return IItemColorProvider.GRAYED_OUT_COLOR;
>+			}
>+		}
>+
>+		return super.getForeground(object);
> 	}
> 
> }
>\ No newline at end of file
>Index: src/org/eclipse/uml2/uml/edit/providers/InteractionUseItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/InteractionUseItemProvider.java,v
>retrieving revision 1.14
>diff -u -r1.14 InteractionUseItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/InteractionUseItemProvider.java	1 Feb 2008 14:04:50 -0000	1.14
>+++ src/org/eclipse/uml2/uml/edit/providers/InteractionUseItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -386,6 +386,10 @@
> 
> 		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.INTERACTION_USE__ARGUMENT, UMLFactory.eINSTANCE
>+				.createStartObjectBehaviorAction()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.INTERACTION_USE__ARGUMENT, UMLFactory.eINSTANCE
> 				.createConditionalNode()));
> 
> 		newChildDescriptors.add(createChildParameter(
>Index: src/org/eclipse/uml2/uml/edit/providers/TransitionItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/TransitionItemProvider.java,v
>retrieving revision 1.17
>diff -u -r1.17 TransitionItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/TransitionItemProvider.java	1 Feb 2008 14:04:55 -0000	1.17
>+++ src/org/eclipse/uml2/uml/edit/providers/TransitionItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -83,12 +83,12 @@
> 			addRedefinitionContextPropertyDescriptor(object);
> 			addKindPropertyDescriptor(object);
> 			addContainerPropertyDescriptor(object);
>+			addSourcePropertyDescriptor(object);
>+			addTargetPropertyDescriptor(object);
> 			addRedefinedTransitionPropertyDescriptor(object);
> 			addGuardPropertyDescriptor(object);
> 			addEffectPropertyDescriptor(object);
> 			addTriggerPropertyDescriptor(object);
>-			addTargetPropertyDescriptor(object);
>-			addSourcePropertyDescriptor(object);
> 		}
> 		return itemPropertyDescriptors;
> 	}
>Index: src/org/eclipse/uml2/uml/edit/providers/ClearStructuralFeatureActionItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ClearStructuralFeatureActionItemProvider.java,v
>retrieving revision 1.8
>diff -u -r1.8 ClearStructuralFeatureActionItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/ClearStructuralFeatureActionItemProvider.java	1 Feb 2008 14:04:57 -0000	1.8
>+++ src/org/eclipse/uml2/uml/edit/providers/ClearStructuralFeatureActionItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -18,7 +18,7 @@
> 
> import org.eclipse.emf.common.notify.AdapterFactory;
> import org.eclipse.emf.common.notify.Notification;
>-
>+import org.eclipse.emf.ecore.EStructuralFeature;
> import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
> import org.eclipse.emf.edit.provider.IItemColorProvider;
> import org.eclipse.emf.edit.provider.IItemFontProvider;
>@@ -27,8 +27,9 @@
> import org.eclipse.emf.edit.provider.IItemPropertySource;
> import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
> import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
>-
>-//import org.eclipse.uml2.uml.ClearStructuralFeatureAction;
>+import org.eclipse.emf.edit.provider.ViewerNotification;
>+import org.eclipse.uml2.uml.ClearStructuralFeatureAction;
>+import org.eclipse.uml2.uml.UMLFactory;
> import org.eclipse.uml2.uml.UMLPackage;
> 
> /**
>@@ -70,6 +71,38 @@
> 	}
> 
> 	/**
>+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
>+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
>+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Collection<? extends EStructuralFeature> getChildrenFeatures(
>+			Object object) {
>+		if (childrenFeatures == null) {
>+			super.getChildrenFeatures(object);
>+			childrenFeatures
>+				.add(UMLPackage.Literals.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT);
>+		}
>+		return childrenFeatures;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EStructuralFeature getChildFeature(Object object, Object child) {
>+		// Check the type of the specified child object and return the proper feature to use for
>+		// adding (see {@link AddCommand}) it as a child.
>+
>+		return super.getChildFeature(object, child);
>+	}
>+
>+	/**
> 	 * This returns ClearStructuralFeatureAction.gif.
> 	 * 
> 	 * 
>@@ -104,6 +137,13 @@
> 	@Override
> 	public void notifyChanged(Notification notification) {
> 		updateChildren(notification);
>+
>+		switch (notification.getFeatureID(ClearStructuralFeatureAction.class)) {
>+			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT :
>+				fireNotifyChanged(new ViewerNotification(notification,
>+					notification.getNotifier(), true, false));
>+				return;
>+		}
> 		super.notifyChanged(notification);
> 	}
> 
>@@ -118,6 +158,10 @@
> 	protected void collectNewChildDescriptors(
> 			Collection<Object> newChildDescriptors, Object object) {
> 		super.collectNewChildDescriptors(newChildDescriptors, object);
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT,
>+			UMLFactory.eINSTANCE.createOutputPin()));
> 	}
> 
> 	/**
>Index: src/org/eclipse/uml2/uml/edit/providers/TemplateParameterSubstitutionItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/TemplateParameterSubstitutionItemProvider.java,v
>retrieving revision 1.19
>diff -u -r1.19 TemplateParameterSubstitutionItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/TemplateParameterSubstitutionItemProvider.java	1 Feb 2008 14:04:52 -0000	1.19
>+++ src/org/eclipse/uml2/uml/edit/providers/TemplateParameterSubstitutionItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -37,9 +37,7 @@
> import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
> import org.eclipse.emf.edit.provider.ViewerNotification;
> 
>-import org.eclipse.uml2.common.edit.command.SubsetAddCommand;
>-import org.eclipse.uml2.common.edit.command.SubsetSupersetReplaceCommand;
>-import org.eclipse.uml2.common.edit.command.SupersetRemoveCommand;
>+import org.eclipse.uml2.common.edit.command.SubsetSupersetSetCommand;
> import org.eclipse.uml2.uml.TemplateParameterSubstitution;
> import org.eclipse.uml2.uml.UMLFactory;
> import org.eclipse.uml2.uml.UMLPackage;
>@@ -585,74 +583,32 @@
> 	}
> 
> 	/**
>-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createAddCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection, int)
>+	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createSetCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.lang.Object)
> 	 * 
> 	 * 
> 	 * @generated
> 	 */
> 	@Override
>-	protected Command createAddCommand(EditingDomain domain, EObject owner,
>-			EStructuralFeature feature, Collection<?> collection, int index) {
>+	protected Command createSetCommand(EditingDomain domain, EObject owner,
>+			EStructuralFeature feature, Object value) {
> 		if (feature == UMLPackage.Literals.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL) {
>-			return new SubsetAddCommand(
>+			return new SubsetSupersetSetCommand(
> 				domain,
> 				owner,
> 				feature,
> 				new EStructuralFeature[]{UMLPackage.Literals.TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL},
>-				collection, index);
>-		}
>-		return super
>-			.createAddCommand(domain, owner, feature, collection, index);
>-	}
>-
>-	/**
>-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createRemoveCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, java.util.Collection)
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected Command createRemoveCommand(EditingDomain domain, EObject owner,
>-			EStructuralFeature feature, Collection<?> collection) {
>-		if (feature == UMLPackage.Literals.TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL) {
>-			return new SupersetRemoveCommand(
>-				domain,
>-				owner,
>-				feature,
>-				new EStructuralFeature[]{UMLPackage.Literals.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL},
>-				collection);
>-		}
>-		return super.createRemoveCommand(domain, owner, feature, collection);
>-	}
>-
>-	/**
>-	 * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#createReplaceCommand(org.eclipse.emf.edit.domain.EditingDomain, org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.ecore.EObject, java.util.Collection)
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	protected Command createReplaceCommand(EditingDomain domain, EObject owner,
>-			EStructuralFeature feature, EObject value, Collection<?> collection) {
>-		if (feature == UMLPackage.Literals.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL) {
>-			return new SubsetSupersetReplaceCommand(
>-				domain,
>-				owner,
>-				feature,
>-				new EStructuralFeature[]{UMLPackage.Literals.TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL},
>-				null, value, collection);
>+				null, value);
> 		}
> 		if (feature == UMLPackage.Literals.TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL) {
>-			return new SubsetSupersetReplaceCommand(
>+			return new SubsetSupersetSetCommand(
> 				domain,
> 				owner,
> 				feature,
> 				null,
> 				new EStructuralFeature[]{UMLPackage.Literals.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL},
>-				value, collection);
>+				value);
> 		}
>-		return super.createReplaceCommand(domain, owner, feature, value,
>-			collection);
>+		return super.createSetCommand(domain, owner, feature, value);
> 	}
> 
> }
>\ No newline at end of file
>Index: src/org/eclipse/uml2/uml/edit/providers/ClassifierTemplateParameterItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ClassifierTemplateParameterItemProvider.java,v
>retrieving revision 1.9
>diff -u -r1.9 ClassifierTemplateParameterItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/ClassifierTemplateParameterItemProvider.java	1 Feb 2008 14:04:55 -0000	1.9
>+++ src/org/eclipse/uml2/uml/edit/providers/ClassifierTemplateParameterItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -68,7 +68,6 @@
> 			super.getPropertyDescriptors(object);
> 
> 			addAllowSubstitutablePropertyDescriptor(object);
>-			addDefaultClassifierPropertyDescriptor(object);
> 			addConstrainingClassifierPropertyDescriptor(object);
> 		}
> 		return itemPropertyDescriptors;
>@@ -95,25 +94,6 @@
> 	}
> 
> 	/**
>-	 * This adds a property descriptor for the Default Classifier feature.
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected void addDefaultClassifierPropertyDescriptor(Object object) {
>-		itemPropertyDescriptors
>-			.add(createItemPropertyDescriptor(
>-				((ComposeableAdapterFactory) adapterFactory)
>-					.getRootAdapterFactory(),
>-				getResourceLocator(),
>-				getString("_UI_ClassifierTemplateParameter_defaultClassifier_feature"), //$NON-NLS-1$
>-				getString(
>-					"_UI_PropertyDescriptor_description", "_UI_ClassifierTemplateParameter_defaultClassifier_feature", "_UI_ClassifierTemplateParameter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>-				UMLPackage.Literals.CLASSIFIER_TEMPLATE_PARAMETER__DEFAULT_CLASSIFIER,
>-				true, false, true, null, null, null));
>-	}
>-
>-	/**
> 	 * This adds a property descriptor for the Constraining Classifier feature.
> 	 * 
> 	 * 
>Index: src/org/eclipse/uml2/uml/edit/providers/TimeEventItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/TimeEventItemProvider.java,v
>retrieving revision 1.9
>diff -u -r1.9 TimeEventItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/TimeEventItemProvider.java	1 Feb 2008 14:04:50 -0000	1.9
>+++ src/org/eclipse/uml2/uml/edit/providers/TimeEventItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -208,82 +208,7 @@
> 
> 		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
>-				.createOpaqueExpression()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
>-				.createExpression()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
>-				.createStringExpression()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
>-				.createLiteralInteger()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
>-				.createLiteralString()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
>-				.createLiteralBoolean()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
>-				.createLiteralNull()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
>-				.createInstanceValue()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
>-				.createLiteralUnlimitedNatural()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
> 				.createTimeExpression()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
>-				.createDuration()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
>-				.createInterval()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
>-				.createDurationInterval()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TIME_EVENT__WHEN, UMLFactory.eINSTANCE
>-				.createTimeInterval()));
>-	}
>-
>-	/**
>-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public String getCreateChildText(Object owner, Object feature,
>-			Object child, Collection<?> selection) {
>-		Object childFeature = feature;
>-		Object childObject = child;
>-
>-		boolean qualify = childFeature == UMLPackage.Literals.NAMED_ELEMENT__NAME_EXPRESSION
>-			|| childFeature == UMLPackage.Literals.TIME_EVENT__WHEN;
>-
>-		if (qualify) {
>-			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
>-				new Object[]{getTypeText(childObject),
>-					getFeatureText(childFeature), getTypeText(owner)});
>-		}
>-		return super.getCreateChildText(owner, feature, child, selection);
> 	}
> 
> }
>\ No newline at end of file
>Index: src/org/eclipse/uml2/uml/edit/providers/StructuredActivityNodeItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/StructuredActivityNodeItemProvider.java,v
>retrieving revision 1.17
>diff -u -r1.17 StructuredActivityNodeItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/StructuredActivityNodeItemProvider.java	1 Feb 2008 14:04:54 -0000	1.17
>+++ src/org/eclipse/uml2/uml/edit/providers/StructuredActivityNodeItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -754,6 +754,10 @@
> 
> 		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.STRUCTURED_ACTIVITY_NODE__NODE,
>+			UMLFactory.eINSTANCE.createStartObjectBehaviorAction()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.STRUCTURED_ACTIVITY_NODE__NODE,
> 			UMLFactory.eINSTANCE.createJoinNode()));
> 
> 		newChildDescriptors.add(createChildParameter(
>Index: src/org/eclipse/uml2/uml/edit/providers/PropertyItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/PropertyItemProvider.java,v
>retrieving revision 1.20
>diff -u -r1.20 PropertyItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/PropertyItemProvider.java	1 Feb 2008 14:04:57 -0000	1.20
>+++ src/org/eclipse/uml2/uml/edit/providers/PropertyItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -77,7 +77,7 @@
> 	 * This returns the property descriptors for the adapted class.
> 	 * 
> 	 * 
>-	 * @generated NOT
>+	 * @generated
> 	 */
> 	@Override
> 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
>@@ -89,8 +89,6 @@
> 			addEndPropertyDescriptor(object);
> 			addDeploymentPropertyDescriptor(object);
> 			addDeployedElementPropertyDescriptor(object);
>-			//addTemplateBindingPropertyDescriptor(object);
>-			//addOwnedTemplateSignaturePropertyDescriptor(object);
> 			addClassPropertyDescriptor(object);
> 			addDatatypePropertyDescriptor(object);
> 			addIsDerivedPropertyDescriptor(object);
>@@ -212,48 +210,6 @@
> 	}
> 
> 	/**
>-	 * This adds a property descriptor for the Template Binding feature.
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected void addTemplateBindingPropertyDescriptor(Object object) {
>-		itemPropertyDescriptors
>-			.add(createItemPropertyDescriptor(
>-				((ComposeableAdapterFactory) adapterFactory)
>-					.getRootAdapterFactory(),
>-				getResourceLocator(),
>-				getString("_UI_TemplateableElement_templateBinding_feature"), //$NON-NLS-1$
>-				getString(
>-					"_UI_PropertyDescriptor_description", "_UI_TemplateableElement_templateBinding_feature", "_UI_TemplateableElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>-				UMLPackage.Literals.TEMPLATEABLE_ELEMENT__TEMPLATE_BINDING,
>-				true, false, true, null, null,
>-				new String[]{"org.eclipse.ui.views.properties.expert" //$NON-NLS-1$
>-				}));
>-	}
>-
>-	/**
>-	 * This adds a property descriptor for the Owned Template Signature feature.
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	protected void addOwnedTemplateSignaturePropertyDescriptor(Object object) {
>-		itemPropertyDescriptors
>-			.add(createItemPropertyDescriptor(
>-				((ComposeableAdapterFactory) adapterFactory)
>-					.getRootAdapterFactory(),
>-				getResourceLocator(),
>-				getString("_UI_TemplateableElement_ownedTemplateSignature_feature"), //$NON-NLS-1$
>-				getString(
>-					"_UI_PropertyDescriptor_description", "_UI_TemplateableElement_ownedTemplateSignature_feature", "_UI_TemplateableElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>-				UMLPackage.Literals.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE,
>-				true, false, true, null, null,
>-				new String[]{"org.eclipse.ui.views.properties.expert" //$NON-NLS-1$
>-				}));
>-	}
>-
>-	/**
> 	 * This adds a property descriptor for the Class feature.
> 	 * 
> 	 * 
>@@ -667,8 +623,6 @@
> 					notification.getNotifier(), false, true));
> 				return;
> 			case UMLPackage.PROPERTY__DEPLOYMENT :
>-			case UMLPackage.PROPERTY__TEMPLATE_BINDING :
>-			case UMLPackage.PROPERTY__OWNED_TEMPLATE_SIGNATURE :
> 			case UMLPackage.PROPERTY__DEFAULT_VALUE :
> 			case UMLPackage.PROPERTY__QUALIFIER :
> 				fireNotifyChanged(new ViewerNotification(notification,
>@@ -695,18 +649,6 @@
> 			UMLFactory.eINSTANCE.createDeployment()));
> 
> 		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TEMPLATEABLE_ELEMENT__TEMPLATE_BINDING,
>-			UMLFactory.eINSTANCE.createTemplateBinding()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE,
>-			UMLFactory.eINSTANCE.createTemplateSignature()));
>-
>-		newChildDescriptors.add(createChildParameter(
>-			UMLPackage.Literals.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE,
>-			UMLFactory.eINSTANCE.createRedefinableTemplateSignature()));
>-
>-		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.PROPERTY__DEFAULT_VALUE, UMLFactory.eINSTANCE
> 				.createOpaqueExpression()));
> 
>Index: src/org/eclipse/uml2/uml/edit/providers/ActivityItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/ActivityItemProvider.java,v
>retrieving revision 1.21
>diff -u -r1.21 ActivityItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/ActivityItemProvider.java	1 Feb 2008 14:04:56 -0000	1.21
>+++ src/org/eclipse/uml2/uml/edit/providers/ActivityItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -559,6 +559,10 @@
> 
> 		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.ACTIVITY__NODE, UMLFactory.eINSTANCE
>+				.createStartObjectBehaviorAction()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.ACTIVITY__NODE, UMLFactory.eINSTANCE
> 				.createJoinNode()));
> 
> 		newChildDescriptors.add(createChildParameter(
>Index: src/org/eclipse/uml2/uml/edit/providers/RedefinableTemplateSignatureItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/RedefinableTemplateSignatureItemProvider.java,v
>retrieving revision 1.14
>diff -u -r1.14 RedefinableTemplateSignatureItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/RedefinableTemplateSignatureItemProvider.java	1 Feb 2008 14:04:51 -0000	1.14
>+++ src/org/eclipse/uml2/uml/edit/providers/RedefinableTemplateSignatureItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -305,11 +305,11 @@
> 
> 		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.TEMPLATE_SIGNATURE__OWNED_PARAMETER,
>-			UMLFactory.eINSTANCE.createConnectableElementTemplateParameter()));
>+			UMLFactory.eINSTANCE.createOperationTemplateParameter()));
> 
> 		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.TEMPLATE_SIGNATURE__OWNED_PARAMETER,
>-			UMLFactory.eINSTANCE.createOperationTemplateParameter()));
>+			UMLFactory.eINSTANCE.createConnectableElementTemplateParameter()));
> 
> 		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.TEMPLATE_SIGNATURE__OWNED_PARAMETER,
>Index: src/org/eclipse/uml2/uml/edit/providers/InteractionItemProvider.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/InteractionItemProvider.java,v
>retrieving revision 1.18
>diff -u -r1.18 InteractionItemProvider.java
>--- src/org/eclipse/uml2/uml/edit/providers/InteractionItemProvider.java	1 Feb 2008 14:04:54 -0000	1.18
>+++ src/org/eclipse/uml2/uml/edit/providers/InteractionItemProvider.java	24 Sep 2008 18:40:23 -0000
>@@ -582,6 +582,10 @@
> 
> 		newChildDescriptors.add(createChildParameter(
> 			UMLPackage.Literals.INTERACTION__ACTION, UMLFactory.eINSTANCE
>+				.createStartObjectBehaviorAction()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.INTERACTION__ACTION, UMLFactory.eINSTANCE
> 				.createConditionalNode()));
> 
> 		newChildDescriptors.add(createChildParameter(
>Index: src/org/eclipse/uml2/uml/edit/providers/UMLItemProviderAdapterFactory.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/src/org/eclipse/uml2/uml/edit/providers/UMLItemProviderAdapterFactory.java,v
>retrieving revision 1.24
>diff -u -r1.24 UMLItemProviderAdapterFactory.java
>--- src/org/eclipse/uml2/uml/edit/providers/UMLItemProviderAdapterFactory.java	1 Feb 2008 14:04:56 -0000	1.24
>+++ src/org/eclipse/uml2/uml/edit/providers/UMLItemProviderAdapterFactory.java	24 Sep 2008 18:40:24 -0000
>@@ -4100,6 +4100,30 @@
> 	}
> 
> 	/**
>+	 * This keeps track of the one adapter used for all {@link org.eclipse.uml2.uml.StartObjectBehaviorAction} instances.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected StartObjectBehaviorActionItemProvider startObjectBehaviorActionItemProvider;
>+
>+	/**
>+	 * This creates an adapter for a {@link org.eclipse.uml2.uml.StartObjectBehaviorAction}.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Adapter createStartObjectBehaviorActionAdapter() {
>+		if (startObjectBehaviorActionItemProvider == null) {
>+			startObjectBehaviorActionItemProvider = new StartObjectBehaviorActionItemProvider(
>+				this);
>+		}
>+
>+		return startObjectBehaviorActionItemProvider;
>+	}
>+
>+	/**
> 	 * This keeps track of the one adapter used for all {@link org.eclipse.uml2.uml.JoinNode} instances.
> 	 * 
> 	 * 
>@@ -4938,8 +4962,6 @@
> 			opaqueExpressionItemProvider.dispose();
> 		if (parameterItemProvider != null)
> 			parameterItemProvider.dispose();
>-		if (connectableElementTemplateParameterItemProvider != null)
>-			connectableElementTemplateParameterItemProvider.dispose();
> 		if (connectorEndItemProvider != null)
> 			connectorEndItemProvider.dispose();
> 		if (propertyItemProvider != null)
>@@ -5004,6 +5026,8 @@
> 			dataTypeItemProvider.dispose();
> 		if (operationTemplateParameterItemProvider != null)
> 			operationTemplateParameterItemProvider.dispose();
>+		if (connectableElementTemplateParameterItemProvider != null)
>+			connectableElementTemplateParameterItemProvider.dispose();
> 		if (collaborationUseItemProvider != null)
> 			collaborationUseItemProvider.dispose();
> 		if (collaborationItemProvider != null)
>@@ -5156,6 +5180,8 @@
> 			mergeNodeItemProvider.dispose();
> 		if (decisionNodeItemProvider != null)
> 			decisionNodeItemProvider.dispose();
>+		if (objectFlowItemProvider != null)
>+			objectFlowItemProvider.dispose();
> 		if (activityFinalNodeItemProvider != null)
> 			activityFinalNodeItemProvider.dispose();
> 		if (componentRealizationItemProvider != null)
>@@ -5278,12 +5304,12 @@
> 			unmarshallActionItemProvider.dispose();
> 		if (reduceActionItemProvider != null)
> 			reduceActionItemProvider.dispose();
>+		if (startObjectBehaviorActionItemProvider != null)
>+			startObjectBehaviorActionItemProvider.dispose();
> 		if (joinNodeItemProvider != null)
> 			joinNodeItemProvider.dispose();
> 		if (dataStoreNodeItemProvider != null)
> 			dataStoreNodeItemProvider.dispose();
>-		if (objectFlowItemProvider != null)
>-			objectFlowItemProvider.dispose();
> 		if (conditionalNodeItemProvider != null)
> 			conditionalNodeItemProvider.dispose();
> 		if (clauseItemProvider != null)
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/plugin.properties,v
>retrieving revision 1.17
>diff -u -r1.17 plugin.properties
>--- plugin.properties	6 May 2008 21:42:25 -0000	1.17
>+++ plugin.properties	24 Sep 2008 18:40:23 -0000
>@@ -921,3 +921,13 @@
> _UI_ExpansionKind_stream_literal = Stream
> 
> _UI_UML_category = UML
>+_UI_StartObjectBehaviorAction_type = Start Object Behavior Action
>+_UI_DecisionNode_decisionInputFlow_feature = Decision Input Flow
>+_UI_WriteStructuralFeatureAction_result_feature = Result
>+_UI_ClearStructuralFeatureAction_result_feature = Result
>+_UI_StartObjectBehaviorAction_object_feature = Object
>+_UI_StartObjectBehaviorAction_type = Start Object Behavior Action
>+_UI_DecisionNode_decisionInputFlow_feature = Decision Input Flow
>+_UI_WriteStructuralFeatureAction_result_feature = Result
>+_UI_ClearStructuralFeatureAction_result_feature = Result
>+_UI_StartObjectBehaviorAction_object_feature = Object
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/META-INF/MANIFEST.MF,v
>retrieving revision 1.12
>diff -u -r1.12 MANIFEST.MF
>--- META-INF/MANIFEST.MF	21 Feb 2008 18:42:59 -0000	1.12
>+++ META-INF/MANIFEST.MF	24 Sep 2008 18:40:23 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.uml2.uml.edit; singleton:=true
>-Bundle-Version: 2.2.0.qualifier
>+Bundle-Version: 3.0.0.qualifier
> Bundle-ClassPath: .
> Bundle-Activator: org.eclipse.uml2.uml.edit.UMLEditPlugin$Implementation
> Bundle-Vendor: %providerName
>@@ -11,7 +11,7 @@
> Export-Package: org.eclipse.uml2.uml.edit,
> org.eclipse.uml2.uml.edit.providers
> Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
>- org.eclipse.uml2.uml;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
>+ org.eclipse.uml2.uml;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
> org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
> org.eclipse.uml2.common.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
> Eclipse-LazyStart: true
>Index: src/org/eclipse/uml2/uml/edit/providers/StartObjectBehaviorActionItemProvider.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/edit/providers/StartObjectBehaviorActionItemProvider.java
>diff -N src/org/eclipse/uml2/uml/edit/providers/StartObjectBehaviorActionItemProvider.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/edit/providers/StartObjectBehaviorActionItemProvider.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,202 @@
>+/*
>+ * Copyright (c) 2008 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - initial API and implementation
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.uml2.uml.edit.providers;
>+
>+import java.util.Collection;
>+import java.util.List;
>+
>+import org.eclipse.emf.common.notify.AdapterFactory;
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.ecore.EStructuralFeature;
>+
>+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
>+import org.eclipse.emf.edit.provider.IItemColorProvider;
>+import org.eclipse.emf.edit.provider.IItemFontProvider;
>+import org.eclipse.emf.edit.provider.IItemLabelProvider;
>+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
>+import org.eclipse.emf.edit.provider.IItemPropertySource;
>+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
>+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
>+import org.eclipse.emf.edit.provider.ViewerNotification;
>+
>+import org.eclipse.uml2.uml.StartObjectBehaviorAction;
>+import org.eclipse.uml2.uml.UMLFactory;
>+import org.eclipse.uml2.uml.UMLPackage;
>+
>+/**
>+ * This is the item provider adapter for a {@link org.eclipse.uml2.uml.StartObjectBehaviorAction} object.
>+ * 
>+ * 
>+ * @generated
>+ */
>+public class StartObjectBehaviorActionItemProvider
>+		extends CallActionItemProvider
>+		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
>+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
>+		IItemColorProvider, IItemFontProvider {
>+
>+	/**
>+	 * This constructs an instance from a factory and a notifier.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public StartObjectBehaviorActionItemProvider(AdapterFactory adapterFactory) {
>+		super(adapterFactory);
>+	}
>+
>+	/**
>+	 * This returns the property descriptors for the adapted class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
>+		if (itemPropertyDescriptors == null) {
>+			super.getPropertyDescriptors(object);
>+
>+		}
>+		return itemPropertyDescriptors;
>+	}
>+
>+	/**
>+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
>+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
>+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Collection<? extends EStructuralFeature> getChildrenFeatures(
>+			Object object) {
>+		if (childrenFeatures == null) {
>+			super.getChildrenFeatures(object);
>+			childrenFeatures
>+				.add(UMLPackage.Literals.START_OBJECT_BEHAVIOR_ACTION__OBJECT);
>+		}
>+		return childrenFeatures;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EStructuralFeature getChildFeature(Object object, Object child) {
>+		// Check the type of the specified child object and return the proper feature to use for
>+		// adding (see {@link AddCommand}) it as a child.
>+
>+		return super.getChildFeature(object, child);
>+	}
>+
>+	/**
>+	 * This returns StartObjectBehaviorAction.gif.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object getImage(Object object) {
>+		return overlayImage(object, getResourceLocator().getImage(
>+			"full/obj16/StartObjectBehaviorAction")); //$NON-NLS-1$
>+	}
>+
>+	/**
>+	 * This returns the label text for the adapted class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String getText(Object object) {
>+		String label = ((StartObjectBehaviorAction) object).getName();
>+		return label == null || label.length() == 0
>+			? getString("_UI_StartObjectBehaviorAction_type") : //$NON-NLS-1$
>+			getString("_UI_StartObjectBehaviorAction_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
>+	}
>+
>+	/**
>+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
>+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void notifyChanged(Notification notification) {
>+		updateChildren(notification);
>+
>+		switch (notification.getFeatureID(StartObjectBehaviorAction.class)) {
>+			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT :
>+				fireNotifyChanged(new ViewerNotification(notification,
>+					notification.getNotifier(), true, false));
>+				return;
>+		}
>+		super.notifyChanged(notification);
>+	}
>+
>+	/**
>+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
>+	 * that can be created under this object.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected void collectNewChildDescriptors(
>+			Collection<Object> newChildDescriptors, Object object) {
>+		super.collectNewChildDescriptors(newChildDescriptors, object);
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.START_OBJECT_BEHAVIOR_ACTION__OBJECT,
>+			UMLFactory.eINSTANCE.createInputPin()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.START_OBJECT_BEHAVIOR_ACTION__OBJECT,
>+			UMLFactory.eINSTANCE.createValuePin()));
>+
>+		newChildDescriptors.add(createChildParameter(
>+			UMLPackage.Literals.START_OBJECT_BEHAVIOR_ACTION__OBJECT,
>+			UMLFactory.eINSTANCE.createActionInputPin()));
>+	}
>+
>+	/**
>+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String getCreateChildText(Object owner, Object feature,
>+			Object child, Collection<?> selection) {
>+		Object childFeature = feature;
>+		Object childObject = child;
>+
>+		boolean qualify = childFeature == UMLPackage.Literals.ACTION__LOCAL_PRECONDITION
>+			|| childFeature == UMLPackage.Literals.ACTION__LOCAL_POSTCONDITION
>+			|| childFeature == UMLPackage.Literals.INVOCATION_ACTION__ARGUMENT
>+			|| childFeature == UMLPackage.Literals.START_OBJECT_BEHAVIOR_ACTION__OBJECT;
>+
>+		if (qualify) {
>+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
>+				new Object[]{getTypeText(childObject),
>+					getFeatureText(childFeature), getTypeText(owner)});
>+		}
>+		return super.getCreateChildText(owner, feature, child, selection);
>+	}
>+
>+}

Actions: View | Diff

Attachments on bug 232332: 102055 | 107831 | 108973 | 109782 | 110039 | 110408 | 110493 | 110602 | 110612 | 110614 | 110686 | 110687 | 111318 | 112701 | 112702 | 113401 | 113403 | 113416 | 113623 | 113916 | 114095