[485756] Adding support for (re)applying multiple profiles at once.
diff --git a/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF
index d1e0e92..3eebe9b 100644
--- a/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.uml.editor; singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 5.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.uml2.uml.editor.UMLEditorPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/actions/ApplyProfileAction.java b/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/actions/ApplyProfileAction.java
index 211f9f9..baa3bfc 100644
--- a/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/actions/ApplyProfileAction.java
+++ b/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/actions/ApplyProfileAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -10,6 +10,7 @@
  *   Kenn Hussey (Embarcadero Technologies) - 215488
  *   Kenn Hussey - 286329
  *   Christian W. Damus (CEA) - 326915
+ *   Kenn Hussey (CEA) - 485756
  *
  */
 package org.eclipse.uml2.uml.editor.actions;
@@ -159,10 +160,7 @@
 					new RefreshingChangeCommand(editingDomain, new Runnable() {
 
 						public void run() {
-
-							for (Profile result : dialog.getResult()) {
-								package_.applyProfile(result);
-							}
+							package_.applyProfiles(dialog.getResult());
 						}
 					}, label));
 			}
diff --git a/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF
index dcdca6a..ec5a891 100644
--- a/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.uml.resources; singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 5.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.uml2.uml.resources/metamodels/UML.metamodel.properties b/plugins/org.eclipse.uml2.uml.resources/metamodels/UML.metamodel.properties
index 3b9e1fc..8916957 100644
--- a/plugins/org.eclipse.uml2.uml.resources/metamodels/UML.metamodel.properties
+++ b/plugins/org.eclipse.uml2.uml.resources/metamodels/UML.metamodel.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2014 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# Copyright (c) 2006, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -7,7 +7,7 @@
 # Contributors: 
 #   IBM - initial API and implementation
 #   Kenn Hussey (Embarcadero Technologies) - 205188, 226397
-#   Kenn Hussey (CEA) - 327039, 351774, 381237, 297216, 418466
+#   Kenn Hussey (CEA) - 327039, 351774, 381237, 297216, 418466, 485756
 #
 
 # NLS_MESSAGEFORMAT_VAR
@@ -1179,6 +1179,8 @@
 _label_UML__Package__isProfileApplied__profile = Profile
 _label_UML__Package__unapplyProfile = Unapply Profile
 _label_UML__Package__unapplyProfile__profile = Profile
+_label_UML__Package__applyProfiles = Apply Profiles
+_label_UML__Package__applyProfiles__profiles = Profiles
 _label_UML__Package__allApplicableStereotypes = All Applicable Stereotypes
 _label_UML__Package__allApplicableStereotypes__result = Result
 _label_UML__Package__containingProfile = Containing Profile
diff --git a/plugins/org.eclipse.uml2.uml.resources/metamodels/UML.metamodel.uml b/plugins/org.eclipse.uml2.uml.resources/metamodels/UML.metamodel.uml
index b5ce683..94d52e8 100644
--- a/plugins/org.eclipse.uml2.uml.resources/metamodels/UML.metamodel.uml
+++ b/plugins/org.eclipse.uml2.uml.resources/metamodels/UML.metamodel.uml
@@ -12614,6 +12614,22 @@
           </ownedComment>
         </ownedParameter>
       </ownedOperation>
+      <ownedOperation xmi:id="Package-applyProfiles" name="applyProfiles">
+        <ownedComment xmi:id="Package-applyProfiles-_ownedComment.0" annotatedElement="Package-applyProfiles">
+          <body>Applies the current definitions of the specified profiles to this package and automatically applies required stereotypes in the profiles to elements within this package's namespace hieararchy. If different definitions are already applied, automatically migrates any associated stereotype values on a &quot;best effort&quot; basis (matching classifiers and structural features by name).</body>
+        </ownedComment>
+        <ownedParameter xmi:id="Package-applyProfiles-_ownedParameter.0" direction="return">
+          <type xmi:type="uml:Class" href="Ecore.metamodel.uml#EObject"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Package-applyProfiles-_ownedParameter.0-_lowerValue"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Package-applyProfiles-_ownedParameter.0-_upperValue" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:id="Package-applyProfiles-profiles" name="profiles" type="Profile" effect="read">
+          <ownedComment xmi:id="Package-applyProfiles-profiles-_ownedComment.0" annotatedElement="Package-applyProfiles-profiles">
+            <body>The profiles to apply.</body>
+          </ownedComment>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Package-applyProfiles-profiles-_upperValue" value="*"/>
+        </ownedParameter>
+      </ownedOperation>
       <ownedOperation xmi:id="Package-allApplicableStereotypes" name="allApplicableStereotypes" bodyCondition="Package-allApplicableStereotypes-spec" isQuery="true">
         <ownedComment xmi:id="Package-allApplicableStereotypes-_ownedComment.0" annotatedElement="Package-allApplicableStereotypes">
           <body>The query allApplicableStereotypes() returns all the directly or indirectly owned stereotypes, including stereotypes contained in sub-profiles.</body>
diff --git a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
index f502d81..d3ee58f 100644
--- a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.uml; singleton:=true
-Bundle-Version: 5.1.100.qualifier
+Bundle-Version: 5.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.uml2.uml.UMLPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.uml2.uml/about.properties b/plugins/org.eclipse.uml2.uml/about.properties
index c2cce38..77b0820 100644
--- a/plugins/org.eclipse.uml2.uml/about.properties
+++ b/plugins/org.eclipse.uml2.uml/about.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# Copyright (c) 2006, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
 #   Kenn Hussey (Embarcadero Technologies) - 219804, 204200
 #   Kenn Hussey - 323181
 #   Christian W. Damus (CEA) - 227616
-#   Kenn Hussey (CEA) - 227616, 454864
+#   Kenn Hussey (CEA) - 227616, 454864, 485756
 #
 
 # NLS_MESSAGEFORMAT_VAR
@@ -25,5 +25,5 @@
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others 2003, 2015.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2003, 2016.  All rights reserved.\n\
 Visit http://www.eclipse.org/uml2
diff --git a/plugins/org.eclipse.uml2.uml/model/UML.ecore b/plugins/org.eclipse.uml2.uml/model/UML.ecore
index ee33ded..49b3afe 100644
--- a/plugins/org.eclipse.uml2.uml/model/UML.ecore
+++ b/plugins/org.eclipse.uml2.uml/model/UML.ecore
@@ -2212,6 +2212,17 @@
         </eAnnotations>
       </eParameters>
     </eOperations>
+    <eOperations name="applyProfiles" ordered="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Applies the current definitions of the specified profiles to this package and automatically applies required stereotypes in the profiles to elements within this package's namespace hieararchy. If different definitions are already applied, automatically migrates any associated stereotype values on a &quot;best effort&quot; basis (matching classifiers and structural features by name)."/>
+      </eAnnotations>
+      <eParameters name="profiles" ordered="false" lowerBound="1" upperBound="-1"
+          eType="#//Profile">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The profiles to apply."/>
+        </eAnnotations>
+      </eParameters>
+    </eOperations>
     <eOperations name="allApplicableStereotypes" ordered="false" upperBound="-1" eType="#//Stereotype">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The query allApplicableStereotypes() returns all the directly or indirectly owned stereotypes, including stereotypes contained in sub-profiles.&#xA;result = (let ownedPackages : Bag(Package) = ownedMember->select(oclIsKindOf(Package))->collect(oclAsType(Package)) in&#xD;&#xA; ownedStereotype->union(ownedPackages.allApplicableStereotypes())->flatten()->asSet()&#xD;&#xA;)&#xA;&lt;p>From package UML::Packages.&lt;/p>"/>
diff --git a/plugins/org.eclipse.uml2.uml/model/UML.genmodel b/plugins/org.eclipse.uml2.uml/model/UML.genmodel
index 4352a28..e9f282e 100644
--- a/plugins/org.eclipse.uml2.uml/model/UML.genmodel
+++ b/plugins/org.eclipse.uml2.uml/model/UML.genmodel
@@ -803,6 +803,9 @@
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Package/unapplyProfile">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Package/unapplyProfile/profile"/>
       </genOperations>
+      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Package/applyProfiles">
+        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UML.ecore#//Package/applyProfiles/profiles"/>
+      </genOperations>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Package/allApplicableStereotypes"
           cacheAdapterScope="Global"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UML.ecore#//Package/containingProfile"/>
diff --git a/plugins/org.eclipse.uml2.uml/model/UML.merged.uml b/plugins/org.eclipse.uml2.uml/model/UML.merged.uml
index 22c2fec..7e975fd 100644
--- a/plugins/org.eclipse.uml2.uml/model/UML.merged.uml
+++ b/plugins/org.eclipse.uml2.uml/model/UML.merged.uml
@@ -12614,6 +12614,22 @@
           </ownedComment>
         </ownedParameter>
       </ownedOperation>
+      <ownedOperation xmi:id="_WTAl8L4QEeWYh4Gu_uAtYw" name="applyProfiles">
+        <ownedComment xmi:id="_WTAl8b4QEeWYh4Gu_uAtYw" annotatedElement="_WTAl8L4QEeWYh4Gu_uAtYw">
+          <body>Applies the current definitions of the specified profiles to this package and automatically applies required stereotypes in the profiles to elements within this package's namespace hieararchy. If different definitions are already applied, automatically migrates any associated stereotype values on a &quot;best effort&quot; basis (matching classifiers and structural features by name).</body>
+        </ownedComment>
+        <ownedParameter xmi:id="_WTAl8r4QEeWYh4Gu_uAtYw" direction="return">
+          <type xmi:type="uml:Class" href="Ecore.uml#_SeWijsX_EduPJbEsMYXjUQ"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WTAl874QEeWYh4Gu_uAtYw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WTAl9L4QEeWYh4Gu_uAtYw" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:id="_WTAl9b4QEeWYh4Gu_uAtYw" name="profiles" type="__pew8GvzEdq7X4sGURiZYA" effect="read">
+          <ownedComment xmi:id="_WTAl9r4QEeWYh4Gu_uAtYw" annotatedElement="_WTAl9b4QEeWYh4Gu_uAtYw">
+            <body>The profiles to apply.</body>
+          </ownedComment>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lb-wML4QEeWYh4Gu_uAtYw" value="*"/>
+        </ownedParameter>
+      </ownedOperation>
       <ownedOperation xmi:id="_MOILEIkxEeOMQ5AKLd10lA" name="allApplicableStereotypes" bodyCondition="_MOILEokxEeOMQ5AKLd10lA" isQuery="true">
         <ownedComment xmi:id="_MOILEYkxEeOMQ5AKLd10lA" annotatedElement="_MOILEIkxEeOMQ5AKLd10lA">
           <body>The query allApplicableStereotypes() returns all the directly or indirectly owned stereotypes, including stereotypes contained in sub-profiles.</body>
diff --git a/plugins/org.eclipse.uml2.uml/model/UML.uml b/plugins/org.eclipse.uml2.uml/model/UML.uml
index f895cad..1ada998 100644
--- a/plugins/org.eclipse.uml2.uml/model/UML.uml
+++ b/plugins/org.eclipse.uml2.uml/model/UML.uml
@@ -1963,6 +1963,22 @@
           </ownedComment>
         </ownedParameter>
       </ownedOperation>
+      <ownedOperation xmi:id="_WTAl8L4QEeWYh4Gu_uAtYw" name="applyProfiles">
+        <ownedComment xmi:id="_WTAl8b4QEeWYh4Gu_uAtYw" annotatedElement="_WTAl8L4QEeWYh4Gu_uAtYw">
+          <body>Applies the current definitions of the specified profiles to this package and automatically applies required stereotypes in the profiles to elements within this package's namespace hieararchy. If different definitions are already applied, automatically migrates any associated stereotype values on a &quot;best effort&quot; basis (matching classifiers and structural features by name).</body>
+        </ownedComment>
+        <ownedParameter xmi:id="_WTAl8r4QEeWYh4Gu_uAtYw" direction="return">
+          <type xmi:type="uml:Class" href="Ecore.uml#_SeWijsX_EduPJbEsMYXjUQ"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WTAl874QEeWYh4Gu_uAtYw"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WTAl9L4QEeWYh4Gu_uAtYw" value="*"/>
+        </ownedParameter>
+        <ownedParameter xmi:id="_WTAl9b4QEeWYh4Gu_uAtYw" name="profiles" type="__pew8GvzEdq7X4sGURiZYA" effect="read">
+          <ownedComment xmi:id="_WTAl9r4QEeWYh4Gu_uAtYw" annotatedElement="_WTAl9b4QEeWYh4Gu_uAtYw">
+            <body>The profiles to apply.</body>
+          </ownedComment>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lb-wML4QEeWYh4Gu_uAtYw" value="*"/>
+        </ownedParameter>
+      </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_SnNPIGwIEdq7X4sGURiZYA" name="PackageImport"/>
     <packagedElement xmi:type="uml:Class" xmi:id="_jKxnwGwLEdq7X4sGURiZYA" name="PackageableElement" isAbstract="true">
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Action.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Action.java
index 6e792eb..4be60ae 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Action.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Action.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188
- *   Kenn Hussey (CEA) - 327039, 351774, 418466
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 485756
  *   Christian W. Damus (CEA) - 251963, 451350
  *
  */
@@ -185,7 +185,8 @@
 	 * @see #getInputs()
 	 * @generated
 	 */
-	InputPin getInput(String name, Type type, boolean ignoreCase, EClass eClass);
+	InputPin getInput(String name, Type type, boolean ignoreCase,
+			EClass eClass);
 
 	/**
 	 * Returns the value of the '<em><b>Is Locally Reentrant</b></em>' attribute.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityEdge.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityEdge.java
index 5a4185c..58ae7c7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityEdge.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityEdge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -286,7 +286,8 @@
 	 * @see #getRedefinedEdges()
 	 * @generated
 	 */
-	ActivityEdge getRedefinedEdge(String name, boolean ignoreCase, EClass eClass);
+	ActivityEdge getRedefinedEdge(String name, boolean ignoreCase,
+			EClass eClass);
 
 	/**
 	 * Returns the value of the '<em><b>Guard</b></em>' containment reference.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityGroup.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityGroup.java
index ac37bca..0ca24dd 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityGroup.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -164,7 +164,8 @@
 	 * @see #getContainedNodes()
 	 * @generated
 	 */
-	ActivityNode getContainedNode(String name, boolean ignoreCase, EClass eClass);
+	ActivityNode getContainedNode(String name, boolean ignoreCase,
+			EClass eClass);
 
 	/**
 	 * Returns the value of the '<em><b>In Activity</b></em>' reference.
@@ -241,7 +242,8 @@
 	 * @see #getContainedEdges()
 	 * @generated
 	 */
-	ActivityEdge getContainedEdge(String name, boolean ignoreCase, EClass eClass);
+	ActivityEdge getContainedEdge(String name, boolean ignoreCase,
+			EClass eClass);
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityNode.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityNode.java
index 8172bb8..887de94 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityNode.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ActivityNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -384,6 +384,7 @@
 	 * @see #getRedefinedNodes()
 	 * @generated
 	 */
-	ActivityNode getRedefinedNode(String name, boolean ignoreCase, EClass eClass);
+	ActivityNode getRedefinedNode(String name, boolean ignoreCase,
+			EClass eClass);
 
 } // ActivityNode
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/AggregationKind.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/AggregationKind.java
index 73a0736..3245cba 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/AggregationKind.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/AggregationKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Christian W. Damus (CEA) - 251963
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml;
@@ -33,7 +33,7 @@
  * @generated
  */
 public enum AggregationKind
-		implements Enumerator {
+	implements Enumerator {
 	/**
 	 * The '<em><b>None</b></em>' literal object.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Behavior.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Behavior.java
index 05939f5..15647d4 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Behavior.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Behavior.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 383550, 386251, 418466
+ *   Kenn Hussey (CEA) - 327039, 383550, 386251, 418466, 485756
  *   Christian W. Damus (CEA) - 251963, 451350
  *
  */
@@ -150,7 +150,8 @@
 	 * @see #getRedefinedBehaviors()
 	 * @generated
 	 */
-	Behavior getRedefinedBehavior(String name, boolean ignoreCase, EClass eClass);
+	Behavior getRedefinedBehavior(String name, boolean ignoreCase,
+			EClass eClass);
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/BehavioredClassifier.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/BehavioredClassifier.java
index 4101519..e386755 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/BehavioredClassifier.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/BehavioredClassifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -198,7 +198,8 @@
 	 * @see #getInterfaceRealizations()
 	 * @generated
 	 */
-	InterfaceRealization getInterfaceRealization(String name, Interface contract);
+	InterfaceRealization getInterfaceRealization(String name,
+			Interface contract);
 
 	/**
 	 * Retrieves the first {@link org.eclipse.uml2.uml.InterfaceRealization} with the specified '<em><b>Name</b></em>', and '<em><b>Contract</b></em>' from the '<em><b>Interface Realization</b></em>' containment reference list.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/CallConcurrencyKind.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/CallConcurrencyKind.java
index 29c89f3..0d09f50 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/CallConcurrencyKind.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/CallConcurrencyKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Christian W. Damus (CEA) - 251963
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml;
@@ -33,7 +33,7 @@
  * @generated
  */
 public enum CallConcurrencyKind
-		implements Enumerator {
+	implements Enumerator {
 	/**
 	 * The '<em><b>Sequential</b></em>' literal object.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Classifier.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Classifier.java
index 2b89cdd..a8590f3 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Classifier.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Classifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188
- *   Kenn Hussey (CEA) - 327039, 351774, 384071, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 384071, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -769,7 +769,8 @@
 	 * @see #getGeneralizations()
 	 * @generated
 	 */
-	Generalization getGeneralization(Classifier general, boolean createOnDemand);
+	Generalization getGeneralization(Classifier general,
+			boolean createOnDemand);
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Component.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Component.java
index 9913852..fc673a1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Component.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Component.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 351777, 382718, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 351777, 382718, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -313,7 +313,8 @@
 	 * @model required="true" ordered="false" nameDataType="org.eclipse.uml2.types.String" nameRequired="true" nameOrdered="false" isAbstractDataType="org.eclipse.uml2.types.Boolean" isAbstractRequired="true" isAbstractOrdered="false"
 	 * @generated
 	 */
-	org.eclipse.uml2.uml.Class createOwnedClass(String name, boolean isAbstract);
+	org.eclipse.uml2.uml.Class createOwnedClass(String name,
+			boolean isAbstract);
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ConnectorKind.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ConnectorKind.java
index f908bb5..a599c32 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ConnectorKind.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ConnectorKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Christian W. Damus (CEA) - 251963
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml;
@@ -33,7 +33,7 @@
  * @generated
  */
 public enum ConnectorKind
-		implements Enumerator {
+	implements Enumerator {
 	/**
 	 * The '<em><b>Assembly</b></em>' literal object.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Constraint.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Constraint.java
index 12da193..9bcb06d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Constraint.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Constraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -106,7 +106,8 @@
 	 * @see #getSpecification()
 	 * @generated
 	 */
-	ValueSpecification createSpecification(String name, Type type, EClass eClass);
+	ValueSpecification createSpecification(String name, Type type,
+			EClass eClass);
 
 	/**
 	 * Returns the value of the '<em><b>Context</b></em>' container reference.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DecisionNode.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DecisionNode.java
index aff880e..decd205 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DecisionNode.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DecisionNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Christian W. Damus (CEA) - 251963
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml;
@@ -191,8 +191,8 @@
 	 * @model
 	 * @generated
 	 */
-	boolean validateIncomingObjectOneInputParameter(
-			DiagnosticChain diagnostics, Map<Object, Object> context);
+	boolean validateIncomingObjectOneInputParameter(DiagnosticChain diagnostics,
+			Map<Object, Object> context);
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DestructionOccurrenceSpecification.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DestructionOccurrenceSpecification.java
index ff625d7..0293f92 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DestructionOccurrenceSpecification.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/DestructionOccurrenceSpecification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014 CEA and others.
+ * Copyright (c) 2011, 2016 CEA 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
  *   Christian W. Damus (CEA) - 251963
- *   Kenn Hussey (CEA) - 418466
+ *   Kenn Hussey (CEA) - 418466, 485756
  *
  */
 package org.eclipse.uml2.uml;
@@ -49,7 +49,7 @@
 	 * @model
 	 * @generated
 	 */
-	boolean validateNoOccurrenceSpecificationsBelow(
-			DiagnosticChain diagnostics, Map<Object, Object> context);
+	boolean validateNoOccurrenceSpecificationsBelow(DiagnosticChain diagnostics,
+			Map<Object, Object> context);
 
 } // DestructionOccurrenceSpecification
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ExpansionKind.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ExpansionKind.java
index 91a9c6d..ee7135a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ExpansionKind.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ExpansionKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Christian W. Damus (CEA) - 251963
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml;
@@ -33,7 +33,7 @@
  * @generated
  */
 public enum ExpansionKind
-		implements Enumerator {
+	implements Enumerator {
 	/**
 	 * The '<em><b>Parallel</b></em>' literal object.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/InstanceSpecification.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/InstanceSpecification.java
index 41c3243..f1a5ef0 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/InstanceSpecification.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/InstanceSpecification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 351774, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -130,7 +130,8 @@
 	 * @see #getSpecification()
 	 * @generated
 	 */
-	ValueSpecification createSpecification(String name, Type type, EClass eClass);
+	ValueSpecification createSpecification(String name, Type type,
+			EClass eClass);
 
 	/**
 	 * Returns the value of the '<em><b>Slot</b></em>' containment reference list.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Interaction.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Interaction.java
index 0023917..9894dab 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Interaction.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Interaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -104,7 +104,8 @@
 	 * @see #getLifelines()
 	 * @generated
 	 */
-	Lifeline getLifeline(String name, boolean ignoreCase, boolean createOnDemand);
+	Lifeline getLifeline(String name, boolean ignoreCase,
+			boolean createOnDemand);
 
 	/**
 	 * Returns the value of the '<em><b>Fragment</b></em>' containment reference list.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/InteractionOperatorKind.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/InteractionOperatorKind.java
index eb5af7f..11a1e6e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/InteractionOperatorKind.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/InteractionOperatorKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Christian W. Damus (CEA) - 251963
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml;
@@ -33,7 +33,7 @@
  * @generated
  */
 public enum InteractionOperatorKind
-		implements Enumerator {
+	implements Enumerator {
 	/**
 	 * The '<em><b>Seq</b></em>' literal object.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/InteractionUse.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/InteractionUse.java
index 47d4956..42998b1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/InteractionUse.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/InteractionUse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -323,8 +323,8 @@
 	 * @model
 	 * @generated
 	 */
-	boolean validateArgumentsCorrespondToParameters(
-			DiagnosticChain diagnostics, Map<Object, Object> context);
+	boolean validateArgumentsCorrespondToParameters(DiagnosticChain diagnostics,
+			Map<Object, Object> context);
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/MessageKind.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/MessageKind.java
index 6b8dcb6..d09f9ff 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/MessageKind.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/MessageKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Christian W. Damus (CEA) - 251963
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml;
@@ -33,7 +33,7 @@
  * @generated
  */
 public enum MessageKind
-		implements Enumerator {
+	implements Enumerator {
 	/**
 	 * The '<em><b>Complete</b></em>' literal object.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/MessageSort.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/MessageSort.java
index 5616f56..75fa52f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/MessageSort.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/MessageSort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -33,7 +33,7 @@
  * @generated
  */
 public enum MessageSort
-		implements Enumerator {
+	implements Enumerator {
 	/**
 	 * The '<em><b>Synch Call</b></em>' literal object.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/MultiplicityElement.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/MultiplicityElement.java
index d369a9d..9a8a740 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/MultiplicityElement.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/MultiplicityElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -287,8 +287,8 @@
 	 * @model
 	 * @generated
 	 */
-	boolean validateValueSpecificationNoSideEffects(
-			DiagnosticChain diagnostics, Map<Object, Object> context);
+	boolean validateValueSpecificationNoSideEffects(DiagnosticChain diagnostics,
+			Map<Object, Object> context);
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Namespace.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Namespace.java
index fa069a4..43262e9 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Namespace.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Namespace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -155,7 +155,8 @@
 	 * @see #getPackageImports()
 	 * @generated
 	 */
-	PackageImport getPackageImport(org.eclipse.uml2.uml.Package importedPackage);
+	PackageImport getPackageImport(
+			org.eclipse.uml2.uml.Package importedPackage);
 
 	/**
 	 * Retrieves the first {@link org.eclipse.uml2.uml.PackageImport} with the specified '<em><b>Imported Package</b></em>' from the '<em><b>Package Import</b></em>' containment reference list.
@@ -167,8 +168,8 @@
 	 * @see #getPackageImports()
 	 * @generated
 	 */
-	PackageImport getPackageImport(
-			org.eclipse.uml2.uml.Package importedPackage, boolean createOnDemand);
+	PackageImport getPackageImport(org.eclipse.uml2.uml.Package importedPackage,
+			boolean createOnDemand);
 
 	/**
 	 * Returns the value of the '<em><b>Owned Rule</b></em>' containment reference list.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ObjectNodeOrderingKind.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ObjectNodeOrderingKind.java
index a40cd2c..ee998a0 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ObjectNodeOrderingKind.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ObjectNodeOrderingKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Christian W. Damus (CEA) - 251963
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml;
@@ -33,7 +33,7 @@
  * @generated
  */
 public enum ObjectNodeOrderingKind
-		implements Enumerator {
+	implements Enumerator {
 	/**
 	 * The '<em><b>Unordered</b></em>' literal object.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Package.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Package.java
index 25b49c9..6ad7428 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Package.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Package.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -473,7 +473,8 @@
 	 * @model required="true" ordered="false" nameDataType="org.eclipse.uml2.types.String" nameRequired="true" nameOrdered="false" isAbstractDataType="org.eclipse.uml2.types.Boolean" isAbstractRequired="true" isAbstractOrdered="false"
 	 * @generated
 	 */
-	org.eclipse.uml2.uml.Class createOwnedClass(String name, boolean isAbstract);
+	org.eclipse.uml2.uml.Class createOwnedClass(String name,
+			boolean isAbstract);
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -552,6 +553,18 @@
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
+	 * Applies the current definitions of the specified profiles to this package and automatically applies required stereotypes in the profiles to elements within this package's namespace hieararchy. If different definitions are already applied, automatically migrates any associated stereotype values on a "best effort" basis (matching classifiers and structural features by name).
+	 * @param profiles The profiles to apply.
+	 * <!-- end-model-doc -->
+	 * @model ordered="false" profilesRequired="true" profilesMany="true" profilesOrdered="false"
+	 * @generated
+	 */
+	EList<EObject> applyProfiles(EList<Profile> profiles);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
 	 * The query allApplicableStereotypes() returns all the directly or indirectly owned stereotypes, including stereotypes contained in sub-profiles.
 	 * result = (let ownedPackages : Bag(Package) = ownedMember->select(oclIsKindOf(Package))->collect(oclAsType(Package)) in
 	 *  ownedStereotype->union(ownedPackages.allApplicableStereotypes())->flatten()->asSet()
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Parameter.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Parameter.java
index b9cd2fe..41b11f8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Parameter.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Parameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -240,7 +240,8 @@
 	 * @see #getDefaultValue()
 	 * @generated
 	 */
-	ValueSpecification createDefaultValue(String name, Type type, EClass eClass);
+	ValueSpecification createDefaultValue(String name, Type type,
+			EClass eClass);
 
 	/**
 	 * Returns the value of the '<em><b>Is Exception</b></em>' attribute.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ParameterDirectionKind.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ParameterDirectionKind.java
index 3d84a0e..6a904f6 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ParameterDirectionKind.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ParameterDirectionKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Christian W. Damus (CEA) - 251963
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml;
@@ -33,7 +33,7 @@
  * @generated
  */
 public enum ParameterDirectionKind
-		implements Enumerator {
+	implements Enumerator {
 	/**
 	 * The '<em><b>In</b></em>' literal object.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ParameterEffectKind.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ParameterEffectKind.java
index 9531cce..a818aeb 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ParameterEffectKind.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/ParameterEffectKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Christian W. Damus (CEA) - 251963
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml;
@@ -33,7 +33,7 @@
  * @generated
  */
 public enum ParameterEffectKind
-		implements Enumerator {
+	implements Enumerator {
 	/**
 	 * The '<em><b>Create</b></em>' literal object.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Profile.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Profile.java
index 8c06c54..e9555bf 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Profile.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Profile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -162,7 +162,8 @@
 	 * @generated
 	 */
 	PackageImport getMetamodelReference(
-			org.eclipse.uml2.uml.Package importedPackage, boolean createOnDemand);
+			org.eclipse.uml2.uml.Package importedPackage,
+			boolean createOnDemand);
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Property.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Property.java
index 222276e..f7c639f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Property.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 351777, 382718, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 351777, 382718, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -474,7 +474,8 @@
 	 * @see #getDefaultValue()
 	 * @generated
 	 */
-	ValueSpecification createDefaultValue(String name, Type type, EClass eClass);
+	ValueSpecification createDefaultValue(String name, Type type,
+			EClass eClass);
 
 	/**
 	 * Returns the value of the '<em><b>Opposite</b></em>' reference.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/PseudostateKind.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/PseudostateKind.java
index 552b2a7..b6f0cfb 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/PseudostateKind.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/PseudostateKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -33,7 +33,7 @@
  * @generated
  */
 public enum PseudostateKind
-		implements Enumerator {
+	implements Enumerator {
 	/**
 	 * The '<em><b>Initial</b></em>' literal object.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/TransitionKind.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/TransitionKind.java
index cf1839e..7f29b75 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/TransitionKind.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/TransitionKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -33,7 +33,7 @@
  * @generated
  */
 public enum TransitionKind
-		implements Enumerator {
+	implements Enumerator {
 	/**
 	 * The '<em><b>Internal</b></em>' literal object.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLPackage.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLPackage.java
index 6f4a384..ad2900f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLPackage.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLPackage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 208353, 205188, 204200
  *   Kenn Hussey - 286329
- *   Kenn Hussey (CEA) - 327039, 351774, 297216, 397141, 418466, 429994
+ *   Kenn Hussey (CEA) - 327039, 351774, 297216, 397141, 418466, 429994, 485756
  *
  */
 package org.eclipse.uml2.uml;
@@ -190,7 +190,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___VALIDATE_HAS_OWNER__DIAGNOSTICCHAIN_MAP = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 0;
+	int ELEMENT___VALIDATE_HAS_OWNER__DIAGNOSTICCHAIN_MAP = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Not Own Self</em>' operation.
@@ -199,7 +200,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___VALIDATE_NOT_OWN_SELF__DIAGNOSTICCHAIN_MAP = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 1;
+	int ELEMENT___VALIDATE_NOT_OWN_SELF__DIAGNOSTICCHAIN_MAP = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Add Keyword</em>' operation.
@@ -208,7 +210,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___ADD_KEYWORD__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 2;
+	int ELEMENT___ADD_KEYWORD__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Apply Stereotype</em>' operation.
@@ -217,7 +220,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___APPLY_STEREOTYPE__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 3;
+	int ELEMENT___APPLY_STEREOTYPE__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Create EAnnotation</em>' operation.
@@ -226,7 +230,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___CREATE_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 4;
+	int ELEMENT___CREATE_EANNOTATION__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Destroy</em>' operation.
@@ -244,7 +249,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_KEYWORDS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 6;
+	int ELEMENT___GET_KEYWORDS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Get Applicable Stereotype</em>' operation.
@@ -253,7 +259,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_APPLICABLE_STEREOTYPE__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 7;
+	int ELEMENT___GET_APPLICABLE_STEREOTYPE__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The operation id for the '<em>Get Applicable Stereotypes</em>' operation.
@@ -262,7 +269,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_APPLICABLE_STEREOTYPES = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 8;
+	int ELEMENT___GET_APPLICABLE_STEREOTYPES = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Get Applied Stereotype</em>' operation.
@@ -271,7 +279,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_APPLIED_STEREOTYPE__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 9;
+	int ELEMENT___GET_APPLIED_STEREOTYPE__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 9;
 
 	/**
 	 * The operation id for the '<em>Get Applied Stereotypes</em>' operation.
@@ -280,7 +289,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_APPLIED_STEREOTYPES = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 10;
+	int ELEMENT___GET_APPLIED_STEREOTYPES = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 10;
 
 	/**
 	 * The operation id for the '<em>Get Applied Substereotype</em>' operation.
@@ -289,7 +299,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_APPLIED_SUBSTEREOTYPE__STEREOTYPE_STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 11;
+	int ELEMENT___GET_APPLIED_SUBSTEREOTYPE__STEREOTYPE_STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 11;
 
 	/**
 	 * The operation id for the '<em>Get Applied Substereotypes</em>' operation.
@@ -298,7 +309,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_APPLIED_SUBSTEREOTYPES__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 12;
+	int ELEMENT___GET_APPLIED_SUBSTEREOTYPES__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 12;
 
 	/**
 	 * The operation id for the '<em>Get Model</em>' operation.
@@ -316,7 +328,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_NEAREST_PACKAGE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 14;
+	int ELEMENT___GET_NEAREST_PACKAGE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 14;
 
 	/**
 	 * The operation id for the '<em>Get Relationships</em>' operation.
@@ -325,7 +338,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_RELATIONSHIPS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 15;
+	int ELEMENT___GET_RELATIONSHIPS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 15;
 
 	/**
 	 * The operation id for the '<em>Get Relationships</em>' operation.
@@ -334,7 +348,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_RELATIONSHIPS__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 16;
+	int ELEMENT___GET_RELATIONSHIPS__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 16;
 
 	/**
 	 * The operation id for the '<em>Get Required Stereotype</em>' operation.
@@ -343,7 +358,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_REQUIRED_STEREOTYPE__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 17;
+	int ELEMENT___GET_REQUIRED_STEREOTYPE__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 17;
 
 	/**
 	 * The operation id for the '<em>Get Required Stereotypes</em>' operation.
@@ -352,7 +368,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_REQUIRED_STEREOTYPES = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 18;
+	int ELEMENT___GET_REQUIRED_STEREOTYPES = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 18;
 
 	/**
 	 * The operation id for the '<em>Get Source Directed Relationships</em>' operation.
@@ -361,7 +378,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 19;
+	int ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 19;
 
 	/**
 	 * The operation id for the '<em>Get Source Directed Relationships</em>' operation.
@@ -370,7 +388,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 20;
+	int ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 20;
 
 	/**
 	 * The operation id for the '<em>Get Stereotype Application</em>' operation.
@@ -379,7 +398,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 21;
+	int ELEMENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 21;
 
 	/**
 	 * The operation id for the '<em>Get Stereotype Applications</em>' operation.
@@ -388,7 +408,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_STEREOTYPE_APPLICATIONS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 22;
+	int ELEMENT___GET_STEREOTYPE_APPLICATIONS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 22;
 
 	/**
 	 * The operation id for the '<em>Get Target Directed Relationships</em>' operation.
@@ -397,7 +418,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 23;
+	int ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 23;
 
 	/**
 	 * The operation id for the '<em>Get Target Directed Relationships</em>' operation.
@@ -406,7 +428,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 24;
+	int ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 24;
 
 	/**
 	 * The operation id for the '<em>Get Value</em>' operation.
@@ -415,7 +438,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___GET_VALUE__STEREOTYPE_STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 25;
+	int ELEMENT___GET_VALUE__STEREOTYPE_STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 25;
 
 	/**
 	 * The operation id for the '<em>Has Keyword</em>' operation.
@@ -424,7 +448,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___HAS_KEYWORD__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 26;
+	int ELEMENT___HAS_KEYWORD__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 26;
 
 	/**
 	 * The operation id for the '<em>Has Value</em>' operation.
@@ -433,7 +458,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___HAS_VALUE__STEREOTYPE_STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 27;
+	int ELEMENT___HAS_VALUE__STEREOTYPE_STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 27;
 
 	/**
 	 * The operation id for the '<em>Is Stereotype Applicable</em>' operation.
@@ -442,7 +468,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___IS_STEREOTYPE_APPLICABLE__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 28;
+	int ELEMENT___IS_STEREOTYPE_APPLICABLE__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 28;
 
 	/**
 	 * The operation id for the '<em>Is Stereotype Applied</em>' operation.
@@ -451,7 +478,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___IS_STEREOTYPE_APPLIED__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 29;
+	int ELEMENT___IS_STEREOTYPE_APPLIED__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 29;
 
 	/**
 	 * The operation id for the '<em>Is Stereotype Required</em>' operation.
@@ -460,7 +488,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___IS_STEREOTYPE_REQUIRED__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 30;
+	int ELEMENT___IS_STEREOTYPE_REQUIRED__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 30;
 
 	/**
 	 * The operation id for the '<em>Remove Keyword</em>' operation.
@@ -469,7 +498,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___REMOVE_KEYWORD__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 31;
+	int ELEMENT___REMOVE_KEYWORD__STRING = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 31;
 
 	/**
 	 * The operation id for the '<em>Set Value</em>' operation.
@@ -478,7 +508,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___SET_VALUE__STEREOTYPE_STRING_OBJECT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 32;
+	int ELEMENT___SET_VALUE__STEREOTYPE_STRING_OBJECT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 32;
 
 	/**
 	 * The operation id for the '<em>Unapply Stereotype</em>' operation.
@@ -487,7 +518,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___UNAPPLY_STEREOTYPE__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 33;
+	int ELEMENT___UNAPPLY_STEREOTYPE__STEREOTYPE = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 33;
 
 	/**
 	 * The operation id for the '<em>All Owned Elements</em>' operation.
@@ -496,7 +528,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___ALL_OWNED_ELEMENTS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 34;
+	int ELEMENT___ALL_OWNED_ELEMENTS = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 34;
 
 	/**
 	 * The operation id for the '<em>Must Be Owned</em>' operation.
@@ -505,7 +538,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT___MUST_BE_OWNED = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 35;
+	int ELEMENT___MUST_BE_OWNED = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 35;
 
 	/**
 	 * The number of operations of the '<em>Element</em>' class.
@@ -514,7 +548,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT + 36;
+	int ELEMENT_OPERATION_COUNT = EcorePackage.EMODEL_ELEMENT_OPERATION_COUNT
+		+ 36;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.uml.internal.impl.CommentImpl <em>Comment</em>}' class.
@@ -995,7 +1030,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT___VALIDATE_VISIBILITY_NEEDS_OWNERSHIP__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 0;
+	int NAMED_ELEMENT___VALIDATE_VISIBILITY_NEEDS_OWNERSHIP__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Has Qualified Name</em>' operation.
@@ -1004,7 +1040,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT___VALIDATE_HAS_QUALIFIED_NAME__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 1;
+	int NAMED_ELEMENT___VALIDATE_HAS_QUALIFIED_NAME__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Has No Qualified Name</em>' operation.
@@ -1013,7 +1050,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT___VALIDATE_HAS_NO_QUALIFIED_NAME__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 2;
+	int NAMED_ELEMENT___VALIDATE_HAS_NO_QUALIFIED_NAME__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Create Dependency</em>' operation.
@@ -1022,7 +1060,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT___CREATE_DEPENDENCY__NAMEDELEMENT = ELEMENT_OPERATION_COUNT + 3;
+	int NAMED_ELEMENT___CREATE_DEPENDENCY__NAMEDELEMENT = ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Create Usage</em>' operation.
@@ -1031,7 +1070,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT___CREATE_USAGE__NAMEDELEMENT = ELEMENT_OPERATION_COUNT + 4;
+	int NAMED_ELEMENT___CREATE_USAGE__NAMEDELEMENT = ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Get Label</em>' operation.
@@ -1085,7 +1125,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMED_ELEMENT___IS_DISTINGUISHABLE_FROM__NAMEDELEMENT_NAMESPACE = ELEMENT_OPERATION_COUNT + 10;
+	int NAMED_ELEMENT___IS_DISTINGUISHABLE_FROM__NAMEDELEMENT_NAMESPACE = ELEMENT_OPERATION_COUNT
+		+ 10;
 
 	/**
 	 * The operation id for the '<em>Get Qualified Name</em>' operation.
@@ -3552,7 +3593,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMESPACE___VALIDATE_MEMBERS_DISTINGUISHABLE__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 0;
+	int NAMESPACE___VALIDATE_MEMBERS_DISTINGUISHABLE__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Cannot Import Self</em>' operation.
@@ -3561,7 +3603,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMESPACE___VALIDATE_CANNOT_IMPORT_SELF__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 1;
+	int NAMESPACE___VALIDATE_CANNOT_IMPORT_SELF__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Cannot Import Owned Members</em>' operation.
@@ -3570,7 +3613,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMESPACE___VALIDATE_CANNOT_IMPORT_OWNED_MEMBERS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 2;
+	int NAMESPACE___VALIDATE_CANNOT_IMPORT_OWNED_MEMBERS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Create Element Import</em>' operation.
@@ -3579,7 +3623,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMESPACE___CREATE_ELEMENT_IMPORT__PACKAGEABLEELEMENT_VISIBILITYKIND = NAMED_ELEMENT_OPERATION_COUNT + 3;
+	int NAMESPACE___CREATE_ELEMENT_IMPORT__PACKAGEABLEELEMENT_VISIBILITYKIND = NAMED_ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Create Package Import</em>' operation.
@@ -3588,7 +3633,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMESPACE___CREATE_PACKAGE_IMPORT__PACKAGE_VISIBILITYKIND = NAMED_ELEMENT_OPERATION_COUNT + 4;
+	int NAMESPACE___CREATE_PACKAGE_IMPORT__PACKAGE_VISIBILITYKIND = NAMED_ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Get Imported Elements</em>' operation.
@@ -3624,7 +3670,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMESPACE___EXCLUDE_COLLISIONS__ELIST = NAMED_ELEMENT_OPERATION_COUNT + 8;
+	int NAMESPACE___EXCLUDE_COLLISIONS__ELIST = NAMED_ELEMENT_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Get Names Of Member</em>' operation.
@@ -3633,7 +3680,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMESPACE___GET_NAMES_OF_MEMBER__NAMEDELEMENT = NAMED_ELEMENT_OPERATION_COUNT + 9;
+	int NAMESPACE___GET_NAMES_OF_MEMBER__NAMEDELEMENT = NAMED_ELEMENT_OPERATION_COUNT
+		+ 9;
 
 	/**
 	 * The operation id for the '<em>Import Members</em>' operation.
@@ -3660,7 +3708,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMESPACE___MEMBERS_ARE_DISTINGUISHABLE = NAMED_ELEMENT_OPERATION_COUNT + 12;
+	int NAMESPACE___MEMBERS_ARE_DISTINGUISHABLE = NAMED_ELEMENT_OPERATION_COUNT
+		+ 12;
 
 	/**
 	 * The number of operations of the '<em>Namespace</em>' class.
@@ -4605,7 +4654,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___VALIDATE_REDEFINITION_CONSISTENT__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 0;
+	int CLASSIFIER___VALIDATE_REDEFINITION_CONSISTENT__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Non Leaf Redefinition</em>' operation.
@@ -4614,7 +4664,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___VALIDATE_NON_LEAF_REDEFINITION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 1;
+	int CLASSIFIER___VALIDATE_NON_LEAF_REDEFINITION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Redefinition Context Valid</em>' operation.
@@ -4623,7 +4674,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___VALIDATE_REDEFINITION_CONTEXT_VALID__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 2;
+	int CLASSIFIER___VALIDATE_REDEFINITION_CONTEXT_VALID__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Is Consistent With</em>' operation.
@@ -4632,7 +4684,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___IS_CONSISTENT_WITH__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT + 3;
+	int CLASSIFIER___IS_CONSISTENT_WITH__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Is Redefinition Context Valid</em>' operation.
@@ -4641,7 +4694,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT + 4;
+	int CLASSIFIER___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Is Compatible With</em>' operation.
@@ -4650,7 +4704,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = NAMESPACE_OPERATION_COUNT + 5;
+	int CLASSIFIER___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = NAMESPACE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Is Template Parameter</em>' operation.
@@ -4668,7 +4723,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 7;
+	int CLASSIFIER___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The operation id for the '<em>Create Association</em>' operation.
@@ -4677,7 +4733,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___CREATE_ASSOCIATION__BOOLEAN_AGGREGATIONKIND_STRING_INT_INT_TYPE_BOOLEAN_AGGREGATIONKIND_STRING_INT_INT = NAMESPACE_OPERATION_COUNT + 8;
+	int CLASSIFIER___CREATE_ASSOCIATION__BOOLEAN_AGGREGATIONKIND_STRING_INT_INT_TYPE_BOOLEAN_AGGREGATIONKIND_STRING_INT_INT = NAMESPACE_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Get Associations</em>' operation.
@@ -4722,7 +4779,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___VALIDATE_SPECIALIZE_TYPE__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 13;
+	int CLASSIFIER___VALIDATE_SPECIALIZE_TYPE__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 13;
 
 	/**
 	 * The operation id for the '<em>Validate Maps To Generalization Set</em>' operation.
@@ -4731,7 +4789,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___VALIDATE_MAPS_TO_GENERALIZATION_SET__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 14;
+	int CLASSIFIER___VALIDATE_MAPS_TO_GENERALIZATION_SET__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 14;
 
 	/**
 	 * The operation id for the '<em>Validate Non Final Parents</em>' operation.
@@ -4740,7 +4799,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___VALIDATE_NON_FINAL_PARENTS__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 15;
+	int CLASSIFIER___VALIDATE_NON_FINAL_PARENTS__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 15;
 
 	/**
 	 * The operation id for the '<em>Validate No Cycles In Generalization</em>' operation.
@@ -4749,7 +4809,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___VALIDATE_NO_CYCLES_IN_GENERALIZATION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 16;
+	int CLASSIFIER___VALIDATE_NO_CYCLES_IN_GENERALIZATION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 16;
 
 	/**
 	 * The operation id for the '<em>Get All Attributes</em>' operation.
@@ -4785,7 +4846,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___GET_OPERATION__STRING_ELIST_ELIST = NAMESPACE_OPERATION_COUNT + 20;
+	int CLASSIFIER___GET_OPERATION__STRING_ELIST_ELIST = NAMESPACE_OPERATION_COUNT
+		+ 20;
 
 	/**
 	 * The operation id for the '<em>Get Operation</em>' operation.
@@ -4794,7 +4856,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___GET_OPERATION__STRING_ELIST_ELIST_BOOLEAN = NAMESPACE_OPERATION_COUNT + 21;
+	int CLASSIFIER___GET_OPERATION__STRING_ELIST_ELIST_BOOLEAN = NAMESPACE_OPERATION_COUNT
+		+ 21;
 
 	/**
 	 * The operation id for the '<em>Get Operations</em>' operation.
@@ -4848,7 +4911,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___HAS_VISIBILITY_OF__NAMEDELEMENT = NAMESPACE_OPERATION_COUNT + 27;
+	int CLASSIFIER___HAS_VISIBILITY_OF__NAMEDELEMENT = NAMESPACE_OPERATION_COUNT
+		+ 27;
 
 	/**
 	 * The operation id for the '<em>Inherit</em>' operation.
@@ -4866,7 +4930,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___INHERITABLE_MEMBERS__CLASSIFIER = NAMESPACE_OPERATION_COUNT + 29;
+	int CLASSIFIER___INHERITABLE_MEMBERS__CLASSIFIER = NAMESPACE_OPERATION_COUNT
+		+ 29;
 
 	/**
 	 * The operation id for the '<em>Get Inherited Members</em>' operation.
@@ -4884,7 +4949,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___MAY_SPECIALIZE_TYPE__CLASSIFIER = NAMESPACE_OPERATION_COUNT + 31;
+	int CLASSIFIER___MAY_SPECIALIZE_TYPE__CLASSIFIER = NAMESPACE_OPERATION_COUNT
+		+ 31;
 
 	/**
 	 * The operation id for the '<em>Parents</em>' operation.
@@ -4902,7 +4968,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___DIRECTLY_REALIZED_INTERFACES = NAMESPACE_OPERATION_COUNT + 33;
+	int CLASSIFIER___DIRECTLY_REALIZED_INTERFACES = NAMESPACE_OPERATION_COUNT
+		+ 33;
 
 	/**
 	 * The operation id for the '<em>Directly Used Interfaces</em>' operation.
@@ -4938,7 +5005,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER___IS_SUBSTITUTABLE_FOR__CLASSIFIER = NAMESPACE_OPERATION_COUNT + 37;
+	int CLASSIFIER___IS_SUBSTITUTABLE_FOR__CLASSIFIER = NAMESPACE_OPERATION_COUNT
+		+ 37;
 
 	/**
 	 * The operation id for the '<em>All Attributes</em>' operation.
@@ -6297,7 +6365,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_CLASSIFIER___CREATE_OWNED_ATTRIBUTE__STRING_TYPE_INT_INT = CLASSIFIER_OPERATION_COUNT + 0;
+	int STRUCTURED_CLASSIFIER___CREATE_OWNED_ATTRIBUTE__STRING_TYPE_INT_INT = CLASSIFIER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Get Parts</em>' operation.
@@ -6711,7 +6780,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ENCAPSULATED_CLASSIFIER__OWNED_PORT = STRUCTURED_CLASSIFIER_FEATURE_COUNT + 0;
+	int ENCAPSULATED_CLASSIFIER__OWNED_PORT = STRUCTURED_CLASSIFIER_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The number of structural features of the '<em>Encapsulated Classifier</em>' class.
@@ -6720,7 +6790,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ENCAPSULATED_CLASSIFIER_FEATURE_COUNT = STRUCTURED_CLASSIFIER_FEATURE_COUNT + 1;
+	int ENCAPSULATED_CLASSIFIER_FEATURE_COUNT = STRUCTURED_CLASSIFIER_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -7692,7 +7763,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ENCAPSULATED_CLASSIFIER___GET_OWNED_PORTS = STRUCTURED_CLASSIFIER_OPERATION_COUNT + 0;
+	int ENCAPSULATED_CLASSIFIER___GET_OWNED_PORTS = STRUCTURED_CLASSIFIER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Encapsulated Classifier</em>' class.
@@ -7701,7 +7773,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ENCAPSULATED_CLASSIFIER_OPERATION_COUNT = STRUCTURED_CLASSIFIER_OPERATION_COUNT + 1;
+	int ENCAPSULATED_CLASSIFIER_OPERATION_COUNT = STRUCTURED_CLASSIFIER_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -8106,7 +8179,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASS__INTERFACE_REALIZATION = ENCAPSULATED_CLASSIFIER_FEATURE_COUNT + 1;
+	int CLASS__INTERFACE_REALIZATION = ENCAPSULATED_CLASSIFIER_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
@@ -9159,7 +9233,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASS___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP = ENCAPSULATED_CLASSIFIER_OPERATION_COUNT + 0;
+	int CLASS___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP = ENCAPSULATED_CLASSIFIER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Get All Implemented Interfaces</em>' operation.
@@ -9168,7 +9243,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASS___GET_ALL_IMPLEMENTED_INTERFACES = ENCAPSULATED_CLASSIFIER_OPERATION_COUNT + 1;
+	int CLASS___GET_ALL_IMPLEMENTED_INTERFACES = ENCAPSULATED_CLASSIFIER_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get Implemented Interfaces</em>' operation.
@@ -9177,7 +9253,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASS___GET_IMPLEMENTED_INTERFACES = ENCAPSULATED_CLASSIFIER_OPERATION_COUNT + 2;
+	int CLASS___GET_IMPLEMENTED_INTERFACES = ENCAPSULATED_CLASSIFIER_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Passive Class</em>' operation.
@@ -9186,7 +9263,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASS___VALIDATE_PASSIVE_CLASS__DIAGNOSTICCHAIN_MAP = ENCAPSULATED_CLASSIFIER_OPERATION_COUNT + 3;
+	int CLASS___VALIDATE_PASSIVE_CLASS__DIAGNOSTICCHAIN_MAP = ENCAPSULATED_CLASSIFIER_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Create Owned Operation</em>' operation.
@@ -9195,7 +9273,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASS___CREATE_OWNED_OPERATION__STRING_ELIST_ELIST_TYPE = ENCAPSULATED_CLASSIFIER_OPERATION_COUNT + 4;
+	int CLASS___CREATE_OWNED_OPERATION__STRING_ELIST_ELIST_TYPE = ENCAPSULATED_CLASSIFIER_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Is Metaclass</em>' operation.
@@ -11213,7 +11292,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIOR___VALIDATE_MOST_ONE_BEHAVIOR__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 0;
+	int BEHAVIOR___VALIDATE_MOST_ONE_BEHAVIOR__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Parameters Match</em>' operation.
@@ -11222,7 +11302,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIOR___VALIDATE_PARAMETERS_MATCH__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 1;
+	int BEHAVIOR___VALIDATE_PARAMETERS_MATCH__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Feature Of Context Classifier</em>' operation.
@@ -11231,7 +11312,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIOR___VALIDATE_FEATURE_OF_CONTEXT_CLASSIFIER__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 2;
+	int BEHAVIOR___VALIDATE_FEATURE_OF_CONTEXT_CLASSIFIER__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get Context</em>' operation.
@@ -13191,7 +13273,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY___VALIDATE_MAXIMUM_ONE_PARAMETER_NODE__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT + 0;
+	int ACTIVITY___VALIDATE_MAXIMUM_ONE_PARAMETER_NODE__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Maximum Two Parameter Nodes</em>' operation.
@@ -13200,7 +13283,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY___VALIDATE_MAXIMUM_TWO_PARAMETER_NODES__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT + 1;
+	int ACTIVITY___VALIDATE_MAXIMUM_TWO_PARAMETER_NODES__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Activity</em>' class.
@@ -13560,7 +13644,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIORED_CLASSIFIER__CLASSIFIER_BEHAVIOR = CLASSIFIER_FEATURE_COUNT + 0;
+	int BEHAVIORED_CLASSIFIER__CLASSIFIER_BEHAVIOR = CLASSIFIER_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Interface Realization</b></em>' containment reference list.
@@ -13569,7 +13654,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIORED_CLASSIFIER__INTERFACE_REALIZATION = CLASSIFIER_FEATURE_COUNT + 1;
+	int BEHAVIORED_CLASSIFIER__INTERFACE_REALIZATION = CLASSIFIER_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
@@ -14532,7 +14618,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIORED_CLASSIFIER___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT + 0;
+	int BEHAVIORED_CLASSIFIER___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Get All Implemented Interfaces</em>' operation.
@@ -14541,7 +14628,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES = CLASSIFIER_OPERATION_COUNT + 1;
+	int BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES = CLASSIFIER_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get Implemented Interfaces</em>' operation.
@@ -14550,7 +14638,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES = CLASSIFIER_OPERATION_COUNT + 2;
+	int BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES = CLASSIFIER_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Behaviored Classifier</em>' class.
@@ -16512,7 +16601,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STEREOTYPE___VALIDATE_BINARY_ASSOCIATIONS_ONLY__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 0;
+	int STEREOTYPE___VALIDATE_BINARY_ASSOCIATIONS_ONLY__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Generalize</em>' operation.
@@ -16521,7 +16611,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STEREOTYPE___VALIDATE_GENERALIZE__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 1;
+	int STEREOTYPE___VALIDATE_GENERALIZE__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Name Not Clash</em>' operation.
@@ -16530,7 +16621,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STEREOTYPE___VALIDATE_NAME_NOT_CLASH__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 2;
+	int STEREOTYPE___VALIDATE_NAME_NOT_CLASH__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Association End Ownership</em>' operation.
@@ -16539,7 +16631,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STEREOTYPE___VALIDATE_ASSOCIATION_END_OWNERSHIP__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 3;
+	int STEREOTYPE___VALIDATE_ASSOCIATION_END_OWNERSHIP__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Base Property Upper Bound</em>' operation.
@@ -16548,7 +16641,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STEREOTYPE___VALIDATE_BASE_PROPERTY_UPPER_BOUND__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 4;
+	int STEREOTYPE___VALIDATE_BASE_PROPERTY_UPPER_BOUND__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Base Property Multiplicity Single Extension</em>' operation.
@@ -16557,7 +16651,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STEREOTYPE___VALIDATE_BASE_PROPERTY_MULTIPLICITY_SINGLE_EXTENSION__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 5;
+	int STEREOTYPE___VALIDATE_BASE_PROPERTY_MULTIPLICITY_SINGLE_EXTENSION__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Validate Base Property Multiplicity Multiple Extension</em>' operation.
@@ -16566,7 +16661,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STEREOTYPE___VALIDATE_BASE_PROPERTY_MULTIPLICITY_MULTIPLE_EXTENSION__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 6;
+	int STEREOTYPE___VALIDATE_BASE_PROPERTY_MULTIPLICITY_MULTIPLE_EXTENSION__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Create Extension</em>' operation.
@@ -16575,7 +16671,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STEREOTYPE___CREATE_EXTENSION__CLASS_BOOLEAN = CLASS_OPERATION_COUNT + 7;
+	int STEREOTYPE___CREATE_EXTENSION__CLASS_BOOLEAN = CLASS_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The operation id for the '<em>Create Icon</em>' operation.
@@ -17925,7 +18022,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = NAMESPACE_OPERATION_COUNT + 0;
+	int PACKAGE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = NAMESPACE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Is Template Parameter</em>' operation.
@@ -17943,7 +18041,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 2;
+	int PACKAGE___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Is Template</em>' operation.
@@ -17970,7 +18069,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___VALIDATE_ELEMENTS_PUBLIC_OR_PRIVATE__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 5;
+	int PACKAGE___VALIDATE_ELEMENTS_PUBLIC_OR_PRIVATE__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Apply Profile</em>' operation.
@@ -17988,7 +18088,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___CREATE_OWNED_CLASS__STRING_BOOLEAN = NAMESPACE_OPERATION_COUNT + 7;
+	int PACKAGE___CREATE_OWNED_CLASS__STRING_BOOLEAN = NAMESPACE_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The operation id for the '<em>Create Owned Enumeration</em>' operation.
@@ -17997,7 +18098,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___CREATE_OWNED_ENUMERATION__STRING = NAMESPACE_OPERATION_COUNT + 8;
+	int PACKAGE___CREATE_OWNED_ENUMERATION__STRING = NAMESPACE_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Create Owned Interface</em>' operation.
@@ -18006,7 +18108,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___CREATE_OWNED_INTERFACE__STRING = NAMESPACE_OPERATION_COUNT + 9;
+	int PACKAGE___CREATE_OWNED_INTERFACE__STRING = NAMESPACE_OPERATION_COUNT
+		+ 9;
 
 	/**
 	 * The operation id for the '<em>Create Owned Primitive Type</em>' operation.
@@ -18015,7 +18118,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___CREATE_OWNED_PRIMITIVE_TYPE__STRING = NAMESPACE_OPERATION_COUNT + 10;
+	int PACKAGE___CREATE_OWNED_PRIMITIVE_TYPE__STRING = NAMESPACE_OPERATION_COUNT
+		+ 10;
 
 	/**
 	 * The operation id for the '<em>Create Owned Stereotype</em>' operation.
@@ -18024,7 +18128,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___CREATE_OWNED_STEREOTYPE__STRING_BOOLEAN = NAMESPACE_OPERATION_COUNT + 11;
+	int PACKAGE___CREATE_OWNED_STEREOTYPE__STRING_BOOLEAN = NAMESPACE_OPERATION_COUNT
+		+ 11;
 
 	/**
 	 * The operation id for the '<em>Get All Applied Profiles</em>' operation.
@@ -18060,7 +18165,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___GET_APPLIED_PROFILE__STRING_BOOLEAN = NAMESPACE_OPERATION_COUNT + 15;
+	int PACKAGE___GET_APPLIED_PROFILE__STRING_BOOLEAN = NAMESPACE_OPERATION_COUNT
+		+ 15;
 
 	/**
 	 * The operation id for the '<em>Get Applied Profiles</em>' operation.
@@ -18078,7 +18184,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___GET_PROFILE_APPLICATION__PROFILE = NAMESPACE_OPERATION_COUNT + 17;
+	int PACKAGE___GET_PROFILE_APPLICATION__PROFILE = NAMESPACE_OPERATION_COUNT
+		+ 17;
 
 	/**
 	 * The operation id for the '<em>Get Profile Application</em>' operation.
@@ -18087,7 +18194,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___GET_PROFILE_APPLICATION__PROFILE_BOOLEAN = NAMESPACE_OPERATION_COUNT + 18;
+	int PACKAGE___GET_PROFILE_APPLICATION__PROFILE_BOOLEAN = NAMESPACE_OPERATION_COUNT
+		+ 18;
 
 	/**
 	 * The operation id for the '<em>Is Model Library</em>' operation.
@@ -18117,13 +18225,22 @@
 	int PACKAGE___UNAPPLY_PROFILE__PROFILE = NAMESPACE_OPERATION_COUNT + 21;
 
 	/**
+	 * The operation id for the '<em>Apply Profiles</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PACKAGE___APPLY_PROFILES__ELIST = NAMESPACE_OPERATION_COUNT + 22;
+
+	/**
 	 * The operation id for the '<em>All Applicable Stereotypes</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___ALL_APPLICABLE_STEREOTYPES = NAMESPACE_OPERATION_COUNT + 22;
+	int PACKAGE___ALL_APPLICABLE_STEREOTYPES = NAMESPACE_OPERATION_COUNT + 23;
 
 	/**
 	 * The operation id for the '<em>Containing Profile</em>' operation.
@@ -18132,7 +18249,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___CONTAINING_PROFILE = NAMESPACE_OPERATION_COUNT + 23;
+	int PACKAGE___CONTAINING_PROFILE = NAMESPACE_OPERATION_COUNT + 24;
 
 	/**
 	 * The operation id for the '<em>Makes Visible</em>' operation.
@@ -18141,7 +18258,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___MAKES_VISIBLE__NAMEDELEMENT = NAMESPACE_OPERATION_COUNT + 24;
+	int PACKAGE___MAKES_VISIBLE__NAMEDELEMENT = NAMESPACE_OPERATION_COUNT + 25;
 
 	/**
 	 * The operation id for the '<em>Get Nested Packages</em>' operation.
@@ -18150,7 +18267,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___GET_NESTED_PACKAGES = NAMESPACE_OPERATION_COUNT + 25;
+	int PACKAGE___GET_NESTED_PACKAGES = NAMESPACE_OPERATION_COUNT + 26;
 
 	/**
 	 * The operation id for the '<em>Get Owned Stereotypes</em>' operation.
@@ -18159,7 +18276,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___GET_OWNED_STEREOTYPES = NAMESPACE_OPERATION_COUNT + 26;
+	int PACKAGE___GET_OWNED_STEREOTYPES = NAMESPACE_OPERATION_COUNT + 27;
 
 	/**
 	 * The operation id for the '<em>Get Owned Types</em>' operation.
@@ -18168,7 +18285,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___GET_OWNED_TYPES = NAMESPACE_OPERATION_COUNT + 27;
+	int PACKAGE___GET_OWNED_TYPES = NAMESPACE_OPERATION_COUNT + 28;
 
 	/**
 	 * The operation id for the '<em>Visible Members</em>' operation.
@@ -18177,7 +18294,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE___VISIBLE_MEMBERS = NAMESPACE_OPERATION_COUNT + 28;
+	int PACKAGE___VISIBLE_MEMBERS = NAMESPACE_OPERATION_COUNT + 29;
 
 	/**
 	 * The number of operations of the '<em>Package</em>' class.
@@ -18186,7 +18303,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE_OPERATION_COUNT = NAMESPACE_OPERATION_COUNT + 29;
+	int PACKAGE_OPERATION_COUNT = NAMESPACE_OPERATION_COUNT + 30;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -19242,6 +19359,15 @@
 	int PROFILE___UNAPPLY_PROFILE__PROFILE = PACKAGE___UNAPPLY_PROFILE__PROFILE;
 
 	/**
+	 * The operation id for the '<em>Apply Profiles</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROFILE___APPLY_PROFILES__ELIST = PACKAGE___APPLY_PROFILES__ELIST;
+
+	/**
 	 * The operation id for the '<em>All Applicable Stereotypes</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -19311,7 +19437,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROFILE___VALIDATE_METACLASS_REFERENCE_NOT_SPECIALIZED__DIAGNOSTICCHAIN_MAP = PACKAGE_OPERATION_COUNT + 0;
+	int PROFILE___VALIDATE_METACLASS_REFERENCE_NOT_SPECIALIZED__DIAGNOSTICCHAIN_MAP = PACKAGE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate References Same Metamodel</em>' operation.
@@ -19320,7 +19447,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROFILE___VALIDATE_REFERENCES_SAME_METAMODEL__DIAGNOSTICCHAIN_MAP = PACKAGE_OPERATION_COUNT + 1;
+	int PROFILE___VALIDATE_REFERENCES_SAME_METAMODEL__DIAGNOSTICCHAIN_MAP = PACKAGE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Create</em>' operation.
@@ -19509,7 +19637,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGEABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER = NAMED_ELEMENT_FEATURE_COUNT + 0;
+	int PACKAGEABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER = NAMED_ELEMENT_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
@@ -19518,7 +19647,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGEABLE_ELEMENT__TEMPLATE_PARAMETER = NAMED_ELEMENT_FEATURE_COUNT + 1;
+	int PACKAGEABLE_ELEMENT__TEMPLATE_PARAMETER = NAMED_ELEMENT_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Packageable Element</em>' class.
@@ -19995,7 +20125,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGEABLE_ELEMENT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = NAMED_ELEMENT_OPERATION_COUNT + 0;
+	int PACKAGEABLE_ELEMENT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = NAMED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Is Template Parameter</em>' operation.
@@ -20004,7 +20135,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGEABLE_ELEMENT___IS_TEMPLATE_PARAMETER = NAMED_ELEMENT_OPERATION_COUNT + 1;
+	int PACKAGEABLE_ELEMENT___IS_TEMPLATE_PARAMETER = NAMED_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Namespace Needs Visibility</em>' operation.
@@ -20013,7 +20145,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGEABLE_ELEMENT___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 2;
+	int PACKAGEABLE_ELEMENT___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Packageable Element</em>' class.
@@ -20067,7 +20200,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER = ELEMENT_FEATURE_COUNT + 0;
+	int PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER = ELEMENT_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
@@ -20427,7 +20561,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETERABLE_ELEMENT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = ELEMENT_OPERATION_COUNT + 0;
+	int PARAMETERABLE_ELEMENT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Is Template Parameter</em>' operation.
@@ -20436,7 +20571,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETERABLE_ELEMENT___IS_TEMPLATE_PARAMETER = ELEMENT_OPERATION_COUNT + 1;
+	int PARAMETERABLE_ELEMENT___IS_TEMPLATE_PARAMETER = ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Parameterable Element</em>' class.
@@ -20526,7 +20662,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT = ELEMENT_FEATURE_COUNT + 4;
+	int TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT = ELEMENT_FEATURE_COUNT
+		+ 4;
 
 	/**
 	 * The number of structural features of the '<em>Template Parameter</em>' class.
@@ -20877,7 +21014,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_PARAMETER___VALIDATE_MUST_BE_COMPATIBLE__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 0;
+	int TEMPLATE_PARAMETER___VALIDATE_MUST_BE_COMPATIBLE__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Template Parameter</em>' class.
@@ -21300,7 +21438,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_SIGNATURE___VALIDATE_OWN_ELEMENTS__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 0;
+	int TEMPLATE_SIGNATURE___VALIDATE_OWN_ELEMENTS__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Unique Parameters</em>' operation.
@@ -21309,7 +21448,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_SIGNATURE___VALIDATE_UNIQUE_PARAMETERS__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 1;
+	int TEMPLATE_SIGNATURE___VALIDATE_UNIQUE_PARAMETERS__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Template Signature</em>' class.
@@ -21372,7 +21512,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE = ELEMENT_FEATURE_COUNT + 1;
+	int TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE = ELEMENT_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Templateable Element</em>' class.
@@ -21732,7 +21873,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS = ELEMENT_OPERATION_COUNT + 1;
+	int TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS = ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Templateable Element</em>' class.
@@ -22551,7 +22693,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DIRECTED_RELATIONSHIP_OPERATION_COUNT = RELATIONSHIP_OPERATION_COUNT + 0;
+	int DIRECTED_RELATIONSHIP_OPERATION_COUNT = RELATIONSHIP_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -22623,7 +22766,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_BINDING__PARAMETER_SUBSTITUTION = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 0;
+	int TEMPLATE_BINDING__PARAMETER_SUBSTITUTION = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Signature</b></em>' reference.
@@ -22641,7 +22785,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_BINDING__BOUND_ELEMENT = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 2;
+	int TEMPLATE_BINDING__BOUND_ELEMENT = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The number of structural features of the '<em>Template Binding</em>' class.
@@ -22650,7 +22795,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_BINDING_FEATURE_COUNT = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 3;
+	int TEMPLATE_BINDING_FEATURE_COUNT = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -22992,7 +23138,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_BINDING___VALIDATE_PARAMETER_SUBSTITUTION_FORMAL__DIAGNOSTICCHAIN_MAP = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 0;
+	int TEMPLATE_BINDING___VALIDATE_PARAMETER_SUBSTITUTION_FORMAL__DIAGNOSTICCHAIN_MAP = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate One Parameter Substitution</em>' operation.
@@ -23001,7 +23148,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_BINDING___VALIDATE_ONE_PARAMETER_SUBSTITUTION__DIAGNOSTICCHAIN_MAP = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 1;
+	int TEMPLATE_BINDING___VALIDATE_ONE_PARAMETER_SUBSTITUTION__DIAGNOSTICCHAIN_MAP = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Template Binding</em>' class.
@@ -23010,7 +23158,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_BINDING_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 2;
+	int TEMPLATE_BINDING_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -23073,7 +23222,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL = ELEMENT_FEATURE_COUNT + 2;
+	int TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL = ELEMENT_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>Template Binding</b></em>' container reference.
@@ -23082,7 +23232,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING = ELEMENT_FEATURE_COUNT + 3;
+	int TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING = ELEMENT_FEATURE_COUNT
+		+ 3;
 
 	/**
 	 * The number of structural features of the '<em>Template Parameter Substitution</em>' class.
@@ -23091,7 +23242,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_PARAMETER_SUBSTITUTION_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 4;
+	int TEMPLATE_PARAMETER_SUBSTITUTION_FEATURE_COUNT = ELEMENT_FEATURE_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -23433,7 +23585,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_PARAMETER_SUBSTITUTION___VALIDATE_MUST_BE_COMPATIBLE__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 0;
+	int TEMPLATE_PARAMETER_SUBSTITUTION___VALIDATE_MUST_BE_COMPATIBLE__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Template Parameter Substitution</em>' class.
@@ -23442,7 +23595,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_PARAMETER_SUBSTITUTION_OPERATION_COUNT = ELEMENT_OPERATION_COUNT + 1;
+	int TEMPLATE_PARAMETER_SUBSTITUTION_OPERATION_COUNT = ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -24063,7 +24217,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TYPE___CREATE_ASSOCIATION__BOOLEAN_AGGREGATIONKIND_STRING_INT_INT_TYPE_BOOLEAN_AGGREGATIONKIND_STRING_INT_INT = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 0;
+	int TYPE___CREATE_ASSOCIATION__BOOLEAN_AGGREGATIONKIND_STRING_INT_INT_TYPE_BOOLEAN_AGGREGATIONKIND_STRING_INT_INT = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Get Associations</em>' operation.
@@ -25440,7 +25595,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ASSOCIATION___VALIDATE_SPECIALIZED_END_NUMBER__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT + 0;
+	int ASSOCIATION___VALIDATE_SPECIALIZED_END_NUMBER__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Specialized End Types</em>' operation.
@@ -25449,7 +25605,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ASSOCIATION___VALIDATE_SPECIALIZED_END_TYPES__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT + 1;
+	int ASSOCIATION___VALIDATE_SPECIALIZED_END_TYPES__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Binary Associations</em>' operation.
@@ -25458,7 +25615,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ASSOCIATION___VALIDATE_BINARY_ASSOCIATIONS__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT + 2;
+	int ASSOCIATION___VALIDATE_BINARY_ASSOCIATIONS__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Association Ends</em>' operation.
@@ -25467,7 +25625,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ASSOCIATION___VALIDATE_ASSOCIATION_ENDS__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT + 3;
+	int ASSOCIATION___VALIDATE_ASSOCIATION_ENDS__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Ends Must Be Typed</em>' operation.
@@ -25476,7 +25635,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ASSOCIATION___VALIDATE_ENDS_MUST_BE_TYPED__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT + 4;
+	int ASSOCIATION___VALIDATE_ENDS_MUST_BE_TYPED__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Is Binary</em>' operation.
@@ -25611,7 +25771,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_ELEMENT__REDEFINED_ELEMENT = NAMED_ELEMENT_FEATURE_COUNT + 1;
+	int REDEFINABLE_ELEMENT__REDEFINED_ELEMENT = NAMED_ELEMENT_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
@@ -25620,7 +25781,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT = NAMED_ELEMENT_FEATURE_COUNT + 2;
+	int REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT = NAMED_ELEMENT_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The number of structural features of the '<em>Redefinable Element</em>' class.
@@ -26097,7 +26259,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_ELEMENT___VALIDATE_REDEFINITION_CONSISTENT__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 0;
+	int REDEFINABLE_ELEMENT___VALIDATE_REDEFINITION_CONSISTENT__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Non Leaf Redefinition</em>' operation.
@@ -26106,7 +26269,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_ELEMENT___VALIDATE_NON_LEAF_REDEFINITION__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 1;
+	int REDEFINABLE_ELEMENT___VALIDATE_NON_LEAF_REDEFINITION__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Redefinition Context Valid</em>' operation.
@@ -26115,7 +26279,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_ELEMENT___VALIDATE_REDEFINITION_CONTEXT_VALID__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 2;
+	int REDEFINABLE_ELEMENT___VALIDATE_REDEFINITION_CONTEXT_VALID__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Is Consistent With</em>' operation.
@@ -26124,7 +26289,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_ELEMENT___IS_CONSISTENT_WITH__REDEFINABLEELEMENT = NAMED_ELEMENT_OPERATION_COUNT + 3;
+	int REDEFINABLE_ELEMENT___IS_CONSISTENT_WITH__REDEFINABLEELEMENT = NAMED_ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Is Redefinition Context Valid</em>' operation.
@@ -26133,7 +26299,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_ELEMENT___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT = NAMED_ELEMENT_OPERATION_COUNT + 4;
+	int REDEFINABLE_ELEMENT___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT = NAMED_ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The number of operations of the '<em>Redefinable Element</em>' class.
@@ -27528,7 +27695,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT + 0;
+	int STRUCTURAL_FEATURE___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Lower Ge0</em>' operation.
@@ -27537,7 +27705,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE___VALIDATE_LOWER_GE0__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT + 1;
+	int STRUCTURAL_FEATURE___VALIDATE_LOWER_GE0__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Value Specification No Side Effects</em>' operation.
@@ -27546,7 +27715,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE___VALIDATE_VALUE_SPECIFICATION_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT + 2;
+	int STRUCTURAL_FEATURE___VALIDATE_VALUE_SPECIFICATION_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Value Specification Constant</em>' operation.
@@ -27555,7 +27725,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE___VALIDATE_VALUE_SPECIFICATION_CONSTANT__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT + 3;
+	int STRUCTURAL_FEATURE___VALIDATE_VALUE_SPECIFICATION_CONSTANT__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Lower Is Integer</em>' operation.
@@ -27564,7 +27735,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE___VALIDATE_LOWER_IS_INTEGER__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT + 4;
+	int STRUCTURAL_FEATURE___VALIDATE_LOWER_IS_INTEGER__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Upper Is Unlimited Natural</em>' operation.
@@ -27573,7 +27745,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE___VALIDATE_UPPER_IS_UNLIMITED_NATURAL__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT + 5;
+	int STRUCTURAL_FEATURE___VALIDATE_UPPER_IS_UNLIMITED_NATURAL__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Set Lower</em>' operation.
@@ -27600,7 +27773,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE___COMPATIBLE_WITH__MULTIPLICITYELEMENT = FEATURE_OPERATION_COUNT + 8;
+	int STRUCTURAL_FEATURE___COMPATIBLE_WITH__MULTIPLICITYELEMENT = FEATURE_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Includes Multiplicity</em>' operation.
@@ -27609,7 +27783,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT = FEATURE_OPERATION_COUNT + 9;
+	int STRUCTURAL_FEATURE___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT = FEATURE_OPERATION_COUNT
+		+ 9;
 
 	/**
 	 * The operation id for the '<em>Is</em>' operation.
@@ -27888,7 +28063,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY__OWNING_TEMPLATE_PARAMETER = STRUCTURAL_FEATURE_FEATURE_COUNT + 0;
+	int PROPERTY__OWNING_TEMPLATE_PARAMETER = STRUCTURAL_FEATURE_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
@@ -28743,7 +28919,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = STRUCTURAL_FEATURE_OPERATION_COUNT + 0;
+	int PROPERTY___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Is Template Parameter</em>' operation.
@@ -28752,7 +28929,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___IS_TEMPLATE_PARAMETER = STRUCTURAL_FEATURE_OPERATION_COUNT + 1;
+	int PROPERTY___IS_TEMPLATE_PARAMETER = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get Ends</em>' operation.
@@ -28770,7 +28948,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___GET_DEPLOYED_ELEMENTS = STRUCTURAL_FEATURE_OPERATION_COUNT + 3;
+	int PROPERTY___GET_DEPLOYED_ELEMENTS = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Subsetting Context Conforms</em>' operation.
@@ -28779,7 +28958,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___VALIDATE_SUBSETTING_CONTEXT_CONFORMS__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT + 4;
+	int PROPERTY___VALIDATE_SUBSETTING_CONTEXT_CONFORMS__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Derived Union Is Read Only</em>' operation.
@@ -28788,7 +28968,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___VALIDATE_DERIVED_UNION_IS_READ_ONLY__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT + 5;
+	int PROPERTY___VALIDATE_DERIVED_UNION_IS_READ_ONLY__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity Of Composite</em>' operation.
@@ -28797,7 +28978,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___VALIDATE_MULTIPLICITY_OF_COMPOSITE__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT + 6;
+	int PROPERTY___VALIDATE_MULTIPLICITY_OF_COMPOSITE__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Validate Redefined Property Inherited</em>' operation.
@@ -28806,7 +28988,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___VALIDATE_REDEFINED_PROPERTY_INHERITED__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT + 7;
+	int PROPERTY___VALIDATE_REDEFINED_PROPERTY_INHERITED__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The operation id for the '<em>Validate Subsetting Rules</em>' operation.
@@ -28815,7 +28998,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___VALIDATE_SUBSETTING_RULES__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT + 8;
+	int PROPERTY___VALIDATE_SUBSETTING_RULES__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Validate Binding To Attribute</em>' operation.
@@ -28824,7 +29008,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___VALIDATE_BINDING_TO_ATTRIBUTE__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT + 9;
+	int PROPERTY___VALIDATE_BINDING_TO_ATTRIBUTE__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 9;
 
 	/**
 	 * The operation id for the '<em>Validate Derived Union Is Derived</em>' operation.
@@ -28833,7 +29018,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___VALIDATE_DERIVED_UNION_IS_DERIVED__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT + 10;
+	int PROPERTY___VALIDATE_DERIVED_UNION_IS_DERIVED__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 10;
 
 	/**
 	 * The operation id for the '<em>Validate Deployment Target</em>' operation.
@@ -28842,7 +29028,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___VALIDATE_DEPLOYMENT_TARGET__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT + 11;
+	int PROPERTY___VALIDATE_DEPLOYMENT_TARGET__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 11;
 
 	/**
 	 * The operation id for the '<em>Validate Subsetted Property Names</em>' operation.
@@ -28851,7 +29038,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___VALIDATE_SUBSETTED_PROPERTY_NAMES__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT + 12;
+	int PROPERTY___VALIDATE_SUBSETTED_PROPERTY_NAMES__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 12;
 
 	/**
 	 * The operation id for the '<em>Validate Type Of Opposite End</em>' operation.
@@ -28860,7 +29048,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___VALIDATE_TYPE_OF_OPPOSITE_END__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT + 13;
+	int PROPERTY___VALIDATE_TYPE_OF_OPPOSITE_END__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 13;
 
 	/**
 	 * The operation id for the '<em>Validate Qualified Is Association End</em>' operation.
@@ -28869,7 +29058,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___VALIDATE_QUALIFIED_IS_ASSOCIATION_END__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT + 14;
+	int PROPERTY___VALIDATE_QUALIFIED_IS_ASSOCIATION_END__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 14;
 
 	/**
 	 * The operation id for the '<em>Get Default</em>' operation.
@@ -28905,7 +29095,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___SET_BOOLEAN_DEFAULT_VALUE__BOOLEAN = STRUCTURAL_FEATURE_OPERATION_COUNT + 18;
+	int PROPERTY___SET_BOOLEAN_DEFAULT_VALUE__BOOLEAN = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 18;
 
 	/**
 	 * The operation id for the '<em>Set Default</em>' operation.
@@ -28914,7 +29105,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___SET_DEFAULT__STRING = STRUCTURAL_FEATURE_OPERATION_COUNT + 19;
+	int PROPERTY___SET_DEFAULT__STRING = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 19;
 
 	/**
 	 * The operation id for the '<em>Set Integer Default Value</em>' operation.
@@ -28923,7 +29115,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___SET_INTEGER_DEFAULT_VALUE__INT = STRUCTURAL_FEATURE_OPERATION_COUNT + 20;
+	int PROPERTY___SET_INTEGER_DEFAULT_VALUE__INT = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 20;
 
 	/**
 	 * The operation id for the '<em>Set Is Composite</em>' operation.
@@ -28932,7 +29125,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___SET_IS_COMPOSITE__BOOLEAN = STRUCTURAL_FEATURE_OPERATION_COUNT + 21;
+	int PROPERTY___SET_IS_COMPOSITE__BOOLEAN = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 21;
 
 	/**
 	 * The operation id for the '<em>Set Is Navigable</em>' operation.
@@ -28941,7 +29135,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___SET_IS_NAVIGABLE__BOOLEAN = STRUCTURAL_FEATURE_OPERATION_COUNT + 22;
+	int PROPERTY___SET_IS_NAVIGABLE__BOOLEAN = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 22;
 
 	/**
 	 * The operation id for the '<em>Set Null Default Value</em>' operation.
@@ -28950,7 +29145,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___SET_NULL_DEFAULT_VALUE = STRUCTURAL_FEATURE_OPERATION_COUNT + 23;
+	int PROPERTY___SET_NULL_DEFAULT_VALUE = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 23;
 
 	/**
 	 * The operation id for the '<em>Set Opposite</em>' operation.
@@ -28959,7 +29155,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___SET_OPPOSITE__PROPERTY = STRUCTURAL_FEATURE_OPERATION_COUNT + 24;
+	int PROPERTY___SET_OPPOSITE__PROPERTY = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 24;
 
 	/**
 	 * The operation id for the '<em>Set Real Default Value</em>' operation.
@@ -28968,7 +29165,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___SET_REAL_DEFAULT_VALUE__DOUBLE = STRUCTURAL_FEATURE_OPERATION_COUNT + 25;
+	int PROPERTY___SET_REAL_DEFAULT_VALUE__DOUBLE = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 25;
 
 	/**
 	 * The operation id for the '<em>Set String Default Value</em>' operation.
@@ -28977,7 +29175,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___SET_STRING_DEFAULT_VALUE__STRING = STRUCTURAL_FEATURE_OPERATION_COUNT + 26;
+	int PROPERTY___SET_STRING_DEFAULT_VALUE__STRING = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 26;
 
 	/**
 	 * The operation id for the '<em>Set Unlimited Natural Default Value</em>' operation.
@@ -28986,7 +29185,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROPERTY___SET_UNLIMITED_NATURAL_DEFAULT_VALUE__INT = STRUCTURAL_FEATURE_OPERATION_COUNT + 27;
+	int PROPERTY___SET_UNLIMITED_NATURAL_DEFAULT_VALUE__INT = STRUCTURAL_FEATURE_OPERATION_COUNT
+		+ 27;
 
 	/**
 	 * The operation id for the '<em>Unset Default</em>' operation.
@@ -29733,7 +29933,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER = TYPED_ELEMENT_FEATURE_COUNT + 0;
+	int CONNECTABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER = TYPED_ELEMENT_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
@@ -29742,7 +29943,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTABLE_ELEMENT__TEMPLATE_PARAMETER = TYPED_ELEMENT_FEATURE_COUNT + 1;
+	int CONNECTABLE_ELEMENT__TEMPLATE_PARAMETER = TYPED_ELEMENT_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>End</b></em>' reference list.
@@ -30228,7 +30430,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTABLE_ELEMENT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = TYPED_ELEMENT_OPERATION_COUNT + 0;
+	int CONNECTABLE_ELEMENT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = TYPED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Is Template Parameter</em>' operation.
@@ -30237,7 +30440,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTABLE_ELEMENT___IS_TEMPLATE_PARAMETER = TYPED_ELEMENT_OPERATION_COUNT + 1;
+	int CONNECTABLE_ELEMENT___IS_TEMPLATE_PARAMETER = TYPED_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get Ends</em>' operation.
@@ -30696,7 +30900,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MULTIPLICITY_ELEMENT___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 0;
+	int MULTIPLICITY_ELEMENT___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Lower Ge0</em>' operation.
@@ -30705,7 +30910,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MULTIPLICITY_ELEMENT___VALIDATE_LOWER_GE0__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 1;
+	int MULTIPLICITY_ELEMENT___VALIDATE_LOWER_GE0__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Value Specification No Side Effects</em>' operation.
@@ -30714,7 +30920,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MULTIPLICITY_ELEMENT___VALIDATE_VALUE_SPECIFICATION_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 2;
+	int MULTIPLICITY_ELEMENT___VALIDATE_VALUE_SPECIFICATION_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Value Specification Constant</em>' operation.
@@ -30723,7 +30930,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MULTIPLICITY_ELEMENT___VALIDATE_VALUE_SPECIFICATION_CONSTANT__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 3;
+	int MULTIPLICITY_ELEMENT___VALIDATE_VALUE_SPECIFICATION_CONSTANT__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Lower Is Integer</em>' operation.
@@ -30732,7 +30940,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MULTIPLICITY_ELEMENT___VALIDATE_LOWER_IS_INTEGER__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 4;
+	int MULTIPLICITY_ELEMENT___VALIDATE_LOWER_IS_INTEGER__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Upper Is Unlimited Natural</em>' operation.
@@ -30741,7 +30950,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MULTIPLICITY_ELEMENT___VALIDATE_UPPER_IS_UNLIMITED_NATURAL__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 5;
+	int MULTIPLICITY_ELEMENT___VALIDATE_UPPER_IS_UNLIMITED_NATURAL__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Set Lower</em>' operation.
@@ -30768,7 +30978,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MULTIPLICITY_ELEMENT___COMPATIBLE_WITH__MULTIPLICITYELEMENT = ELEMENT_OPERATION_COUNT + 8;
+	int MULTIPLICITY_ELEMENT___COMPATIBLE_WITH__MULTIPLICITYELEMENT = ELEMENT_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Includes Multiplicity</em>' operation.
@@ -30777,7 +30988,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MULTIPLICITY_ELEMENT___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT = ELEMENT_OPERATION_COUNT + 9;
+	int MULTIPLICITY_ELEMENT___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT = ELEMENT_OPERATION_COUNT
+		+ 9;
 
 	/**
 	 * The operation id for the '<em>Is</em>' operation.
@@ -31452,7 +31664,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTOR_END___VALIDATE_ROLE_AND_PART_WITH_PORT__DIAGNOSTICCHAIN_MAP = MULTIPLICITY_ELEMENT_OPERATION_COUNT + 0;
+	int CONNECTOR_END___VALIDATE_ROLE_AND_PART_WITH_PORT__DIAGNOSTICCHAIN_MAP = MULTIPLICITY_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Part With Port Empty</em>' operation.
@@ -31461,7 +31674,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTOR_END___VALIDATE_PART_WITH_PORT_EMPTY__DIAGNOSTICCHAIN_MAP = MULTIPLICITY_ELEMENT_OPERATION_COUNT + 1;
+	int CONNECTOR_END___VALIDATE_PART_WITH_PORT_EMPTY__DIAGNOSTICCHAIN_MAP = MULTIPLICITY_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity</em>' operation.
@@ -31470,7 +31684,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTOR_END___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = MULTIPLICITY_ELEMENT_OPERATION_COUNT + 2;
+	int CONNECTOR_END___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = MULTIPLICITY_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Self Part With Port</em>' operation.
@@ -31479,7 +31694,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTOR_END___VALIDATE_SELF_PART_WITH_PORT__DIAGNOSTICCHAIN_MAP = MULTIPLICITY_ELEMENT_OPERATION_COUNT + 3;
+	int CONNECTOR_END___VALIDATE_SELF_PART_WITH_PORT__DIAGNOSTICCHAIN_MAP = MULTIPLICITY_ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Get Defining End</em>' operation.
@@ -31488,7 +31704,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTOR_END___GET_DEFINING_END = MULTIPLICITY_ELEMENT_OPERATION_COUNT + 4;
+	int CONNECTOR_END___GET_DEFINING_END = MULTIPLICITY_ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The number of operations of the '<em>Connector End</em>' class.
@@ -31497,7 +31714,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTOR_END_OPERATION_COUNT = MULTIPLICITY_ELEMENT_OPERATION_COUNT + 5;
+	int CONNECTOR_END_OPERATION_COUNT = MULTIPLICITY_ELEMENT_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -31623,7 +31841,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VALUE_SPECIFICATION_FEATURE_COUNT = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 1;
+	int VALUE_SPECIFICATION_FEATURE_COUNT = PACKAGEABLE_ELEMENT_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -32118,7 +32337,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VALUE_SPECIFICATION___BOOLEAN_VALUE = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 0;
+	int VALUE_SPECIFICATION___BOOLEAN_VALUE = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Integer Value</em>' operation.
@@ -32127,7 +32347,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VALUE_SPECIFICATION___INTEGER_VALUE = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 1;
+	int VALUE_SPECIFICATION___INTEGER_VALUE = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Is Computable</em>' operation.
@@ -32136,7 +32357,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VALUE_SPECIFICATION___IS_COMPUTABLE = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 2;
+	int VALUE_SPECIFICATION___IS_COMPUTABLE = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Is Null</em>' operation.
@@ -32154,7 +32376,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VALUE_SPECIFICATION___REAL_VALUE = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 4;
+	int VALUE_SPECIFICATION___REAL_VALUE = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>String Value</em>' operation.
@@ -32163,7 +32386,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VALUE_SPECIFICATION___STRING_VALUE = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 5;
+	int VALUE_SPECIFICATION___STRING_VALUE = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Unlimited Value</em>' operation.
@@ -32172,7 +32396,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VALUE_SPECIFICATION___UNLIMITED_VALUE = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 6;
+	int VALUE_SPECIFICATION___UNLIMITED_VALUE = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The number of operations of the '<em>Value Specification</em>' class.
@@ -32181,7 +32406,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VALUE_SPECIFICATION_OPERATION_COUNT = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 7;
+	int VALUE_SPECIFICATION_OPERATION_COUNT = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -32271,7 +32497,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER_FEATURE_COUNT = TEMPLATE_PARAMETER_FEATURE_COUNT + 0;
+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER_FEATURE_COUNT = TEMPLATE_PARAMETER_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -32622,7 +32849,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER_OPERATION_COUNT = TEMPLATE_PARAMETER_OPERATION_COUNT + 0;
+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER_OPERATION_COUNT = TEMPLATE_PARAMETER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -33207,7 +33435,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DEPLOYMENT_TARGET___GET_DEPLOYED_ELEMENTS = NAMED_ELEMENT_OPERATION_COUNT + 0;
+	int DEPLOYMENT_TARGET___GET_DEPLOYED_ELEMENTS = NAMED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Deployment Target</em>' class.
@@ -35898,7 +36127,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ARTIFACT___CREATE_OWNED_ATTRIBUTE__STRING_TYPE_INT_INT = CLASSIFIER_OPERATION_COUNT + 0;
+	int ARTIFACT___CREATE_OWNED_ATTRIBUTE__STRING_TYPE_INT_INT = CLASSIFIER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Create Owned Operation</em>' operation.
@@ -35907,7 +36137,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ARTIFACT___CREATE_OWNED_OPERATION__STRING_ELIST_ELIST_TYPE = CLASSIFIER_OPERATION_COUNT + 1;
+	int ARTIFACT___CREATE_OWNED_OPERATION__STRING_ELIST_ELIST_TYPE = CLASSIFIER_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Artifact</em>' class.
@@ -36312,7 +36543,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DEPLOYMENT_SPECIFICATION__DEPLOYMENT_LOCATION = ARTIFACT_FEATURE_COUNT + 0;
+	int DEPLOYMENT_SPECIFICATION__DEPLOYMENT_LOCATION = ARTIFACT_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Execution Location</b></em>' attribute.
@@ -36321,7 +36553,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DEPLOYMENT_SPECIFICATION__EXECUTION_LOCATION = ARTIFACT_FEATURE_COUNT + 1;
+	int DEPLOYMENT_SPECIFICATION__EXECUTION_LOCATION = ARTIFACT_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Deployment</b></em>' container reference.
@@ -37302,7 +37535,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DEPLOYMENT_SPECIFICATION___VALIDATE_DEPLOYMENT_TARGET__DIAGNOSTICCHAIN_MAP = ARTIFACT_OPERATION_COUNT + 0;
+	int DEPLOYMENT_SPECIFICATION___VALIDATE_DEPLOYMENT_TARGET__DIAGNOSTICCHAIN_MAP = ARTIFACT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Deployed Elements</em>' operation.
@@ -37311,7 +37545,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DEPLOYMENT_SPECIFICATION___VALIDATE_DEPLOYED_ELEMENTS__DIAGNOSTICCHAIN_MAP = ARTIFACT_OPERATION_COUNT + 1;
+	int DEPLOYMENT_SPECIFICATION___VALIDATE_DEPLOYED_ELEMENTS__DIAGNOSTICCHAIN_MAP = ARTIFACT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Deployment Specification</em>' class.
@@ -39948,7 +40183,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPAQUE_EXPRESSION___VALIDATE_LANGUAGE_BODY_SIZE__DIAGNOSTICCHAIN_MAP = VALUE_SPECIFICATION_OPERATION_COUNT + 0;
+	int OPAQUE_EXPRESSION___VALIDATE_LANGUAGE_BODY_SIZE__DIAGNOSTICCHAIN_MAP = VALUE_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate One Return Result Parameter</em>' operation.
@@ -39957,7 +40193,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPAQUE_EXPRESSION___VALIDATE_ONE_RETURN_RESULT_PARAMETER__DIAGNOSTICCHAIN_MAP = VALUE_SPECIFICATION_OPERATION_COUNT + 1;
+	int OPAQUE_EXPRESSION___VALIDATE_ONE_RETURN_RESULT_PARAMETER__DIAGNOSTICCHAIN_MAP = VALUE_SPECIFICATION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Only Return Result Parameters</em>' operation.
@@ -39966,7 +40203,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPAQUE_EXPRESSION___VALIDATE_ONLY_RETURN_RESULT_PARAMETERS__DIAGNOSTICCHAIN_MAP = VALUE_SPECIFICATION_OPERATION_COUNT + 2;
+	int OPAQUE_EXPRESSION___VALIDATE_ONLY_RETURN_RESULT_PARAMETERS__DIAGNOSTICCHAIN_MAP = VALUE_SPECIFICATION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Is Integral</em>' operation.
@@ -39975,7 +40213,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPAQUE_EXPRESSION___IS_INTEGRAL = VALUE_SPECIFICATION_OPERATION_COUNT + 3;
+	int OPAQUE_EXPRESSION___IS_INTEGRAL = VALUE_SPECIFICATION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Is Non Negative</em>' operation.
@@ -39984,7 +40223,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPAQUE_EXPRESSION___IS_NON_NEGATIVE = VALUE_SPECIFICATION_OPERATION_COUNT + 4;
+	int OPAQUE_EXPRESSION___IS_NON_NEGATIVE = VALUE_SPECIFICATION_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Is Positive</em>' operation.
@@ -39993,7 +40233,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPAQUE_EXPRESSION___IS_POSITIVE = VALUE_SPECIFICATION_OPERATION_COUNT + 5;
+	int OPAQUE_EXPRESSION___IS_POSITIVE = VALUE_SPECIFICATION_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Get Result</em>' operation.
@@ -40002,7 +40243,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPAQUE_EXPRESSION___GET_RESULT = VALUE_SPECIFICATION_OPERATION_COUNT + 6;
+	int OPAQUE_EXPRESSION___GET_RESULT = VALUE_SPECIFICATION_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Value</em>' operation.
@@ -40020,7 +40262,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPAQUE_EXPRESSION_OPERATION_COUNT = VALUE_SPECIFICATION_OPERATION_COUNT + 8;
+	int OPAQUE_EXPRESSION_OPERATION_COUNT = VALUE_SPECIFICATION_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -40776,7 +41019,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 0;
+	int PARAMETER___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Lower Ge0</em>' operation.
@@ -40785,7 +41029,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___VALIDATE_LOWER_GE0__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 1;
+	int PARAMETER___VALIDATE_LOWER_GE0__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Value Specification No Side Effects</em>' operation.
@@ -40794,7 +41039,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___VALIDATE_VALUE_SPECIFICATION_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 2;
+	int PARAMETER___VALIDATE_VALUE_SPECIFICATION_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Value Specification Constant</em>' operation.
@@ -40803,7 +41049,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___VALIDATE_VALUE_SPECIFICATION_CONSTANT__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 3;
+	int PARAMETER___VALIDATE_VALUE_SPECIFICATION_CONSTANT__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Lower Is Integer</em>' operation.
@@ -40812,7 +41059,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___VALIDATE_LOWER_IS_INTEGER__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 4;
+	int PARAMETER___VALIDATE_LOWER_IS_INTEGER__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Upper Is Unlimited Natural</em>' operation.
@@ -40821,7 +41069,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___VALIDATE_UPPER_IS_UNLIMITED_NATURAL__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 5;
+	int PARAMETER___VALIDATE_UPPER_IS_UNLIMITED_NATURAL__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Set Lower</em>' operation.
@@ -40848,7 +41097,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___COMPATIBLE_WITH__MULTIPLICITYELEMENT = CONNECTABLE_ELEMENT_OPERATION_COUNT + 8;
+	int PARAMETER___COMPATIBLE_WITH__MULTIPLICITYELEMENT = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Includes Multiplicity</em>' operation.
@@ -40857,7 +41107,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT = CONNECTABLE_ELEMENT_OPERATION_COUNT + 9;
+	int PARAMETER___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 9;
 
 	/**
 	 * The operation id for the '<em>Is</em>' operation.
@@ -40920,7 +41171,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___VALIDATE_IN_AND_OUT__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 16;
+	int PARAMETER___VALIDATE_IN_AND_OUT__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 16;
 
 	/**
 	 * The operation id for the '<em>Validate Not Exception</em>' operation.
@@ -40929,7 +41181,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___VALIDATE_NOT_EXCEPTION__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 17;
+	int PARAMETER___VALIDATE_NOT_EXCEPTION__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 17;
 
 	/**
 	 * The operation id for the '<em>Validate Connector End</em>' operation.
@@ -40938,7 +41191,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___VALIDATE_CONNECTOR_END__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 18;
+	int PARAMETER___VALIDATE_CONNECTOR_END__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 18;
 
 	/**
 	 * The operation id for the '<em>Validate Reentrant Behaviors</em>' operation.
@@ -40947,7 +41201,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___VALIDATE_REENTRANT_BEHAVIORS__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 19;
+	int PARAMETER___VALIDATE_REENTRANT_BEHAVIORS__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 19;
 
 	/**
 	 * The operation id for the '<em>Validate Stream And Exception</em>' operation.
@@ -40956,7 +41211,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___VALIDATE_STREAM_AND_EXCEPTION__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 20;
+	int PARAMETER___VALIDATE_STREAM_AND_EXCEPTION__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 20;
 
 	/**
 	 * The operation id for the '<em>Validate Object Effect</em>' operation.
@@ -40965,7 +41221,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___VALIDATE_OBJECT_EFFECT__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 21;
+	int PARAMETER___VALIDATE_OBJECT_EFFECT__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 21;
 
 	/**
 	 * The operation id for the '<em>Is Set Default</em>' operation.
@@ -40983,7 +41240,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___SET_BOOLEAN_DEFAULT_VALUE__BOOLEAN = CONNECTABLE_ELEMENT_OPERATION_COUNT + 23;
+	int PARAMETER___SET_BOOLEAN_DEFAULT_VALUE__BOOLEAN = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 23;
 
 	/**
 	 * The operation id for the '<em>Set Default</em>' operation.
@@ -40992,7 +41250,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___SET_DEFAULT__STRING = CONNECTABLE_ELEMENT_OPERATION_COUNT + 24;
+	int PARAMETER___SET_DEFAULT__STRING = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 24;
 
 	/**
 	 * The operation id for the '<em>Set Integer Default Value</em>' operation.
@@ -41001,7 +41260,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___SET_INTEGER_DEFAULT_VALUE__INT = CONNECTABLE_ELEMENT_OPERATION_COUNT + 25;
+	int PARAMETER___SET_INTEGER_DEFAULT_VALUE__INT = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 25;
 
 	/**
 	 * The operation id for the '<em>Set Null Default Value</em>' operation.
@@ -41010,7 +41270,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___SET_NULL_DEFAULT_VALUE = CONNECTABLE_ELEMENT_OPERATION_COUNT + 26;
+	int PARAMETER___SET_NULL_DEFAULT_VALUE = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 26;
 
 	/**
 	 * The operation id for the '<em>Set Real Default Value</em>' operation.
@@ -41019,7 +41280,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___SET_REAL_DEFAULT_VALUE__DOUBLE = CONNECTABLE_ELEMENT_OPERATION_COUNT + 27;
+	int PARAMETER___SET_REAL_DEFAULT_VALUE__DOUBLE = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 27;
 
 	/**
 	 * The operation id for the '<em>Set String Default Value</em>' operation.
@@ -41028,7 +41290,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___SET_STRING_DEFAULT_VALUE__STRING = CONNECTABLE_ELEMENT_OPERATION_COUNT + 28;
+	int PARAMETER___SET_STRING_DEFAULT_VALUE__STRING = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 28;
 
 	/**
 	 * The operation id for the '<em>Set Unlimited Natural Default Value</em>' operation.
@@ -41037,7 +41300,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER___SET_UNLIMITED_NATURAL_DEFAULT_VALUE__INT = CONNECTABLE_ELEMENT_OPERATION_COUNT + 29;
+	int PARAMETER___SET_UNLIMITED_NATURAL_DEFAULT_VALUE__INT = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 29;
 
 	/**
 	 * The operation id for the '<em>Unset Default</em>' operation.
@@ -41901,7 +42165,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIORAL_FEATURE___VALIDATE_REDEFINITION_CONSISTENT__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 0;
+	int BEHAVIORAL_FEATURE___VALIDATE_REDEFINITION_CONSISTENT__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Non Leaf Redefinition</em>' operation.
@@ -41910,7 +42175,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIORAL_FEATURE___VALIDATE_NON_LEAF_REDEFINITION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 1;
+	int BEHAVIORAL_FEATURE___VALIDATE_NON_LEAF_REDEFINITION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Redefinition Context Valid</em>' operation.
@@ -41919,7 +42185,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIORAL_FEATURE___VALIDATE_REDEFINITION_CONTEXT_VALID__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 2;
+	int BEHAVIORAL_FEATURE___VALIDATE_REDEFINITION_CONTEXT_VALID__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Is Consistent With</em>' operation.
@@ -41928,7 +42195,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIORAL_FEATURE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT + 3;
+	int BEHAVIORAL_FEATURE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Is Redefinition Context Valid</em>' operation.
@@ -41937,7 +42205,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIORAL_FEATURE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT + 4;
+	int BEHAVIORAL_FEATURE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Abstract No Method</em>' operation.
@@ -41946,7 +42215,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIORAL_FEATURE___VALIDATE_ABSTRACT_NO_METHOD__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 5;
+	int BEHAVIORAL_FEATURE___VALIDATE_ABSTRACT_NO_METHOD__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Create Return Result</em>' operation.
@@ -41955,7 +42225,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIORAL_FEATURE___CREATE_RETURN_RESULT__STRING_TYPE = NAMESPACE_OPERATION_COUNT + 6;
+	int BEHAVIORAL_FEATURE___CREATE_RETURN_RESULT__STRING_TYPE = NAMESPACE_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Input Parameters</em>' operation.
@@ -42234,7 +42505,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPERATION__OWNING_TEMPLATE_PARAMETER = BEHAVIORAL_FEATURE_FEATURE_COUNT + 0;
+	int OPERATION__OWNING_TEMPLATE_PARAMETER = BEHAVIORAL_FEATURE_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
@@ -42261,7 +42533,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPERATION__OWNED_TEMPLATE_SIGNATURE = BEHAVIORAL_FEATURE_FEATURE_COUNT + 3;
+	int OPERATION__OWNED_TEMPLATE_SIGNATURE = BEHAVIORAL_FEATURE_FEATURE_COUNT
+		+ 3;
 
 	/**
 	 * The feature id for the '<em><b>Body Condition</b></em>' reference.
@@ -43053,7 +43326,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPERATION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = BEHAVIORAL_FEATURE_OPERATION_COUNT + 0;
+	int OPERATION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = BEHAVIORAL_FEATURE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Is Template Parameter</em>' operation.
@@ -43062,7 +43336,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPERATION___IS_TEMPLATE_PARAMETER = BEHAVIORAL_FEATURE_OPERATION_COUNT + 1;
+	int OPERATION___IS_TEMPLATE_PARAMETER = BEHAVIORAL_FEATURE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Is Template</em>' operation.
@@ -43080,7 +43355,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPERATION___PARAMETERABLE_ELEMENTS = BEHAVIORAL_FEATURE_OPERATION_COUNT + 3;
+	int OPERATION___PARAMETERABLE_ELEMENTS = BEHAVIORAL_FEATURE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate At Most One Return</em>' operation.
@@ -43089,7 +43365,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPERATION___VALIDATE_AT_MOST_ONE_RETURN__DIAGNOSTICCHAIN_MAP = BEHAVIORAL_FEATURE_OPERATION_COUNT + 4;
+	int OPERATION___VALIDATE_AT_MOST_ONE_RETURN__DIAGNOSTICCHAIN_MAP = BEHAVIORAL_FEATURE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Only Body For Query</em>' operation.
@@ -43098,7 +43375,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPERATION___VALIDATE_ONLY_BODY_FOR_QUERY__DIAGNOSTICCHAIN_MAP = BEHAVIORAL_FEATURE_OPERATION_COUNT + 5;
+	int OPERATION___VALIDATE_ONLY_BODY_FOR_QUERY__DIAGNOSTICCHAIN_MAP = BEHAVIORAL_FEATURE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Get Return Result</em>' operation.
@@ -43116,7 +43394,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPERATION___SET_IS_ORDERED__BOOLEAN = BEHAVIORAL_FEATURE_OPERATION_COUNT + 7;
+	int OPERATION___SET_IS_ORDERED__BOOLEAN = BEHAVIORAL_FEATURE_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The operation id for the '<em>Set Is Unique</em>' operation.
@@ -43125,7 +43404,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPERATION___SET_IS_UNIQUE__BOOLEAN = BEHAVIORAL_FEATURE_OPERATION_COUNT + 8;
+	int OPERATION___SET_IS_UNIQUE__BOOLEAN = BEHAVIORAL_FEATURE_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Set Lower</em>' operation.
@@ -43800,7 +44080,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER_SET___VALIDATE_SAME_PARAMETERIZED_ENTITY__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 0;
+	int PARAMETER_SET___VALIDATE_SAME_PARAMETERIZED_ENTITY__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Input</em>' operation.
@@ -43809,7 +44090,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER_SET___VALIDATE_INPUT__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 1;
+	int PARAMETER_SET___VALIDATE_INPUT__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Two Parameter Sets</em>' operation.
@@ -43818,7 +44100,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PARAMETER_SET___VALIDATE_TWO_PARAMETER_SETS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 2;
+	int PARAMETER_SET___VALIDATE_TWO_PARAMETER_SETS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Parameter Set</em>' class.
@@ -44466,7 +44749,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONSTRAINT___VALIDATE_BOOLEAN_VALUE__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 0;
+	int CONSTRAINT___VALIDATE_BOOLEAN_VALUE__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate No Side Effects</em>' operation.
@@ -44475,7 +44759,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONSTRAINT___VALIDATE_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 1;
+	int CONSTRAINT___VALIDATE_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Not Apply To Self</em>' operation.
@@ -44484,7 +44769,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONSTRAINT___VALIDATE_NOT_APPLY_TO_SELF__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 2;
+	int CONSTRAINT___VALIDATE_NOT_APPLY_TO_SELF__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Constraint</em>' class.
@@ -45807,7 +46093,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DATA_TYPE___CREATE_OWNED_ATTRIBUTE__STRING_TYPE_INT_INT = CLASSIFIER_OPERATION_COUNT + 0;
+	int DATA_TYPE___CREATE_OWNED_ATTRIBUTE__STRING_TYPE_INT_INT = CLASSIFIER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Create Owned Operation</em>' operation.
@@ -45816,7 +46103,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DATA_TYPE___CREATE_OWNED_OPERATION__STRING_ELIST_ELIST_TYPE = CLASSIFIER_OPERATION_COUNT + 1;
+	int DATA_TYPE___CREATE_OWNED_OPERATION__STRING_ELIST_ELIST_TYPE = CLASSIFIER_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Data Type</em>' class.
@@ -47175,7 +47463,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERFACE___VALIDATE_VISIBILITY__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT + 0;
+	int INTERFACE___VALIDATE_VISIBILITY__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Create Owned Attribute</em>' operation.
@@ -47184,7 +47473,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERFACE___CREATE_OWNED_ATTRIBUTE__STRING_TYPE_INT_INT = CLASSIFIER_OPERATION_COUNT + 1;
+	int INTERFACE___CREATE_OWNED_ATTRIBUTE__STRING_TYPE_INT_INT = CLASSIFIER_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Create Owned Operation</em>' operation.
@@ -47193,7 +47483,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERFACE___CREATE_OWNED_OPERATION__STRING_ELIST_ELIST_TYPE = CLASSIFIER_OPERATION_COUNT + 2;
+	int INTERFACE___CREATE_OWNED_OPERATION__STRING_ELIST_ELIST_TYPE = CLASSIFIER_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Interface</em>' class.
@@ -48129,7 +48420,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int RECEPTION___VALIDATE_SAME_NAME_AS_SIGNAL__DIAGNOSTICCHAIN_MAP = BEHAVIORAL_FEATURE_OPERATION_COUNT + 0;
+	int RECEPTION___VALIDATE_SAME_NAME_AS_SIGNAL__DIAGNOSTICCHAIN_MAP = BEHAVIORAL_FEATURE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Same Structure As Signal</em>' operation.
@@ -48138,7 +48430,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int RECEPTION___VALIDATE_SAME_STRUCTURE_AS_SIGNAL__DIAGNOSTICCHAIN_MAP = BEHAVIORAL_FEATURE_OPERATION_COUNT + 1;
+	int RECEPTION___VALIDATE_SAME_STRUCTURE_AS_SIGNAL__DIAGNOSTICCHAIN_MAP = BEHAVIORAL_FEATURE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Reception</em>' class.
@@ -49452,7 +49745,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SIGNAL___CREATE_OWNED_ATTRIBUTE__STRING_TYPE_INT_INT = CLASSIFIER_OPERATION_COUNT + 0;
+	int SIGNAL___CREATE_OWNED_ATTRIBUTE__STRING_TYPE_INT_INT = CLASSIFIER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Signal</em>' class.
@@ -51162,7 +51456,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE___VALIDATE_CONNECTION_POINTS__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT + 0;
+	int STATE_MACHINE___VALIDATE_CONNECTION_POINTS__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Classifier Context</em>' operation.
@@ -51171,7 +51466,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE___VALIDATE_CLASSIFIER_CONTEXT__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT + 1;
+	int STATE_MACHINE___VALIDATE_CLASSIFIER_CONTEXT__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Method</em>' operation.
@@ -51180,7 +51476,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE___VALIDATE_METHOD__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT + 2;
+	int STATE_MACHINE___VALIDATE_METHOD__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Context Classifier</em>' operation.
@@ -51189,7 +51486,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE___VALIDATE_CONTEXT_CLASSIFIER__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT + 3;
+	int STATE_MACHINE___VALIDATE_CONTEXT_CLASSIFIER__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>LCA</em>' operation.
@@ -52998,7 +53296,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROTOCOL_STATE_MACHINE___VALIDATE_DEEP_OR_SHALLOW_HISTORY__DIAGNOSTICCHAIN_MAP = STATE_MACHINE_OPERATION_COUNT + 0;
+	int PROTOCOL_STATE_MACHINE___VALIDATE_DEEP_OR_SHALLOW_HISTORY__DIAGNOSTICCHAIN_MAP = STATE_MACHINE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Entry Exit Do</em>' operation.
@@ -53007,7 +53306,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROTOCOL_STATE_MACHINE___VALIDATE_ENTRY_EXIT_DO__DIAGNOSTICCHAIN_MAP = STATE_MACHINE_OPERATION_COUNT + 1;
+	int PROTOCOL_STATE_MACHINE___VALIDATE_ENTRY_EXIT_DO__DIAGNOSTICCHAIN_MAP = STATE_MACHINE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Protocol Transitions</em>' operation.
@@ -53016,7 +53316,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROTOCOL_STATE_MACHINE___VALIDATE_PROTOCOL_TRANSITIONS__DIAGNOSTICCHAIN_MAP = STATE_MACHINE_OPERATION_COUNT + 2;
+	int PROTOCOL_STATE_MACHINE___VALIDATE_PROTOCOL_TRANSITIONS__DIAGNOSTICCHAIN_MAP = STATE_MACHINE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Protocol State Machine</em>' class.
@@ -53025,7 +53326,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROTOCOL_STATE_MACHINE_OPERATION_COUNT = STATE_MACHINE_OPERATION_COUNT + 3;
+	int PROTOCOL_STATE_MACHINE_OPERATION_COUNT = STATE_MACHINE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -53646,7 +53948,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VERTEX___IS_CONTAINED_IN_STATE__STATE = NAMED_ELEMENT_OPERATION_COUNT + 3;
+	int VERTEX___IS_CONTAINED_IN_STATE__STATE = NAMED_ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Is Contained In Region</em>' operation.
@@ -53655,7 +53958,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VERTEX___IS_CONTAINED_IN_REGION__REGION = NAMED_ELEMENT_OPERATION_COUNT + 4;
+	int VERTEX___IS_CONTAINED_IN_REGION__REGION = NAMED_ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The number of operations of the '<em>Vertex</em>' class.
@@ -54330,7 +54634,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PSEUDOSTATE___VALIDATE_TRANSITIONS_OUTGOING__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT + 0;
+	int PSEUDOSTATE___VALIDATE_TRANSITIONS_OUTGOING__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Choice Vertex</em>' operation.
@@ -54339,7 +54644,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PSEUDOSTATE___VALIDATE_CHOICE_VERTEX__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT + 1;
+	int PSEUDOSTATE___VALIDATE_CHOICE_VERTEX__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Outgoing From Initial</em>' operation.
@@ -54348,7 +54654,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PSEUDOSTATE___VALIDATE_OUTGOING_FROM_INITIAL__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT + 2;
+	int PSEUDOSTATE___VALIDATE_OUTGOING_FROM_INITIAL__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Join Vertex</em>' operation.
@@ -54357,7 +54664,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PSEUDOSTATE___VALIDATE_JOIN_VERTEX__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT + 3;
+	int PSEUDOSTATE___VALIDATE_JOIN_VERTEX__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Junction Vertex</em>' operation.
@@ -54366,7 +54674,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PSEUDOSTATE___VALIDATE_JUNCTION_VERTEX__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT + 4;
+	int PSEUDOSTATE___VALIDATE_JUNCTION_VERTEX__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate History Vertices</em>' operation.
@@ -54375,7 +54684,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PSEUDOSTATE___VALIDATE_HISTORY_VERTICES__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT + 5;
+	int PSEUDOSTATE___VALIDATE_HISTORY_VERTICES__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Validate Initial Vertex</em>' operation.
@@ -54384,7 +54694,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PSEUDOSTATE___VALIDATE_INITIAL_VERTEX__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT + 6;
+	int PSEUDOSTATE___VALIDATE_INITIAL_VERTEX__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Validate Fork Vertex</em>' operation.
@@ -54393,7 +54704,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PSEUDOSTATE___VALIDATE_FORK_VERTEX__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT + 7;
+	int PSEUDOSTATE___VALIDATE_FORK_VERTEX__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The operation id for the '<em>Validate Transitions Incoming</em>' operation.
@@ -54402,7 +54714,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PSEUDOSTATE___VALIDATE_TRANSITIONS_INCOMING__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT + 8;
+	int PSEUDOSTATE___VALIDATE_TRANSITIONS_INCOMING__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The number of operations of the '<em>Pseudostate</em>' class.
@@ -55221,7 +55534,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REGION___VALIDATE_REDEFINITION_CONSISTENT__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 0;
+	int REGION___VALIDATE_REDEFINITION_CONSISTENT__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Non Leaf Redefinition</em>' operation.
@@ -55230,7 +55544,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REGION___VALIDATE_NON_LEAF_REDEFINITION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 1;
+	int REGION___VALIDATE_NON_LEAF_REDEFINITION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Redefinition Context Valid</em>' operation.
@@ -55239,7 +55554,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REGION___VALIDATE_REDEFINITION_CONTEXT_VALID__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 2;
+	int REGION___VALIDATE_REDEFINITION_CONTEXT_VALID__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Is Consistent With</em>' operation.
@@ -55248,7 +55564,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REGION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT + 3;
+	int REGION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Is Redefinition Context Valid</em>' operation.
@@ -55257,7 +55574,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REGION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT + 4;
+	int REGION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Deep History Vertex</em>' operation.
@@ -55266,7 +55584,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REGION___VALIDATE_DEEP_HISTORY_VERTEX__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 5;
+	int REGION___VALIDATE_DEEP_HISTORY_VERTEX__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Validate Shallow History Vertex</em>' operation.
@@ -55275,7 +55594,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REGION___VALIDATE_SHALLOW_HISTORY_VERTEX__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 6;
+	int REGION___VALIDATE_SHALLOW_HISTORY_VERTEX__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Validate Owned</em>' operation.
@@ -55284,7 +55604,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REGION___VALIDATE_OWNED__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 7;
+	int REGION___VALIDATE_OWNED__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The operation id for the '<em>Validate Initial Vertex</em>' operation.
@@ -55293,7 +55614,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REGION___VALIDATE_INITIAL_VERTEX__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 8;
+	int REGION___VALIDATE_INITIAL_VERTEX__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Belongs To PSM</em>' operation.
@@ -56247,7 +56569,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE___VALIDATE_REDEFINITION_CONSISTENT__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 0;
+	int STATE___VALIDATE_REDEFINITION_CONSISTENT__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Non Leaf Redefinition</em>' operation.
@@ -56256,7 +56579,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE___VALIDATE_NON_LEAF_REDEFINITION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 1;
+	int STATE___VALIDATE_NON_LEAF_REDEFINITION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Redefinition Context Valid</em>' operation.
@@ -56265,7 +56589,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE___VALIDATE_REDEFINITION_CONTEXT_VALID__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 2;
+	int STATE___VALIDATE_REDEFINITION_CONTEXT_VALID__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Is Consistent With</em>' operation.
@@ -56274,7 +56599,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT + 3;
+	int STATE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Is Redefinition Context Valid</em>' operation.
@@ -56283,7 +56609,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT + 4;
+	int STATE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Containing State Machine</em>' operation.
@@ -56337,7 +56664,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE___VALIDATE_ENTRY_OR_EXIT__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 10;
+	int STATE___VALIDATE_ENTRY_OR_EXIT__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 10;
 
 	/**
 	 * The operation id for the '<em>Validate Submachine States</em>' operation.
@@ -56346,7 +56674,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE___VALIDATE_SUBMACHINE_STATES__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 11;
+	int STATE___VALIDATE_SUBMACHINE_STATES__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 11;
 
 	/**
 	 * The operation id for the '<em>Validate Composite States</em>' operation.
@@ -56355,7 +56684,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE___VALIDATE_COMPOSITE_STATES__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 12;
+	int STATE___VALIDATE_COMPOSITE_STATES__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 12;
 
 	/**
 	 * The operation id for the '<em>Validate Destinations Or Sources Of Transitions</em>' operation.
@@ -56364,7 +56694,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE___VALIDATE_DESTINATIONS_OR_SOURCES_OF_TRANSITIONS__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 13;
+	int STATE___VALIDATE_DESTINATIONS_OR_SOURCES_OF_TRANSITIONS__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 13;
 
 	/**
 	 * The operation id for the '<em>Validate Submachine Or Regions</em>' operation.
@@ -56373,7 +56704,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE___VALIDATE_SUBMACHINE_OR_REGIONS__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 14;
+	int STATE___VALIDATE_SUBMACHINE_OR_REGIONS__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 14;
 
 	/**
 	 * The operation id for the '<em>Is Composite</em>' operation.
@@ -57093,7 +57425,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTION_POINT_REFERENCE___VALIDATE_EXIT_PSEUDOSTATES__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT + 0;
+	int CONNECTION_POINT_REFERENCE___VALIDATE_EXIT_PSEUDOSTATES__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Entry Pseudostates</em>' operation.
@@ -57102,7 +57435,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTION_POINT_REFERENCE___VALIDATE_ENTRY_PSEUDOSTATES__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT + 1;
+	int CONNECTION_POINT_REFERENCE___VALIDATE_ENTRY_PSEUDOSTATES__DIAGNOSTICCHAIN_MAP = VERTEX_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Connection Point Reference</em>' class.
@@ -57696,7 +58030,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRIGGER___VALIDATE_TRIGGER_WITH_PORTS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 0;
+	int TRIGGER___VALIDATE_TRIGGER_WITH_PORTS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Trigger</em>' class.
@@ -59757,7 +60092,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PORT___VALIDATE_PORT_AGGREGATION__DIAGNOSTICCHAIN_MAP = PROPERTY_OPERATION_COUNT + 0;
+	int PORT___VALIDATE_PORT_AGGREGATION__DIAGNOSTICCHAIN_MAP = PROPERTY_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Default Value</em>' operation.
@@ -59766,7 +60102,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PORT___VALIDATE_DEFAULT_VALUE__DIAGNOSTICCHAIN_MAP = PROPERTY_OPERATION_COUNT + 1;
+	int PORT___VALIDATE_DEFAULT_VALUE__DIAGNOSTICCHAIN_MAP = PROPERTY_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Encapsulated Owner</em>' operation.
@@ -59775,7 +60112,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PORT___VALIDATE_ENCAPSULATED_OWNER__DIAGNOSTICCHAIN_MAP = PROPERTY_OPERATION_COUNT + 2;
+	int PORT___VALIDATE_ENCAPSULATED_OWNER__DIAGNOSTICCHAIN_MAP = PROPERTY_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get Provideds</em>' operation.
@@ -60657,7 +60995,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___VALIDATE_REDEFINITION_CONSISTENT__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 0;
+	int TRANSITION___VALIDATE_REDEFINITION_CONSISTENT__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Non Leaf Redefinition</em>' operation.
@@ -60666,7 +61005,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___VALIDATE_NON_LEAF_REDEFINITION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 1;
+	int TRANSITION___VALIDATE_NON_LEAF_REDEFINITION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Redefinition Context Valid</em>' operation.
@@ -60675,7 +61015,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___VALIDATE_REDEFINITION_CONTEXT_VALID__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 2;
+	int TRANSITION___VALIDATE_REDEFINITION_CONTEXT_VALID__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Is Consistent With</em>' operation.
@@ -60684,7 +61025,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT + 3;
+	int TRANSITION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Is Redefinition Context Valid</em>' operation.
@@ -60693,7 +61035,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT + 4;
+	int TRANSITION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT = NAMESPACE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate State Is External</em>' operation.
@@ -60702,7 +61045,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___VALIDATE_STATE_IS_EXTERNAL__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 5;
+	int TRANSITION___VALIDATE_STATE_IS_EXTERNAL__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Validate Join Segment Guards</em>' operation.
@@ -60711,7 +61055,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___VALIDATE_JOIN_SEGMENT_GUARDS__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 6;
+	int TRANSITION___VALIDATE_JOIN_SEGMENT_GUARDS__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Validate State Is Internal</em>' operation.
@@ -60720,7 +61065,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___VALIDATE_STATE_IS_INTERNAL__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 7;
+	int TRANSITION___VALIDATE_STATE_IS_INTERNAL__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The operation id for the '<em>Validate Outgoing Pseudostates</em>' operation.
@@ -60729,7 +61075,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___VALIDATE_OUTGOING_PSEUDOSTATES__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 8;
+	int TRANSITION___VALIDATE_OUTGOING_PSEUDOSTATES__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Validate Join Segment State</em>' operation.
@@ -60738,7 +61085,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___VALIDATE_JOIN_SEGMENT_STATE__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 9;
+	int TRANSITION___VALIDATE_JOIN_SEGMENT_STATE__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 9;
 
 	/**
 	 * The operation id for the '<em>Validate Fork Segment State</em>' operation.
@@ -60747,7 +61095,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___VALIDATE_FORK_SEGMENT_STATE__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 10;
+	int TRANSITION___VALIDATE_FORK_SEGMENT_STATE__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 10;
 
 	/**
 	 * The operation id for the '<em>Validate State Is Local</em>' operation.
@@ -60756,7 +61105,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___VALIDATE_STATE_IS_LOCAL__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 11;
+	int TRANSITION___VALIDATE_STATE_IS_LOCAL__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 11;
 
 	/**
 	 * The operation id for the '<em>Validate Initial Transition</em>' operation.
@@ -60765,7 +61115,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___VALIDATE_INITIAL_TRANSITION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 12;
+	int TRANSITION___VALIDATE_INITIAL_TRANSITION__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 12;
 
 	/**
 	 * The operation id for the '<em>Validate Fork Segment Guards</em>' operation.
@@ -60774,7 +61125,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TRANSITION___VALIDATE_FORK_SEGMENT_GUARDS__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 13;
+	int TRANSITION___VALIDATE_FORK_SEGMENT_GUARDS__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 13;
 
 	/**
 	 * The operation id for the '<em>Containing State Machine</em>' operation.
@@ -60873,7 +61225,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROTOCOL_CONFORMANCE__GENERAL_MACHINE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 0;
+	int PROTOCOL_CONFORMANCE__GENERAL_MACHINE = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Specific Machine</b></em>' container reference.
@@ -60882,7 +61235,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROTOCOL_CONFORMANCE__SPECIFIC_MACHINE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 1;
+	int PROTOCOL_CONFORMANCE__SPECIFIC_MACHINE = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Protocol Conformance</em>' class.
@@ -60891,7 +61245,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROTOCOL_CONFORMANCE_FEATURE_COUNT = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 2;
+	int PROTOCOL_CONFORMANCE_FEATURE_COUNT = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -61233,7 +61588,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROTOCOL_CONFORMANCE_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 0;
+	int PROTOCOL_CONFORMANCE_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -61323,7 +61679,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPERATION_TEMPLATE_PARAMETER_FEATURE_COUNT = TEMPLATE_PARAMETER_FEATURE_COUNT + 0;
+	int OPERATION_TEMPLATE_PARAMETER_FEATURE_COUNT = TEMPLATE_PARAMETER_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -61674,7 +62031,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPERATION_TEMPLATE_PARAMETER___VALIDATE_MATCH_DEFAULT_SIGNATURE__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT + 0;
+	int OPERATION_TEMPLATE_PARAMETER___VALIDATE_MATCH_DEFAULT_SIGNATURE__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Operation Template Parameter</em>' class.
@@ -61683,7 +62041,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPERATION_TEMPLATE_PARAMETER_OPERATION_COUNT = TEMPLATE_PARAMETER_OPERATION_COUNT + 1;
+	int OPERATION_TEMPLATE_PARAMETER_OPERATION_COUNT = TEMPLATE_PARAMETER_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -61764,7 +62123,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE_MERGE__RECEIVING_PACKAGE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 1;
+	int PACKAGE_MERGE__RECEIVING_PACKAGE = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Package Merge</em>' class.
@@ -62115,7 +62475,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE_MERGE_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 0;
+	int PACKAGE_MERGE_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -62187,7 +62548,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROFILE_APPLICATION__APPLIED_PROFILE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 0;
+	int PROFILE_APPLICATION__APPLIED_PROFILE = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Is Strict</b></em>' attribute.
@@ -62196,7 +62558,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROFILE_APPLICATION__IS_STRICT = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 1;
+	int PROFILE_APPLICATION__IS_STRICT = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Applying Package</b></em>' container reference.
@@ -62205,7 +62568,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROFILE_APPLICATION__APPLYING_PACKAGE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 2;
+	int PROFILE_APPLICATION__APPLYING_PACKAGE = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The number of structural features of the '<em>Profile Application</em>' class.
@@ -62214,7 +62578,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROFILE_APPLICATION_FEATURE_COUNT = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 3;
+	int PROFILE_APPLICATION_FEATURE_COUNT = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -62556,7 +62921,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROFILE_APPLICATION___GET_APPLIED_DEFINITION = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 0;
+	int PROFILE_APPLICATION___GET_APPLIED_DEFINITION = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Get Applied Definition</em>' operation.
@@ -62565,7 +62931,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROFILE_APPLICATION___GET_APPLIED_DEFINITION__NAMEDELEMENT = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 1;
+	int PROFILE_APPLICATION___GET_APPLIED_DEFINITION__NAMEDELEMENT = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Profile Application</em>' class.
@@ -62574,7 +62941,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROFILE_APPLICATION_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 2;
+	int PROFILE_APPLICATION_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -63915,7 +64283,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ENUMERATION___VALIDATE_IMMUTABLE__DIAGNOSTICCHAIN_MAP = DATA_TYPE_OPERATION_COUNT + 0;
+	int ENUMERATION___VALIDATE_IMMUTABLE__DIAGNOSTICCHAIN_MAP = DATA_TYPE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Enumeration</em>' class.
@@ -64041,7 +64410,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_SPECIFICATION__OWNING_TEMPLATE_PARAMETER = DEPLOYMENT_TARGET_FEATURE_COUNT + 0;
+	int INSTANCE_SPECIFICATION__OWNING_TEMPLATE_PARAMETER = DEPLOYMENT_TARGET_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
@@ -64050,7 +64420,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_SPECIFICATION__TEMPLATE_PARAMETER = DEPLOYMENT_TARGET_FEATURE_COUNT + 1;
+	int INSTANCE_SPECIFICATION__TEMPLATE_PARAMETER = DEPLOYMENT_TARGET_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Classifier</b></em>' reference list.
@@ -64059,7 +64430,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_SPECIFICATION__CLASSIFIER = DEPLOYMENT_TARGET_FEATURE_COUNT + 2;
+	int INSTANCE_SPECIFICATION__CLASSIFIER = DEPLOYMENT_TARGET_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>Slot</b></em>' containment reference list.
@@ -64077,7 +64449,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_SPECIFICATION__SPECIFICATION = DEPLOYMENT_TARGET_FEATURE_COUNT + 4;
+	int INSTANCE_SPECIFICATION__SPECIFICATION = DEPLOYMENT_TARGET_FEATURE_COUNT
+		+ 4;
 
 	/**
 	 * The number of structural features of the '<em>Instance Specification</em>' class.
@@ -64086,7 +64459,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_SPECIFICATION_FEATURE_COUNT = DEPLOYMENT_TARGET_FEATURE_COUNT + 5;
+	int INSTANCE_SPECIFICATION_FEATURE_COUNT = DEPLOYMENT_TARGET_FEATURE_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -64563,7 +64937,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_SPECIFICATION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = DEPLOYMENT_TARGET_OPERATION_COUNT + 0;
+	int INSTANCE_SPECIFICATION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT = DEPLOYMENT_TARGET_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Is Template Parameter</em>' operation.
@@ -64572,7 +64947,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_SPECIFICATION___IS_TEMPLATE_PARAMETER = DEPLOYMENT_TARGET_OPERATION_COUNT + 1;
+	int INSTANCE_SPECIFICATION___IS_TEMPLATE_PARAMETER = DEPLOYMENT_TARGET_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Namespace Needs Visibility</em>' operation.
@@ -64581,7 +64957,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_SPECIFICATION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP = DEPLOYMENT_TARGET_OPERATION_COUNT + 2;
+	int INSTANCE_SPECIFICATION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP = DEPLOYMENT_TARGET_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Deployment Artifact</em>' operation.
@@ -64590,7 +64967,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_SPECIFICATION___VALIDATE_DEPLOYMENT_ARTIFACT__DIAGNOSTICCHAIN_MAP = DEPLOYMENT_TARGET_OPERATION_COUNT + 3;
+	int INSTANCE_SPECIFICATION___VALIDATE_DEPLOYMENT_ARTIFACT__DIAGNOSTICCHAIN_MAP = DEPLOYMENT_TARGET_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Structural Feature</em>' operation.
@@ -64599,7 +64977,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_SPECIFICATION___VALIDATE_STRUCTURAL_FEATURE__DIAGNOSTICCHAIN_MAP = DEPLOYMENT_TARGET_OPERATION_COUNT + 4;
+	int INSTANCE_SPECIFICATION___VALIDATE_STRUCTURAL_FEATURE__DIAGNOSTICCHAIN_MAP = DEPLOYMENT_TARGET_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Defining Feature</em>' operation.
@@ -64608,7 +64987,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_SPECIFICATION___VALIDATE_DEFINING_FEATURE__DIAGNOSTICCHAIN_MAP = DEPLOYMENT_TARGET_OPERATION_COUNT + 5;
+	int INSTANCE_SPECIFICATION___VALIDATE_DEFINING_FEATURE__DIAGNOSTICCHAIN_MAP = DEPLOYMENT_TARGET_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Validate Deployment Target</em>' operation.
@@ -64617,7 +64997,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_SPECIFICATION___VALIDATE_DEPLOYMENT_TARGET__DIAGNOSTICCHAIN_MAP = DEPLOYMENT_TARGET_OPERATION_COUNT + 6;
+	int INSTANCE_SPECIFICATION___VALIDATE_DEPLOYMENT_TARGET__DIAGNOSTICCHAIN_MAP = DEPLOYMENT_TARGET_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The number of operations of the '<em>Instance Specification</em>' class.
@@ -64626,7 +65007,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_SPECIFICATION_OPERATION_COUNT = DEPLOYMENT_TARGET_OPERATION_COUNT + 7;
+	int INSTANCE_SPECIFICATION_OPERATION_COUNT = DEPLOYMENT_TARGET_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -64788,7 +65170,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ENUMERATION_LITERAL__ENUMERATION = INSTANCE_SPECIFICATION_FEATURE_COUNT + 0;
+	int ENUMERATION_LITERAL__ENUMERATION = INSTANCE_SPECIFICATION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The number of structural features of the '<em>Enumeration Literal</em>' class.
@@ -64797,7 +65180,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ENUMERATION_LITERAL_FEATURE_COUNT = INSTANCE_SPECIFICATION_FEATURE_COUNT + 1;
+	int ENUMERATION_LITERAL_FEATURE_COUNT = INSTANCE_SPECIFICATION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -65337,7 +65721,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ENUMERATION_LITERAL___GET_CLASSIFIERS = INSTANCE_SPECIFICATION_OPERATION_COUNT + 0;
+	int ENUMERATION_LITERAL___GET_CLASSIFIERS = INSTANCE_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Get Classifier</em>' operation.
@@ -65346,7 +65731,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ENUMERATION_LITERAL___GET_CLASSIFIER = INSTANCE_SPECIFICATION_OPERATION_COUNT + 1;
+	int ENUMERATION_LITERAL___GET_CLASSIFIER = INSTANCE_SPECIFICATION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Enumeration Literal</em>' class.
@@ -65355,7 +65741,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ENUMERATION_LITERAL_OPERATION_COUNT = INSTANCE_SPECIFICATION_OPERATION_COUNT + 2;
+	int ENUMERATION_LITERAL_OPERATION_COUNT = INSTANCE_SPECIFICATION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -67182,7 +67569,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT_IMPORT__IMPORTED_ELEMENT = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 1;
+	int ELEMENT_IMPORT__IMPORTED_ELEMENT = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Importing Namespace</b></em>' container reference.
@@ -67191,7 +67579,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT_IMPORT__IMPORTING_NAMESPACE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 2;
+	int ELEMENT_IMPORT__IMPORTING_NAMESPACE = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
@@ -67551,7 +67940,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT_IMPORT___VALIDATE_IMPORTED_ELEMENT_IS_PUBLIC__DIAGNOSTICCHAIN_MAP = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 0;
+	int ELEMENT_IMPORT___VALIDATE_IMPORTED_ELEMENT_IS_PUBLIC__DIAGNOSTICCHAIN_MAP = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Visibility Public Or Private</em>' operation.
@@ -67560,7 +67950,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT_IMPORT___VALIDATE_VISIBILITY_PUBLIC_OR_PRIVATE__DIAGNOSTICCHAIN_MAP = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 1;
+	int ELEMENT_IMPORT___VALIDATE_VISIBILITY_PUBLIC_OR_PRIVATE__DIAGNOSTICCHAIN_MAP = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get Name</em>' operation.
@@ -67578,7 +67969,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ELEMENT_IMPORT_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 3;
+	int ELEMENT_IMPORT_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -67650,7 +68042,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE_IMPORT__IMPORTED_PACKAGE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 0;
+	int PACKAGE_IMPORT__IMPORTED_PACKAGE = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Importing Namespace</b></em>' container reference.
@@ -67659,7 +68052,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE_IMPORT__IMPORTING_NAMESPACE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 1;
+	int PACKAGE_IMPORT__IMPORTING_NAMESPACE = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
@@ -68019,7 +68413,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE_IMPORT___VALIDATE_PUBLIC_OR_PRIVATE__DIAGNOSTICCHAIN_MAP = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 0;
+	int PACKAGE_IMPORT___VALIDATE_PUBLIC_OR_PRIVATE__DIAGNOSTICCHAIN_MAP = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Package Import</em>' class.
@@ -68028,7 +68423,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PACKAGE_IMPORT_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 1;
+	int PACKAGE_IMPORT_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -69459,7 +69855,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION___VALIDATE_NON_OWNED_END__DIAGNOSTICCHAIN_MAP = ASSOCIATION_OPERATION_COUNT + 0;
+	int EXTENSION___VALIDATE_NON_OWNED_END__DIAGNOSTICCHAIN_MAP = ASSOCIATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Is Binary</em>' operation.
@@ -69468,7 +69865,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION___VALIDATE_IS_BINARY__DIAGNOSTICCHAIN_MAP = ASSOCIATION_OPERATION_COUNT + 1;
+	int EXTENSION___VALIDATE_IS_BINARY__DIAGNOSTICCHAIN_MAP = ASSOCIATION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get Stereotype</em>' operation.
@@ -70899,7 +71297,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION_END___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = PROPERTY_OPERATION_COUNT + 0;
+	int EXTENSION_END___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = PROPERTY_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Aggregation</em>' operation.
@@ -70908,7 +71307,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION_END___VALIDATE_AGGREGATION__DIAGNOSTICCHAIN_MAP = PROPERTY_OPERATION_COUNT + 1;
+	int EXTENSION_END___VALIDATE_AGGREGATION__DIAGNOSTICCHAIN_MAP = PROPERTY_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Extension End</em>' class.
@@ -71964,6 +72364,15 @@
 	int MODEL___UNAPPLY_PROFILE__PROFILE = PACKAGE___UNAPPLY_PROFILE__PROFILE;
 
 	/**
+	 * The operation id for the '<em>Apply Profiles</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL___APPLY_PROFILES__ELIST = PACKAGE___APPLY_PROFILES__ELIST;
+
+	/**
 	 * The operation id for the '<em>All Applicable Stereotypes</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -72897,7 +73306,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRING_EXPRESSION__OWNED_TEMPLATE_SIGNATURE = EXPRESSION_FEATURE_COUNT + 1;
+	int STRING_EXPRESSION__OWNED_TEMPLATE_SIGNATURE = EXPRESSION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Owning Expression</b></em>' container reference.
@@ -73491,7 +73901,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRING_EXPRESSION___PARAMETERABLE_ELEMENTS = EXPRESSION_OPERATION_COUNT + 1;
+	int STRING_EXPRESSION___PARAMETERABLE_ELEMENTS = EXPRESSION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Operands</em>' operation.
@@ -73500,7 +73911,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRING_EXPRESSION___VALIDATE_OPERANDS__DIAGNOSTICCHAIN_MAP = EXPRESSION_OPERATION_COUNT + 2;
+	int STRING_EXPRESSION___VALIDATE_OPERANDS__DIAGNOSTICCHAIN_MAP = EXPRESSION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Subexpressions</em>' operation.
@@ -73509,7 +73921,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRING_EXPRESSION___VALIDATE_SUBEXPRESSIONS__DIAGNOSTICCHAIN_MAP = EXPRESSION_OPERATION_COUNT + 3;
+	int STRING_EXPRESSION___VALIDATE_SUBEXPRESSIONS__DIAGNOSTICCHAIN_MAP = EXPRESSION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The number of operations of the '<em>String Expression</em>' class.
@@ -74760,7 +75173,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLABORATION_USE___VALIDATE_CLIENT_ELEMENTS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 0;
+	int COLLABORATION_USE___VALIDATE_CLIENT_ELEMENTS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Every Role</em>' operation.
@@ -74769,7 +75183,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLABORATION_USE___VALIDATE_EVERY_ROLE__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 1;
+	int COLLABORATION_USE___VALIDATE_EVERY_ROLE__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Connectors</em>' operation.
@@ -74778,7 +75193,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLABORATION_USE___VALIDATE_CONNECTORS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 2;
+	int COLLABORATION_USE___VALIDATE_CONNECTORS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Collaboration Use</em>' class.
@@ -75174,7 +75590,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLABORATION__CLASSIFIER_BEHAVIOR = STRUCTURED_CLASSIFIER_FEATURE_COUNT + 0;
+	int COLLABORATION__CLASSIFIER_BEHAVIOR = STRUCTURED_CLASSIFIER_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Interface Realization</b></em>' containment reference list.
@@ -75183,7 +75600,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLABORATION__INTERFACE_REALIZATION = STRUCTURED_CLASSIFIER_FEATURE_COUNT + 1;
+	int COLLABORATION__INTERFACE_REALIZATION = STRUCTURED_CLASSIFIER_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
@@ -75201,7 +75619,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLABORATION__COLLABORATION_ROLE = STRUCTURED_CLASSIFIER_FEATURE_COUNT + 3;
+	int COLLABORATION__COLLABORATION_ROLE = STRUCTURED_CLASSIFIER_FEATURE_COUNT
+		+ 3;
 
 	/**
 	 * The number of structural features of the '<em>Collaboration</em>' class.
@@ -76182,7 +76601,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLABORATION___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP = STRUCTURED_CLASSIFIER_OPERATION_COUNT + 0;
+	int COLLABORATION___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP = STRUCTURED_CLASSIFIER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Get All Implemented Interfaces</em>' operation.
@@ -76191,7 +76611,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLABORATION___GET_ALL_IMPLEMENTED_INTERFACES = STRUCTURED_CLASSIFIER_OPERATION_COUNT + 1;
+	int COLLABORATION___GET_ALL_IMPLEMENTED_INTERFACES = STRUCTURED_CLASSIFIER_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get Implemented Interfaces</em>' operation.
@@ -76200,7 +76621,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLABORATION___GET_IMPLEMENTED_INTERFACES = STRUCTURED_CLASSIFIER_OPERATION_COUNT + 2;
+	int COLLABORATION___GET_IMPLEMENTED_INTERFACES = STRUCTURED_CLASSIFIER_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Collaboration</em>' class.
@@ -76209,7 +76631,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLABORATION_OPERATION_COUNT = STRUCTURED_CLASSIFIER_OPERATION_COUNT + 3;
+	int COLLABORATION_OPERATION_COUNT = STRUCTURED_CLASSIFIER_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -76911,7 +77334,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTOR___VALIDATE_TYPES__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT + 0;
+	int CONNECTOR___VALIDATE_TYPES__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Roles</em>' operation.
@@ -76920,7 +77344,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONNECTOR___VALIDATE_ROLES__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT + 1;
+	int CONNECTOR___VALIDATE_ROLES__DIAGNOSTICCHAIN_MAP = FEATURE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get Kind</em>' operation.
@@ -77019,7 +77444,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GENERALIZATION__GENERALIZATION_SET = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 1;
+	int GENERALIZATION__GENERALIZATION_SET = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Is Substitutable</b></em>' attribute.
@@ -77028,7 +77454,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GENERALIZATION__IS_SUBSTITUTABLE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 2;
+	int GENERALIZATION__IS_SUBSTITUTABLE = DIRECTED_RELATIONSHIP_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>Specific</b></em>' container reference.
@@ -77388,7 +77815,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GENERALIZATION_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT + 0;
+	int GENERALIZATION_OPERATION_COUNT = DIRECTED_RELATIONSHIP_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -77532,7 +77960,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GENERALIZATION_SET__GENERALIZATION = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 3;
+	int GENERALIZATION_SET__GENERALIZATION = PACKAGEABLE_ELEMENT_FEATURE_COUNT
+		+ 3;
 
 	/**
 	 * The number of structural features of the '<em>Generalization Set</em>' class.
@@ -77541,7 +77970,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GENERALIZATION_SET_FEATURE_COUNT = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 4;
+	int GENERALIZATION_SET_FEATURE_COUNT = PACKAGEABLE_ELEMENT_FEATURE_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -78036,7 +78466,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GENERALIZATION_SET___VALIDATE_GENERALIZATION_SAME_CLASSIFIER__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 0;
+	int GENERALIZATION_SET___VALIDATE_GENERALIZATION_SAME_CLASSIFIER__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Maps To Generalization Set</em>' operation.
@@ -78045,7 +78476,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GENERALIZATION_SET___VALIDATE_MAPS_TO_GENERALIZATION_SET__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 1;
+	int GENERALIZATION_SET___VALIDATE_MAPS_TO_GENERALIZATION_SET__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Generalization Set</em>' class.
@@ -78054,7 +78486,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GENERALIZATION_SET_OPERATION_COUNT = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 2;
+	int GENERALIZATION_SET_OPERATION_COUNT = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -78180,7 +78613,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_TEMPLATE_SIGNATURE__PARAMETER = REDEFINABLE_ELEMENT_FEATURE_COUNT + 0;
+	int REDEFINABLE_TEMPLATE_SIGNATURE__PARAMETER = REDEFINABLE_ELEMENT_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Template</b></em>' container reference.
@@ -78189,7 +78623,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_TEMPLATE_SIGNATURE__TEMPLATE = REDEFINABLE_ELEMENT_FEATURE_COUNT + 1;
+	int REDEFINABLE_TEMPLATE_SIGNATURE__TEMPLATE = REDEFINABLE_ELEMENT_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Owned Parameter</b></em>' containment reference list.
@@ -78198,7 +78633,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_TEMPLATE_SIGNATURE__OWNED_PARAMETER = REDEFINABLE_ELEMENT_FEATURE_COUNT + 2;
+	int REDEFINABLE_TEMPLATE_SIGNATURE__OWNED_PARAMETER = REDEFINABLE_ELEMENT_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>Extended Signature</b></em>' reference list.
@@ -78207,7 +78643,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_TEMPLATE_SIGNATURE__EXTENDED_SIGNATURE = REDEFINABLE_ELEMENT_FEATURE_COUNT + 3;
+	int REDEFINABLE_TEMPLATE_SIGNATURE__EXTENDED_SIGNATURE = REDEFINABLE_ELEMENT_FEATURE_COUNT
+		+ 3;
 
 	/**
 	 * The feature id for the '<em><b>Inherited Parameter</b></em>' reference list.
@@ -78216,7 +78653,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_TEMPLATE_SIGNATURE__INHERITED_PARAMETER = REDEFINABLE_ELEMENT_FEATURE_COUNT + 4;
+	int REDEFINABLE_TEMPLATE_SIGNATURE__INHERITED_PARAMETER = REDEFINABLE_ELEMENT_FEATURE_COUNT
+		+ 4;
 
 	/**
 	 * The feature id for the '<em><b>Classifier</b></em>' reference.
@@ -78225,7 +78663,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_TEMPLATE_SIGNATURE__CLASSIFIER = REDEFINABLE_ELEMENT_FEATURE_COUNT + 5;
+	int REDEFINABLE_TEMPLATE_SIGNATURE__CLASSIFIER = REDEFINABLE_ELEMENT_FEATURE_COUNT
+		+ 5;
 
 	/**
 	 * The number of structural features of the '<em>Redefinable Template Signature</em>' class.
@@ -78234,7 +78673,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_TEMPLATE_SIGNATURE_FEATURE_COUNT = REDEFINABLE_ELEMENT_FEATURE_COUNT + 6;
+	int REDEFINABLE_TEMPLATE_SIGNATURE_FEATURE_COUNT = REDEFINABLE_ELEMENT_FEATURE_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -78747,7 +79187,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_TEMPLATE_SIGNATURE___VALIDATE_OWN_ELEMENTS__DIAGNOSTICCHAIN_MAP = REDEFINABLE_ELEMENT_OPERATION_COUNT + 0;
+	int REDEFINABLE_TEMPLATE_SIGNATURE___VALIDATE_OWN_ELEMENTS__DIAGNOSTICCHAIN_MAP = REDEFINABLE_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Unique Parameters</em>' operation.
@@ -78756,7 +79197,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_TEMPLATE_SIGNATURE___VALIDATE_UNIQUE_PARAMETERS__DIAGNOSTICCHAIN_MAP = REDEFINABLE_ELEMENT_OPERATION_COUNT + 1;
+	int REDEFINABLE_TEMPLATE_SIGNATURE___VALIDATE_UNIQUE_PARAMETERS__DIAGNOSTICCHAIN_MAP = REDEFINABLE_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Redefines Parents</em>' operation.
@@ -78765,7 +79207,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_TEMPLATE_SIGNATURE___VALIDATE_REDEFINES_PARENTS__DIAGNOSTICCHAIN_MAP = REDEFINABLE_ELEMENT_OPERATION_COUNT + 2;
+	int REDEFINABLE_TEMPLATE_SIGNATURE___VALIDATE_REDEFINES_PARENTS__DIAGNOSTICCHAIN_MAP = REDEFINABLE_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get Inherited Parameters</em>' operation.
@@ -78774,7 +79217,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_TEMPLATE_SIGNATURE___GET_INHERITED_PARAMETERS = REDEFINABLE_ELEMENT_OPERATION_COUNT + 3;
+	int REDEFINABLE_TEMPLATE_SIGNATURE___GET_INHERITED_PARAMETERS = REDEFINABLE_ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The number of operations of the '<em>Redefinable Template Signature</em>' class.
@@ -78783,7 +79227,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDEFINABLE_TEMPLATE_SIGNATURE_OPERATION_COUNT = REDEFINABLE_ELEMENT_OPERATION_COUNT + 4;
+	int REDEFINABLE_TEMPLATE_SIGNATURE_OPERATION_COUNT = REDEFINABLE_ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -80169,7 +80614,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int USE_CASE___VALIDATE_BINARY_ASSOCIATIONS__DIAGNOSTICCHAIN_MAP = BEHAVIORED_CLASSIFIER_OPERATION_COUNT + 0;
+	int USE_CASE___VALIDATE_BINARY_ASSOCIATIONS__DIAGNOSTICCHAIN_MAP = BEHAVIORED_CLASSIFIER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate No Association To Use Case</em>' operation.
@@ -80178,7 +80624,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int USE_CASE___VALIDATE_NO_ASSOCIATION_TO_USE_CASE__DIAGNOSTICCHAIN_MAP = BEHAVIORED_CLASSIFIER_OPERATION_COUNT + 1;
+	int USE_CASE___VALIDATE_NO_ASSOCIATION_TO_USE_CASE__DIAGNOSTICCHAIN_MAP = BEHAVIORED_CLASSIFIER_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Cannot Include Self</em>' operation.
@@ -80187,7 +80634,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int USE_CASE___VALIDATE_CANNOT_INCLUDE_SELF__DIAGNOSTICCHAIN_MAP = BEHAVIORED_CLASSIFIER_OPERATION_COUNT + 2;
+	int USE_CASE___VALIDATE_CANNOT_INCLUDE_SELF__DIAGNOSTICCHAIN_MAP = BEHAVIORED_CLASSIFIER_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Must Have Name</em>' operation.
@@ -80196,7 +80644,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int USE_CASE___VALIDATE_MUST_HAVE_NAME__DIAGNOSTICCHAIN_MAP = BEHAVIORED_CLASSIFIER_OPERATION_COUNT + 3;
+	int USE_CASE___VALIDATE_MUST_HAVE_NAME__DIAGNOSTICCHAIN_MAP = BEHAVIORED_CLASSIFIER_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>All Included Use Cases</em>' operation.
@@ -80205,7 +80654,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int USE_CASE___ALL_INCLUDED_USE_CASES = BEHAVIORED_CLASSIFIER_OPERATION_COUNT + 4;
+	int USE_CASE___ALL_INCLUDED_USE_CASES = BEHAVIORED_CLASSIFIER_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The number of operations of the '<em>Use Case</em>' class.
@@ -80844,7 +81294,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXTEND___VALIDATE_EXTENSION_POINTS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 0;
+	int EXTEND___VALIDATE_EXTENSION_POINTS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Extend</em>' class.
@@ -81501,7 +81952,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION_POINT___VALIDATE_MUST_HAVE_NAME__DIAGNOSTICCHAIN_MAP = REDEFINABLE_ELEMENT_OPERATION_COUNT + 0;
+	int EXTENSION_POINT___VALIDATE_MUST_HAVE_NAME__DIAGNOSTICCHAIN_MAP = REDEFINABLE_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Extension Point</em>' class.
@@ -81510,7 +81962,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION_POINT_OPERATION_COUNT = REDEFINABLE_ELEMENT_OPERATION_COUNT + 1;
+	int EXTENSION_POINT_OPERATION_COUNT = REDEFINABLE_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -83562,7 +84015,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER_TEMPLATE_PARAMETER__ALLOW_SUBSTITUTABLE = TEMPLATE_PARAMETER_FEATURE_COUNT + 0;
+	int CLASSIFIER_TEMPLATE_PARAMETER__ALLOW_SUBSTITUTABLE = TEMPLATE_PARAMETER_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Constraining Classifier</b></em>' reference list.
@@ -83571,7 +84025,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER = TEMPLATE_PARAMETER_FEATURE_COUNT + 1;
+	int CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER = TEMPLATE_PARAMETER_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Classifier Template Parameter</em>' class.
@@ -83580,7 +84035,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER_TEMPLATE_PARAMETER_FEATURE_COUNT = TEMPLATE_PARAMETER_FEATURE_COUNT + 2;
+	int CLASSIFIER_TEMPLATE_PARAMETER_FEATURE_COUNT = TEMPLATE_PARAMETER_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -83931,7 +84387,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER_TEMPLATE_PARAMETER___VALIDATE_HAS_CONSTRAINING_CLASSIFIER__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT + 0;
+	int CLASSIFIER_TEMPLATE_PARAMETER___VALIDATE_HAS_CONSTRAINING_CLASSIFIER__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Parametered Element No Features</em>' operation.
@@ -83940,7 +84397,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER_TEMPLATE_PARAMETER___VALIDATE_PARAMETERED_ELEMENT_NO_FEATURES__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT + 1;
+	int CLASSIFIER_TEMPLATE_PARAMETER___VALIDATE_PARAMETERED_ELEMENT_NO_FEATURES__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Matching Abstract</em>' operation.
@@ -83949,7 +84407,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER_TEMPLATE_PARAMETER___VALIDATE_MATCHING_ABSTRACT__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT + 2;
+	int CLASSIFIER_TEMPLATE_PARAMETER___VALIDATE_MATCHING_ABSTRACT__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Actual Is Classifier</em>' operation.
@@ -83958,7 +84417,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER_TEMPLATE_PARAMETER___VALIDATE_ACTUAL_IS_CLASSIFIER__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT + 3;
+	int CLASSIFIER_TEMPLATE_PARAMETER___VALIDATE_ACTUAL_IS_CLASSIFIER__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Constraining Classifiers Constrain Args</em>' operation.
@@ -83967,7 +84427,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER_TEMPLATE_PARAMETER___VALIDATE_CONSTRAINING_CLASSIFIERS_CONSTRAIN_ARGS__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT + 4;
+	int CLASSIFIER_TEMPLATE_PARAMETER___VALIDATE_CONSTRAINING_CLASSIFIERS_CONSTRAIN_ARGS__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Constraining Classifiers Constrain Parametered Element</em>' operation.
@@ -83976,7 +84437,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER_TEMPLATE_PARAMETER___VALIDATE_CONSTRAINING_CLASSIFIERS_CONSTRAIN_PARAMETERED_ELEMENT__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT + 5;
+	int CLASSIFIER_TEMPLATE_PARAMETER___VALIDATE_CONSTRAINING_CLASSIFIERS_CONSTRAIN_PARAMETERED_ELEMENT__DIAGNOSTICCHAIN_MAP = TEMPLATE_PARAMETER_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The number of operations of the '<em>Classifier Template Parameter</em>' class.
@@ -83985,7 +84447,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLASSIFIER_TEMPLATE_PARAMETER_OPERATION_COUNT = TEMPLATE_PARAMETER_OPERATION_COUNT + 6;
+	int CLASSIFIER_TEMPLATE_PARAMETER_OPERATION_COUNT = TEMPLATE_PARAMETER_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -84165,7 +84628,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERFACE_REALIZATION__IMPLEMENTING_CLASSIFIER = REALIZATION_FEATURE_COUNT + 1;
+	int INTERFACE_REALIZATION__IMPLEMENTING_CLASSIFIER = REALIZATION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Interface Realization</em>' class.
@@ -85281,7 +85745,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_GROUP___CONTAINING_ACTIVITY = NAMED_ELEMENT_OPERATION_COUNT + 0;
+	int ACTIVITY_GROUP___CONTAINING_ACTIVITY = NAMED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Nodes And Edges</em>' operation.
@@ -85290,7 +85755,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_GROUP___VALIDATE_NODES_AND_EDGES__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 1;
+	int ACTIVITY_GROUP___VALIDATE_NODES_AND_EDGES__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Not Contained</em>' operation.
@@ -85299,7 +85765,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_GROUP___VALIDATE_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 2;
+	int ACTIVITY_GROUP___VALIDATE_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Activity Group</em>' class.
@@ -85470,7 +85937,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_EDGE__IN_STRUCTURED_NODE = REDEFINABLE_ELEMENT_FEATURE_COUNT + 4;
+	int ACTIVITY_EDGE__IN_STRUCTURED_NODE = REDEFINABLE_ELEMENT_FEATURE_COUNT
+		+ 4;
 
 	/**
 	 * The feature id for the '<em><b>Target</b></em>' reference.
@@ -86037,7 +86505,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_EDGE___VALIDATE_SOURCE_AND_TARGET__DIAGNOSTICCHAIN_MAP = REDEFINABLE_ELEMENT_OPERATION_COUNT + 0;
+	int ACTIVITY_EDGE___VALIDATE_SOURCE_AND_TARGET__DIAGNOSTICCHAIN_MAP = REDEFINABLE_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Activity Edge</em>' class.
@@ -86748,7 +87217,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION___VALIDATE_REPRESENTS_CLASSIFIER__DIAGNOSTICCHAIN_MAP = ACTIVITY_GROUP_OPERATION_COUNT + 0;
+	int ACTIVITY_PARTITION___VALIDATE_REPRESENTS_CLASSIFIER__DIAGNOSTICCHAIN_MAP = ACTIVITY_GROUP_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Represents Property And Is Contained</em>' operation.
@@ -86757,7 +87227,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION___VALIDATE_REPRESENTS_PROPERTY_AND_IS_CONTAINED__DIAGNOSTICCHAIN_MAP = ACTIVITY_GROUP_OPERATION_COUNT + 1;
+	int ACTIVITY_PARTITION___VALIDATE_REPRESENTS_PROPERTY_AND_IS_CONTAINED__DIAGNOSTICCHAIN_MAP = ACTIVITY_GROUP_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Represents Property</em>' operation.
@@ -86766,7 +87237,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION___VALIDATE_REPRESENTS_PROPERTY__DIAGNOSTICCHAIN_MAP = ACTIVITY_GROUP_OPERATION_COUNT + 2;
+	int ACTIVITY_PARTITION___VALIDATE_REPRESENTS_PROPERTY__DIAGNOSTICCHAIN_MAP = ACTIVITY_GROUP_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Dimension Not Contained</em>' operation.
@@ -86775,7 +87247,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION___VALIDATE_DIMENSION_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP = ACTIVITY_GROUP_OPERATION_COUNT + 3;
+	int ACTIVITY_PARTITION___VALIDATE_DIMENSION_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP = ACTIVITY_GROUP_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The number of operations of the '<em>Activity Partition</em>' class.
@@ -86928,7 +87401,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION = REDEFINABLE_ELEMENT_FEATURE_COUNT + 2;
+	int ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION = REDEFINABLE_ELEMENT_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
@@ -86937,7 +87411,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_NODE__IN_STRUCTURED_NODE = REDEFINABLE_ELEMENT_FEATURE_COUNT + 3;
+	int ACTIVITY_NODE__IN_STRUCTURED_NODE = REDEFINABLE_ELEMENT_FEATURE_COUNT
+		+ 3;
 
 	/**
 	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
@@ -87495,7 +87970,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_NODE___CONTAINING_ACTIVITY = REDEFINABLE_ELEMENT_OPERATION_COUNT + 0;
+	int ACTIVITY_NODE___CONTAINING_ACTIVITY = REDEFINABLE_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Activity Node</em>' class.
@@ -87648,7 +88124,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE = ACTIVITY_GROUP_FEATURE_COUNT + 0;
+	int INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE = ACTIVITY_GROUP_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Node</b></em>' reference list.
@@ -87666,7 +88143,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION_FEATURE_COUNT = ACTIVITY_GROUP_FEATURE_COUNT + 2;
+	int INTERRUPTIBLE_ACTIVITY_REGION_FEATURE_COUNT = ACTIVITY_GROUP_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -88161,7 +88639,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION___VALIDATE_INTERRUPTING_EDGES__DIAGNOSTICCHAIN_MAP = ACTIVITY_GROUP_OPERATION_COUNT + 0;
+	int INTERRUPTIBLE_ACTIVITY_REGION___VALIDATE_INTERRUPTING_EDGES__DIAGNOSTICCHAIN_MAP = ACTIVITY_GROUP_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Interruptible Activity Region</em>' class.
@@ -88170,7 +88649,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION_OPERATION_COUNT = ACTIVITY_GROUP_OPERATION_COUNT + 1;
+	int INTERRUPTIBLE_ACTIVITY_REGION_OPERATION_COUNT = ACTIVITY_GROUP_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -90096,7 +90576,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_INPUT = ACTION_FEATURE_COUNT + 13;
+	int STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_INPUT = ACTION_FEATURE_COUNT
+		+ 13;
 
 	/**
 	 * The feature id for the '<em><b>Structured Node Output</b></em>' containment reference list.
@@ -90105,7 +90586,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_OUTPUT = ACTION_FEATURE_COUNT + 14;
+	int STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_OUTPUT = ACTION_FEATURE_COUNT
+		+ 14;
 
 	/**
 	 * The feature id for the '<em><b>Variable</b></em>' containment reference list.
@@ -90690,7 +91172,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___VALIDATE_MEMBERS_DISTINGUISHABLE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int STRUCTURED_ACTIVITY_NODE___VALIDATE_MEMBERS_DISTINGUISHABLE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Cannot Import Self</em>' operation.
@@ -90699,7 +91182,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___VALIDATE_CANNOT_IMPORT_SELF__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int STRUCTURED_ACTIVITY_NODE___VALIDATE_CANNOT_IMPORT_SELF__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Cannot Import Owned Members</em>' operation.
@@ -90708,7 +91192,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___VALIDATE_CANNOT_IMPORT_OWNED_MEMBERS__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 2;
+	int STRUCTURED_ACTIVITY_NODE___VALIDATE_CANNOT_IMPORT_OWNED_MEMBERS__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Create Element Import</em>' operation.
@@ -90717,7 +91202,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___CREATE_ELEMENT_IMPORT__PACKAGEABLEELEMENT_VISIBILITYKIND = ACTION_OPERATION_COUNT + 3;
+	int STRUCTURED_ACTIVITY_NODE___CREATE_ELEMENT_IMPORT__PACKAGEABLEELEMENT_VISIBILITYKIND = ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Create Package Import</em>' operation.
@@ -90726,7 +91212,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___CREATE_PACKAGE_IMPORT__PACKAGE_VISIBILITYKIND = ACTION_OPERATION_COUNT + 4;
+	int STRUCTURED_ACTIVITY_NODE___CREATE_PACKAGE_IMPORT__PACKAGE_VISIBILITYKIND = ACTION_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Get Imported Elements</em>' operation.
@@ -90735,7 +91222,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___GET_IMPORTED_ELEMENTS = ACTION_OPERATION_COUNT + 5;
+	int STRUCTURED_ACTIVITY_NODE___GET_IMPORTED_ELEMENTS = ACTION_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Get Imported Packages</em>' operation.
@@ -90744,7 +91232,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___GET_IMPORTED_PACKAGES = ACTION_OPERATION_COUNT + 6;
+	int STRUCTURED_ACTIVITY_NODE___GET_IMPORTED_PACKAGES = ACTION_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Get Owned Members</em>' operation.
@@ -90753,7 +91242,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___GET_OWNED_MEMBERS = ACTION_OPERATION_COUNT + 7;
+	int STRUCTURED_ACTIVITY_NODE___GET_OWNED_MEMBERS = ACTION_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The operation id for the '<em>Exclude Collisions</em>' operation.
@@ -90762,7 +91252,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___EXCLUDE_COLLISIONS__ELIST = ACTION_OPERATION_COUNT + 8;
+	int STRUCTURED_ACTIVITY_NODE___EXCLUDE_COLLISIONS__ELIST = ACTION_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Get Names Of Member</em>' operation.
@@ -90771,7 +91262,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___GET_NAMES_OF_MEMBER__NAMEDELEMENT = ACTION_OPERATION_COUNT + 9;
+	int STRUCTURED_ACTIVITY_NODE___GET_NAMES_OF_MEMBER__NAMEDELEMENT = ACTION_OPERATION_COUNT
+		+ 9;
 
 	/**
 	 * The operation id for the '<em>Import Members</em>' operation.
@@ -90780,7 +91272,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___IMPORT_MEMBERS__ELIST = ACTION_OPERATION_COUNT + 10;
+	int STRUCTURED_ACTIVITY_NODE___IMPORT_MEMBERS__ELIST = ACTION_OPERATION_COUNT
+		+ 10;
 
 	/**
 	 * The operation id for the '<em>Get Imported Members</em>' operation.
@@ -90789,7 +91282,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___GET_IMPORTED_MEMBERS = ACTION_OPERATION_COUNT + 11;
+	int STRUCTURED_ACTIVITY_NODE___GET_IMPORTED_MEMBERS = ACTION_OPERATION_COUNT
+		+ 11;
 
 	/**
 	 * The operation id for the '<em>Members Are Distinguishable</em>' operation.
@@ -90798,7 +91292,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___MEMBERS_ARE_DISTINGUISHABLE = ACTION_OPERATION_COUNT + 12;
+	int STRUCTURED_ACTIVITY_NODE___MEMBERS_ARE_DISTINGUISHABLE = ACTION_OPERATION_COUNT
+		+ 12;
 
 	/**
 	 * The operation id for the '<em>Validate Nodes And Edges</em>' operation.
@@ -90807,7 +91302,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___VALIDATE_NODES_AND_EDGES__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 13;
+	int STRUCTURED_ACTIVITY_NODE___VALIDATE_NODES_AND_EDGES__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 13;
 
 	/**
 	 * The operation id for the '<em>Validate Not Contained</em>' operation.
@@ -90816,7 +91312,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___VALIDATE_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 14;
+	int STRUCTURED_ACTIVITY_NODE___VALIDATE_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 14;
 
 	/**
 	 * The operation id for the '<em>Validate Output Pin Edges</em>' operation.
@@ -90825,7 +91322,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___VALIDATE_OUTPUT_PIN_EDGES__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 15;
+	int STRUCTURED_ACTIVITY_NODE___VALIDATE_OUTPUT_PIN_EDGES__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 15;
 
 	/**
 	 * The operation id for the '<em>Validate Edges</em>' operation.
@@ -90834,7 +91332,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___VALIDATE_EDGES__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 16;
+	int STRUCTURED_ACTIVITY_NODE___VALIDATE_EDGES__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 16;
 
 	/**
 	 * The operation id for the '<em>Validate Input Pin Edges</em>' operation.
@@ -90843,7 +91342,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURED_ACTIVITY_NODE___VALIDATE_INPUT_PIN_EDGES__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 17;
+	int STRUCTURED_ACTIVITY_NODE___VALIDATE_INPUT_PIN_EDGES__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 17;
 
 	/**
 	 * The operation id for the '<em>Source Nodes</em>' operation.
@@ -91293,7 +91793,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXCEPTION_HANDLER___VALIDATE_HANDLER_BODY_EDGES__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 0;
+	int EXCEPTION_HANDLER___VALIDATE_HANDLER_BODY_EDGES__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Output Pins</em>' operation.
@@ -91302,7 +91803,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXCEPTION_HANDLER___VALIDATE_OUTPUT_PINS__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 1;
+	int EXCEPTION_HANDLER___VALIDATE_OUTPUT_PINS__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate One Input</em>' operation.
@@ -91311,7 +91813,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXCEPTION_HANDLER___VALIDATE_ONE_INPUT__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 2;
+	int EXCEPTION_HANDLER___VALIDATE_ONE_INPUT__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Edge Source Target</em>' operation.
@@ -91320,7 +91823,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXCEPTION_HANDLER___VALIDATE_EDGE_SOURCE_TARGET__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 3;
+	int EXCEPTION_HANDLER___VALIDATE_EDGE_SOURCE_TARGET__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Handler Body Owner</em>' operation.
@@ -91329,7 +91833,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXCEPTION_HANDLER___VALIDATE_HANDLER_BODY_OWNER__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 4;
+	int EXCEPTION_HANDLER___VALIDATE_HANDLER_BODY_OWNER__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Exception Input Type</em>' operation.
@@ -91338,7 +91843,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXCEPTION_HANDLER___VALIDATE_EXCEPTION_INPUT_TYPE__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 5;
+	int EXCEPTION_HANDLER___VALIDATE_EXCEPTION_INPUT_TYPE__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The number of operations of the '<em>Exception Handler</em>' class.
@@ -92121,7 +92627,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OBJECT_NODE___VALIDATE_INPUT_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP = ACTIVITY_NODE_OPERATION_COUNT + 0;
+	int OBJECT_NODE___VALIDATE_INPUT_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP = ACTIVITY_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Selection Behavior</em>' operation.
@@ -92130,7 +92637,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OBJECT_NODE___VALIDATE_SELECTION_BEHAVIOR__DIAGNOSTICCHAIN_MAP = ACTIVITY_NODE_OPERATION_COUNT + 1;
+	int OBJECT_NODE___VALIDATE_SELECTION_BEHAVIOR__DIAGNOSTICCHAIN_MAP = ACTIVITY_NODE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Object Flow Edges</em>' operation.
@@ -92139,7 +92647,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OBJECT_NODE___VALIDATE_OBJECT_FLOW_EDGES__DIAGNOSTICCHAIN_MAP = ACTIVITY_NODE_OPERATION_COUNT + 2;
+	int OBJECT_NODE___VALIDATE_OBJECT_FLOW_EDGES__DIAGNOSTICCHAIN_MAP = ACTIVITY_NODE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Object Node</em>' class.
@@ -93012,7 +93521,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PIN___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 0;
+	int PIN___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Lower Ge0</em>' operation.
@@ -93021,7 +93531,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PIN___VALIDATE_LOWER_GE0__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 1;
+	int PIN___VALIDATE_LOWER_GE0__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Value Specification No Side Effects</em>' operation.
@@ -93030,7 +93541,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PIN___VALIDATE_VALUE_SPECIFICATION_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 2;
+	int PIN___VALIDATE_VALUE_SPECIFICATION_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Value Specification Constant</em>' operation.
@@ -93039,7 +93551,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PIN___VALIDATE_VALUE_SPECIFICATION_CONSTANT__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 3;
+	int PIN___VALIDATE_VALUE_SPECIFICATION_CONSTANT__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Lower Is Integer</em>' operation.
@@ -93048,7 +93561,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PIN___VALIDATE_LOWER_IS_INTEGER__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 4;
+	int PIN___VALIDATE_LOWER_IS_INTEGER__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Upper Is Unlimited Natural</em>' operation.
@@ -93057,7 +93571,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PIN___VALIDATE_UPPER_IS_UNLIMITED_NATURAL__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 5;
+	int PIN___VALIDATE_UPPER_IS_UNLIMITED_NATURAL__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Set Lower</em>' operation.
@@ -93084,7 +93599,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PIN___COMPATIBLE_WITH__MULTIPLICITYELEMENT = OBJECT_NODE_OPERATION_COUNT + 8;
+	int PIN___COMPATIBLE_WITH__MULTIPLICITYELEMENT = OBJECT_NODE_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Includes Multiplicity</em>' operation.
@@ -93093,7 +93609,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PIN___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT = OBJECT_NODE_OPERATION_COUNT + 9;
+	int PIN___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT = OBJECT_NODE_OPERATION_COUNT
+		+ 9;
 
 	/**
 	 * The operation id for the '<em>Is</em>' operation.
@@ -93156,7 +93673,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PIN___VALIDATE_CONTROL_PINS__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 16;
+	int PIN___VALIDATE_CONTROL_PINS__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 16;
 
 	/**
 	 * The operation id for the '<em>Validate Not Unique</em>' operation.
@@ -93165,7 +93683,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PIN___VALIDATE_NOT_UNIQUE__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 17;
+	int PIN___VALIDATE_NOT_UNIQUE__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 17;
 
 	/**
 	 * The number of operations of the '<em>Pin</em>' class.
@@ -94200,7 +94719,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INPUT_PIN___VALIDATE_OUTGOING_EDGES_STRUCTURED_ONLY__DIAGNOSTICCHAIN_MAP = PIN_OPERATION_COUNT + 0;
+	int INPUT_PIN___VALIDATE_OUTGOING_EDGES_STRUCTURED_ONLY__DIAGNOSTICCHAIN_MAP = PIN_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Input Pin</em>' class.
@@ -95235,7 +95755,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OUTPUT_PIN___VALIDATE_INCOMING_EDGES_STRUCTURED_ONLY__DIAGNOSTICCHAIN_MAP = PIN_OPERATION_COUNT + 0;
+	int OUTPUT_PIN___VALIDATE_INCOMING_EDGES_STRUCTURED_ONLY__DIAGNOSTICCHAIN_MAP = PIN_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Output Pin</em>' class.
@@ -95946,7 +96467,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VARIABLE___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 0;
+	int VARIABLE___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Lower Ge0</em>' operation.
@@ -95955,7 +96477,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VARIABLE___VALIDATE_LOWER_GE0__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 1;
+	int VARIABLE___VALIDATE_LOWER_GE0__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Value Specification No Side Effects</em>' operation.
@@ -95964,7 +96487,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VARIABLE___VALIDATE_VALUE_SPECIFICATION_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 2;
+	int VARIABLE___VALIDATE_VALUE_SPECIFICATION_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Value Specification Constant</em>' operation.
@@ -95973,7 +96497,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VARIABLE___VALIDATE_VALUE_SPECIFICATION_CONSTANT__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 3;
+	int VARIABLE___VALIDATE_VALUE_SPECIFICATION_CONSTANT__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Lower Is Integer</em>' operation.
@@ -95982,7 +96507,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VARIABLE___VALIDATE_LOWER_IS_INTEGER__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 4;
+	int VARIABLE___VALIDATE_LOWER_IS_INTEGER__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Upper Is Unlimited Natural</em>' operation.
@@ -95991,7 +96517,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VARIABLE___VALIDATE_UPPER_IS_UNLIMITED_NATURAL__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT + 5;
+	int VARIABLE___VALIDATE_UPPER_IS_UNLIMITED_NATURAL__DIAGNOSTICCHAIN_MAP = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Set Lower</em>' operation.
@@ -96018,7 +96545,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VARIABLE___COMPATIBLE_WITH__MULTIPLICITYELEMENT = CONNECTABLE_ELEMENT_OPERATION_COUNT + 8;
+	int VARIABLE___COMPATIBLE_WITH__MULTIPLICITYELEMENT = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The operation id for the '<em>Includes Multiplicity</em>' operation.
@@ -96027,7 +96555,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VARIABLE___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT = CONNECTABLE_ELEMENT_OPERATION_COUNT + 9;
+	int VARIABLE___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 9;
 
 	/**
 	 * The operation id for the '<em>Is</em>' operation.
@@ -96090,7 +96619,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VARIABLE___IS_ACCESSIBLE_BY__ACTION = CONNECTABLE_ELEMENT_OPERATION_COUNT + 16;
+	int VARIABLE___IS_ACCESSIBLE_BY__ACTION = CONNECTABLE_ELEMENT_OPERATION_COUNT
+		+ 16;
 
 	/**
 	 * The number of operations of the '<em>Variable</em>' class.
@@ -96956,7 +97486,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VALUE_SPECIFICATION_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int VALUE_SPECIFICATION_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Compatible Type</em>' operation.
@@ -96965,7 +97496,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VALUE_SPECIFICATION_ACTION___VALIDATE_COMPATIBLE_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int VALUE_SPECIFICATION_ACTION___VALIDATE_COMPATIBLE_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Value Specification Action</em>' class.
@@ -97802,7 +98334,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VARIABLE_ACTION___VALIDATE_SCOPE_OF_VARIABLE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int VARIABLE_ACTION___VALIDATE_SCOPE_OF_VARIABLE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Variable Action</em>' class.
@@ -98648,7 +99181,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_ACTION___VALIDATE_SAME_PINS__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int LINK_ACTION___VALIDATE_SAME_PINS__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Same Association</em>' operation.
@@ -98657,7 +99191,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_ACTION___VALIDATE_SAME_ASSOCIATION__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int LINK_ACTION___VALIDATE_SAME_ASSOCIATION__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Not Static</em>' operation.
@@ -98666,7 +99201,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_ACTION___VALIDATE_NOT_STATIC__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 2;
+	int LINK_ACTION___VALIDATE_NOT_STATIC__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Association</em>' operation.
@@ -99557,7 +100093,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WRITE_LINK_ACTION___VALIDATE_ALLOW_ACCESS__DIAGNOSTICCHAIN_MAP = LINK_ACTION_OPERATION_COUNT + 0;
+	int WRITE_LINK_ACTION___VALIDATE_ALLOW_ACCESS__DIAGNOSTICCHAIN_MAP = LINK_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Write Link Action</em>' class.
@@ -99980,7 +100517,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_END_DATA___VALIDATE_SAME_TYPE__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 0;
+	int LINK_END_DATA___VALIDATE_SAME_TYPE__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity</em>' operation.
@@ -99989,7 +100527,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_END_DATA___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 1;
+	int LINK_END_DATA___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate End Object Input Pin</em>' operation.
@@ -99998,7 +100537,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_END_DATA___VALIDATE_END_OBJECT_INPUT_PIN__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 2;
+	int LINK_END_DATA___VALIDATE_END_OBJECT_INPUT_PIN__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Property Is Association End</em>' operation.
@@ -100007,7 +100547,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_END_DATA___VALIDATE_PROPERTY_IS_ASSOCIATION_END__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 3;
+	int LINK_END_DATA___VALIDATE_PROPERTY_IS_ASSOCIATION_END__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Qualifiers</em>' operation.
@@ -100016,7 +100557,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_END_DATA___VALIDATE_QUALIFIERS__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 4;
+	int LINK_END_DATA___VALIDATE_QUALIFIERS__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>All Pins</em>' operation.
@@ -100439,7 +100981,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int QUALIFIER_VALUE___VALIDATE_MULTIPLICITY_OF_QUALIFIER__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 0;
+	int QUALIFIER_VALUE___VALIDATE_MULTIPLICITY_OF_QUALIFIER__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Type Of Qualifier</em>' operation.
@@ -100448,7 +100991,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int QUALIFIER_VALUE___VALIDATE_TYPE_OF_QUALIFIER__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 1;
+	int QUALIFIER_VALUE___VALIDATE_TYPE_OF_QUALIFIER__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Qualifier Attribute</em>' operation.
@@ -100457,7 +101001,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int QUALIFIER_VALUE___VALIDATE_QUALIFIER_ATTRIBUTE__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 2;
+	int QUALIFIER_VALUE___VALIDATE_QUALIFIER_ATTRIBUTE__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Qualifier Value</em>' class.
@@ -100736,7 +101281,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE_ACTION__STRUCTURAL_FEATURE = ACTION_FEATURE_COUNT + 1;
+	int STRUCTURAL_FEATURE_ACTION__STRUCTURAL_FEATURE = ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Structural Feature Action</em>' class.
@@ -101303,7 +101849,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int STRUCTURAL_FEATURE_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Object Type</em>' operation.
@@ -101312,7 +101859,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE_ACTION___VALIDATE_OBJECT_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int STRUCTURAL_FEATURE_ACTION___VALIDATE_OBJECT_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Visibility</em>' operation.
@@ -101321,7 +101869,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE_ACTION___VALIDATE_VISIBILITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 2;
+	int STRUCTURAL_FEATURE_ACTION___VALIDATE_VISIBILITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Not Static</em>' operation.
@@ -101330,7 +101879,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE_ACTION___VALIDATE_NOT_STATIC__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 3;
+	int STRUCTURAL_FEATURE_ACTION___VALIDATE_NOT_STATIC__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate One Featuring Classifier</em>' operation.
@@ -101339,7 +101889,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STRUCTURAL_FEATURE_ACTION___VALIDATE_ONE_FEATURING_CLASSIFIER__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 4;
+	int STRUCTURAL_FEATURE_ACTION___VALIDATE_ONE_FEATURING_CLASSIFIER__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The number of operations of the '<em>Structural Feature Action</em>' class.
@@ -101627,7 +102178,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WRITE_STRUCTURAL_FEATURE_ACTION__RESULT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 0;
+	int WRITE_STRUCTURAL_FEATURE_ACTION__RESULT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Value</b></em>' containment reference.
@@ -101636,7 +102188,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WRITE_STRUCTURAL_FEATURE_ACTION__VALUE = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 1;
+	int WRITE_STRUCTURAL_FEATURE_ACTION__VALUE = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Write Structural Feature Action</em>' class.
@@ -101645,7 +102198,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 2;
+	int WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -102248,7 +102802,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WRITE_STRUCTURAL_FEATURE_ACTION___VALIDATE_MULTIPLICITY_OF_RESULT__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 0;
+	int WRITE_STRUCTURAL_FEATURE_ACTION___VALIDATE_MULTIPLICITY_OF_RESULT__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Type Of Value</em>' operation.
@@ -102257,7 +102812,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WRITE_STRUCTURAL_FEATURE_ACTION___VALIDATE_TYPE_OF_VALUE__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 1;
+	int WRITE_STRUCTURAL_FEATURE_ACTION___VALIDATE_TYPE_OF_VALUE__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity Of Value</em>' operation.
@@ -102266,7 +102822,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WRITE_STRUCTURAL_FEATURE_ACTION___VALIDATE_MULTIPLICITY_OF_VALUE__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 2;
+	int WRITE_STRUCTURAL_FEATURE_ACTION___VALIDATE_MULTIPLICITY_OF_VALUE__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Type Of Result</em>' operation.
@@ -102275,7 +102832,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WRITE_STRUCTURAL_FEATURE_ACTION___VALIDATE_TYPE_OF_RESULT__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 3;
+	int WRITE_STRUCTURAL_FEATURE_ACTION___VALIDATE_TYPE_OF_RESULT__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The number of operations of the '<em>Write Structural Feature Action</em>' class.
@@ -102284,7 +102842,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WRITE_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 4;
+	int WRITE_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -103130,7 +103689,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WRITE_VARIABLE_ACTION___VALIDATE_VALUE_TYPE__DIAGNOSTICCHAIN_MAP = VARIABLE_ACTION_OPERATION_COUNT + 0;
+	int WRITE_VARIABLE_ACTION___VALIDATE_VALUE_TYPE__DIAGNOSTICCHAIN_MAP = VARIABLE_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity</em>' operation.
@@ -103139,7 +103699,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WRITE_VARIABLE_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = VARIABLE_ACTION_OPERATION_COUNT + 1;
+	int WRITE_VARIABLE_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = VARIABLE_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Write Variable Action</em>' class.
@@ -103148,7 +103709,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int WRITE_VARIABLE_ACTION_OPERATION_COUNT = VARIABLE_ACTION_OPERATION_COUNT + 2;
+	int WRITE_VARIABLE_ACTION_OPERATION_COUNT = VARIABLE_ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -103994,7 +104556,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACCEPT_EVENT_ACTION___VALIDATE_ONE_OUTPUT_PIN__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int ACCEPT_EVENT_ACTION___VALIDATE_ONE_OUTPUT_PIN__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate No Input Pins</em>' operation.
@@ -104003,7 +104566,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACCEPT_EVENT_ACTION___VALIDATE_NO_INPUT_PINS__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int ACCEPT_EVENT_ACTION___VALIDATE_NO_INPUT_PINS__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate No Output Pins</em>' operation.
@@ -104012,7 +104576,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACCEPT_EVENT_ACTION___VALIDATE_NO_OUTPUT_PINS__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 2;
+	int ACCEPT_EVENT_ACTION___VALIDATE_NO_OUTPUT_PINS__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Unmarshall Signal Events</em>' operation.
@@ -104021,7 +104586,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACCEPT_EVENT_ACTION___VALIDATE_UNMARSHALL_SIGNAL_EVENTS__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 3;
+	int ACCEPT_EVENT_ACTION___VALIDATE_UNMARSHALL_SIGNAL_EVENTS__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Conforming Type</em>' operation.
@@ -104030,7 +104596,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACCEPT_EVENT_ACTION___VALIDATE_CONFORMING_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 4;
+	int ACCEPT_EVENT_ACTION___VALIDATE_CONFORMING_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The number of operations of the '<em>Accept Event Action</em>' class.
@@ -104327,7 +104894,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACCEPT_CALL_ACTION__RETURN_INFORMATION = ACCEPT_EVENT_ACTION_FEATURE_COUNT + 0;
+	int ACCEPT_CALL_ACTION__RETURN_INFORMATION = ACCEPT_EVENT_ACTION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The number of structural features of the '<em>Accept Call Action</em>' class.
@@ -104336,7 +104904,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACCEPT_CALL_ACTION_FEATURE_COUNT = ACCEPT_EVENT_ACTION_FEATURE_COUNT + 1;
+	int ACCEPT_CALL_ACTION_FEATURE_COUNT = ACCEPT_EVENT_ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -104939,7 +105508,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACCEPT_CALL_ACTION___VALIDATE_RESULT_PINS__DIAGNOSTICCHAIN_MAP = ACCEPT_EVENT_ACTION_OPERATION_COUNT + 0;
+	int ACCEPT_CALL_ACTION___VALIDATE_RESULT_PINS__DIAGNOSTICCHAIN_MAP = ACCEPT_EVENT_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Trigger Call Event</em>' operation.
@@ -104948,7 +105518,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACCEPT_CALL_ACTION___VALIDATE_TRIGGER_CALL_EVENT__DIAGNOSTICCHAIN_MAP = ACCEPT_EVENT_ACTION_OPERATION_COUNT + 1;
+	int ACCEPT_CALL_ACTION___VALIDATE_TRIGGER_CALL_EVENT__DIAGNOSTICCHAIN_MAP = ACCEPT_EVENT_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Unmarshall</em>' operation.
@@ -104957,7 +105528,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACCEPT_CALL_ACTION___VALIDATE_UNMARSHALL__DIAGNOSTICCHAIN_MAP = ACCEPT_EVENT_ACTION_OPERATION_COUNT + 2;
+	int ACCEPT_CALL_ACTION___VALIDATE_UNMARSHALL__DIAGNOSTICCHAIN_MAP = ACCEPT_EVENT_ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Accept Call Action</em>' class.
@@ -104966,7 +105538,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACCEPT_CALL_ACTION_OPERATION_COUNT = ACCEPT_EVENT_ACTION_OPERATION_COUNT + 3;
+	int ACCEPT_CALL_ACTION_OPERATION_COUNT = ACCEPT_EVENT_ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -106010,7 +106583,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTION_INPUT_PIN___VALIDATE_INPUT_PIN__DIAGNOSTICCHAIN_MAP = INPUT_PIN_OPERATION_COUNT + 0;
+	int ACTION_INPUT_PIN___VALIDATE_INPUT_PIN__DIAGNOSTICCHAIN_MAP = INPUT_PIN_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate One Output Pin</em>' operation.
@@ -106019,7 +106593,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTION_INPUT_PIN___VALIDATE_ONE_OUTPUT_PIN__DIAGNOSTICCHAIN_MAP = INPUT_PIN_OPERATION_COUNT + 1;
+	int ACTION_INPUT_PIN___VALIDATE_ONE_OUTPUT_PIN__DIAGNOSTICCHAIN_MAP = INPUT_PIN_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate No Control Or Object Flow</em>' operation.
@@ -106028,7 +106603,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTION_INPUT_PIN___VALIDATE_NO_CONTROL_OR_OBJECT_FLOW__DIAGNOSTICCHAIN_MAP = INPUT_PIN_OPERATION_COUNT + 2;
+	int ACTION_INPUT_PIN___VALIDATE_NO_CONTROL_OR_OBJECT_FLOW__DIAGNOSTICCHAIN_MAP = INPUT_PIN_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Action Input Pin</em>' class.
@@ -106334,7 +106910,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 0;
+	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Is Replace All</b></em>' attribute.
@@ -106343,7 +106920,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REPLACE_ALL = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 1;
+	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REPLACE_ALL = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Add Structural Feature Value Action</em>' class.
@@ -106352,7 +106930,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION_FEATURE_COUNT = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 2;
+	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION_FEATURE_COUNT = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -106991,7 +107570,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION___VALIDATE_REQUIRED_VALUE__DIAGNOSTICCHAIN_MAP = WRITE_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 0;
+	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION___VALIDATE_REQUIRED_VALUE__DIAGNOSTICCHAIN_MAP = WRITE_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Insert At Pin</em>' operation.
@@ -107000,7 +107580,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION___VALIDATE_INSERT_AT_PIN__DIAGNOSTICCHAIN_MAP = WRITE_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 1;
+	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION___VALIDATE_INSERT_AT_PIN__DIAGNOSTICCHAIN_MAP = WRITE_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Add Structural Feature Value Action</em>' class.
@@ -107009,7 +107590,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION_OPERATION_COUNT = WRITE_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 2;
+	int ADD_STRUCTURAL_FEATURE_VALUE_ACTION_OPERATION_COUNT = WRITE_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -107288,7 +107870,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ADD_VARIABLE_VALUE_ACTION__INSERT_AT = WRITE_VARIABLE_ACTION_FEATURE_COUNT + 0;
+	int ADD_VARIABLE_VALUE_ACTION__INSERT_AT = WRITE_VARIABLE_ACTION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Is Replace All</b></em>' attribute.
@@ -107297,7 +107880,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ADD_VARIABLE_VALUE_ACTION__IS_REPLACE_ALL = WRITE_VARIABLE_ACTION_FEATURE_COUNT + 1;
+	int ADD_VARIABLE_VALUE_ACTION__IS_REPLACE_ALL = WRITE_VARIABLE_ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Add Variable Value Action</em>' class.
@@ -107306,7 +107890,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ADD_VARIABLE_VALUE_ACTION_FEATURE_COUNT = WRITE_VARIABLE_ACTION_FEATURE_COUNT + 2;
+	int ADD_VARIABLE_VALUE_ACTION_FEATURE_COUNT = WRITE_VARIABLE_ACTION_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -107891,7 +108476,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ADD_VARIABLE_VALUE_ACTION___VALIDATE_REQUIRED_VALUE__DIAGNOSTICCHAIN_MAP = WRITE_VARIABLE_ACTION_OPERATION_COUNT + 0;
+	int ADD_VARIABLE_VALUE_ACTION___VALIDATE_REQUIRED_VALUE__DIAGNOSTICCHAIN_MAP = WRITE_VARIABLE_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Insert At Pin</em>' operation.
@@ -107900,7 +108486,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ADD_VARIABLE_VALUE_ACTION___VALIDATE_INSERT_AT_PIN__DIAGNOSTICCHAIN_MAP = WRITE_VARIABLE_ACTION_OPERATION_COUNT + 1;
+	int ADD_VARIABLE_VALUE_ACTION___VALIDATE_INSERT_AT_PIN__DIAGNOSTICCHAIN_MAP = WRITE_VARIABLE_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Add Variable Value Action</em>' class.
@@ -107909,7 +108496,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ADD_VARIABLE_VALUE_ACTION_OPERATION_COUNT = WRITE_VARIABLE_ACTION_OPERATION_COUNT + 2;
+	int ADD_VARIABLE_VALUE_ACTION_OPERATION_COUNT = WRITE_VARIABLE_ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -109034,7 +109622,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BROADCAST_SIGNAL_ACTION_FEATURE_COUNT = INVOCATION_ACTION_FEATURE_COUNT + 1;
+	int BROADCAST_SIGNAL_ACTION_FEATURE_COUNT = INVOCATION_ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -109592,7 +110181,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BROADCAST_SIGNAL_ACTION___VALIDATE_NUMBER_OF_ARGUMENTS__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT + 0;
+	int BROADCAST_SIGNAL_ACTION___VALIDATE_NUMBER_OF_ARGUMENTS__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Type Ordering Multiplicity</em>' operation.
@@ -109601,7 +110191,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BROADCAST_SIGNAL_ACTION___VALIDATE_TYPE_ORDERING_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT + 1;
+	int BROADCAST_SIGNAL_ACTION___VALIDATE_TYPE_ORDERING_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate No Onport</em>' operation.
@@ -109610,7 +110201,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BROADCAST_SIGNAL_ACTION___VALIDATE_NO_ONPORT__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT + 2;
+	int BROADCAST_SIGNAL_ACTION___VALIDATE_NO_ONPORT__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Broadcast Signal Action</em>' class.
@@ -109619,7 +110211,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BROADCAST_SIGNAL_ACTION_OPERATION_COUNT = INVOCATION_ACTION_OPERATION_COUNT + 3;
+	int BROADCAST_SIGNAL_ACTION_OPERATION_COUNT = INVOCATION_ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -110474,7 +111067,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CALL_ACTION___VALIDATE_ARGUMENT_PINS__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT + 0;
+	int CALL_ACTION___VALIDATE_ARGUMENT_PINS__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Result Pins</em>' operation.
@@ -110483,7 +111077,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CALL_ACTION___VALIDATE_RESULT_PINS__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT + 1;
+	int CALL_ACTION___VALIDATE_RESULT_PINS__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Synchronous Call</em>' operation.
@@ -110492,7 +111087,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CALL_ACTION___VALIDATE_SYNCHRONOUS_CALL__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT + 2;
+	int CALL_ACTION___VALIDATE_SYNCHRONOUS_CALL__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Input Parameters</em>' operation.
@@ -111428,7 +112024,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CALL_BEHAVIOR_ACTION___VALIDATE_NO_ONPORT__DIAGNOSTICCHAIN_MAP = CALL_ACTION_OPERATION_COUNT + 0;
+	int CALL_BEHAVIOR_ACTION___VALIDATE_NO_ONPORT__DIAGNOSTICCHAIN_MAP = CALL_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Call Behavior Action</em>' class.
@@ -112355,7 +112952,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CALL_OPERATION_ACTION___VALIDATE_TYPE_TARGET_PIN__DIAGNOSTICCHAIN_MAP = CALL_ACTION_OPERATION_COUNT + 0;
+	int CALL_OPERATION_ACTION___VALIDATE_TYPE_TARGET_PIN__DIAGNOSTICCHAIN_MAP = CALL_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Call Operation Action</em>' class.
@@ -112805,7 +113403,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLAUSE___VALIDATE_BODY_OUTPUT_PINS__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 0;
+	int CLAUSE___VALIDATE_BODY_OUTPUT_PINS__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Decider Output</em>' operation.
@@ -112814,7 +113413,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLAUSE___VALIDATE_DECIDER_OUTPUT__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 1;
+	int CLAUSE___VALIDATE_DECIDER_OUTPUT__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Test And Body</em>' operation.
@@ -112823,7 +113423,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLAUSE___VALIDATE_TEST_AND_BODY__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT + 2;
+	int CLAUSE___VALIDATE_TEST_AND_BODY__DIAGNOSTICCHAIN_MAP = ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Clause</em>' class.
@@ -113669,7 +114270,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLEAR_ASSOCIATION_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int CLEAR_ASSOCIATION_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Same Type</em>' operation.
@@ -113678,7 +114280,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLEAR_ASSOCIATION_ACTION___VALIDATE_SAME_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int CLEAR_ASSOCIATION_ACTION___VALIDATE_SAME_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Clear Association Action</em>' class.
@@ -113966,7 +114569,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 0;
+	int CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The number of structural features of the '<em>Clear Structural Feature Action</em>' class.
@@ -113975,7 +114579,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLEAR_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 1;
+	int CLEAR_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -114578,7 +115183,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLEAR_STRUCTURAL_FEATURE_ACTION___VALIDATE_TYPE_OF_RESULT__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 0;
+	int CLEAR_STRUCTURAL_FEATURE_ACTION___VALIDATE_TYPE_OF_RESULT__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity Of Result</em>' operation.
@@ -114587,7 +115193,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLEAR_STRUCTURAL_FEATURE_ACTION___VALIDATE_MULTIPLICITY_OF_RESULT__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 1;
+	int CLEAR_STRUCTURAL_FEATURE_ACTION___VALIDATE_MULTIPLICITY_OF_RESULT__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Clear Structural Feature Action</em>' class.
@@ -114596,7 +115203,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLEAR_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 2;
+	int CLEAR_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -115433,7 +116041,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CLEAR_VARIABLE_ACTION_OPERATION_COUNT = VARIABLE_ACTION_OPERATION_COUNT + 0;
+	int CLEAR_VARIABLE_ACTION_OPERATION_COUNT = VARIABLE_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -115856,7 +116465,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONDITIONAL_NODE__IS_ASSURED = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 1;
+	int CONDITIONAL_NODE__IS_ASSURED = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Is Determinate</b></em>' attribute.
@@ -115865,7 +116475,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONDITIONAL_NODE__IS_DETERMINATE = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 2;
+	int CONDITIONAL_NODE__IS_DETERMINATE = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>Result</b></em>' containment reference list.
@@ -115883,7 +116494,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONDITIONAL_NODE_FEATURE_COUNT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 4;
+	int CONDITIONAL_NODE_FEATURE_COUNT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -116621,7 +117233,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONDITIONAL_NODE___VALIDATE_RESULT_NO_INCOMING__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 0;
+	int CONDITIONAL_NODE___VALIDATE_RESULT_NO_INCOMING__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate No Input Pins</em>' operation.
@@ -116630,7 +117243,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONDITIONAL_NODE___VALIDATE_NO_INPUT_PINS__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 1;
+	int CONDITIONAL_NODE___VALIDATE_NO_INPUT_PINS__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate One Clause With Executable Node</em>' operation.
@@ -116639,7 +117253,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONDITIONAL_NODE___VALIDATE_ONE_CLAUSE_WITH_EXECUTABLE_NODE__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 2;
+	int CONDITIONAL_NODE___VALIDATE_ONE_CLAUSE_WITH_EXECUTABLE_NODE__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Matching Output Pins</em>' operation.
@@ -116648,7 +117263,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONDITIONAL_NODE___VALIDATE_MATCHING_OUTPUT_PINS__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 3;
+	int CONDITIONAL_NODE___VALIDATE_MATCHING_OUTPUT_PINS__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Executable Nodes</em>' operation.
@@ -116657,7 +117273,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONDITIONAL_NODE___VALIDATE_EXECUTABLE_NODES__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 4;
+	int CONDITIONAL_NODE___VALIDATE_EXECUTABLE_NODES__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Clause No Predecessor</em>' operation.
@@ -116666,7 +117283,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONDITIONAL_NODE___VALIDATE_CLAUSE_NO_PREDECESSOR__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 5;
+	int CONDITIONAL_NODE___VALIDATE_CLAUSE_NO_PREDECESSOR__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The number of operations of the '<em>Conditional Node</em>' class.
@@ -116675,7 +117293,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONDITIONAL_NODE_OPERATION_COUNT = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 6;
+	int CONDITIONAL_NODE_OPERATION_COUNT = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -117557,7 +118176,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_LINK_ACTION___VALIDATE_ASSOCIATION_NOT_ABSTRACT__DIAGNOSTICCHAIN_MAP = WRITE_LINK_ACTION_OPERATION_COUNT + 0;
+	int CREATE_LINK_ACTION___VALIDATE_ASSOCIATION_NOT_ABSTRACT__DIAGNOSTICCHAIN_MAP = WRITE_LINK_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Create Link Action</em>' class.
@@ -117566,7 +118186,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_LINK_ACTION_OPERATION_COUNT = WRITE_LINK_ACTION_OPERATION_COUNT + 1;
+	int CREATE_LINK_ACTION_OPERATION_COUNT = WRITE_LINK_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -117647,7 +118268,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_END_CREATION_DATA__IS_REPLACE_ALL = LINK_END_DATA_FEATURE_COUNT + 1;
+	int LINK_END_CREATION_DATA__IS_REPLACE_ALL = LINK_END_DATA_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Link End Creation Data</em>' class.
@@ -118052,7 +118674,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_END_CREATION_DATA___VALIDATE_INSERT_AT_PIN__DIAGNOSTICCHAIN_MAP = LINK_END_DATA_OPERATION_COUNT + 0;
+	int LINK_END_CREATION_DATA___VALIDATE_INSERT_AT_PIN__DIAGNOSTICCHAIN_MAP = LINK_END_DATA_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Link End Creation Data</em>' class.
@@ -118061,7 +118684,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_END_CREATION_DATA_OPERATION_COUNT = LINK_END_DATA_OPERATION_COUNT + 1;
+	int LINK_END_CREATION_DATA_OPERATION_COUNT = LINK_END_DATA_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -118340,7 +118964,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_LINK_OBJECT_ACTION__RESULT = CREATE_LINK_ACTION_FEATURE_COUNT + 0;
+	int CREATE_LINK_OBJECT_ACTION__RESULT = CREATE_LINK_ACTION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The number of structural features of the '<em>Create Link Object Action</em>' class.
@@ -118349,7 +118974,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_LINK_OBJECT_ACTION_FEATURE_COUNT = CREATE_LINK_ACTION_FEATURE_COUNT + 1;
+	int CREATE_LINK_OBJECT_ACTION_FEATURE_COUNT = CREATE_LINK_ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -118961,7 +119587,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_LINK_OBJECT_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = CREATE_LINK_ACTION_OPERATION_COUNT + 0;
+	int CREATE_LINK_OBJECT_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = CREATE_LINK_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Type Of Result</em>' operation.
@@ -118970,7 +119597,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_LINK_OBJECT_ACTION___VALIDATE_TYPE_OF_RESULT__DIAGNOSTICCHAIN_MAP = CREATE_LINK_ACTION_OPERATION_COUNT + 1;
+	int CREATE_LINK_OBJECT_ACTION___VALIDATE_TYPE_OF_RESULT__DIAGNOSTICCHAIN_MAP = CREATE_LINK_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Association Class</em>' operation.
@@ -118979,7 +119607,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_LINK_OBJECT_ACTION___VALIDATE_ASSOCIATION_CLASS__DIAGNOSTICCHAIN_MAP = CREATE_LINK_ACTION_OPERATION_COUNT + 2;
+	int CREATE_LINK_OBJECT_ACTION___VALIDATE_ASSOCIATION_CLASS__DIAGNOSTICCHAIN_MAP = CREATE_LINK_ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Create Link Object Action</em>' class.
@@ -118988,7 +119617,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_LINK_OBJECT_ACTION_OPERATION_COUNT = CREATE_LINK_ACTION_OPERATION_COUNT + 3;
+	int CREATE_LINK_OBJECT_ACTION_OPERATION_COUNT = CREATE_LINK_ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -119825,7 +120455,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_OBJECT_ACTION___VALIDATE_CLASSIFIER_NOT_ABSTRACT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int CREATE_OBJECT_ACTION___VALIDATE_CLASSIFIER_NOT_ABSTRACT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity</em>' operation.
@@ -119834,7 +120465,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_OBJECT_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int CREATE_OBJECT_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Classifier Not Association Class</em>' operation.
@@ -119843,7 +120475,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_OBJECT_ACTION___VALIDATE_CLASSIFIER_NOT_ASSOCIATION_CLASS__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 2;
+	int CREATE_OBJECT_ACTION___VALIDATE_CLASSIFIER_NOT_ASSOCIATION_CLASS__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Same Type</em>' operation.
@@ -119852,7 +120485,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CREATE_OBJECT_ACTION___VALIDATE_SAME_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 3;
+	int CREATE_OBJECT_ACTION___VALIDATE_SAME_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The number of operations of the '<em>Create Object Action</em>' class.
@@ -120743,7 +121377,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DESTROY_LINK_ACTION_OPERATION_COUNT = WRITE_LINK_ACTION_OPERATION_COUNT + 0;
+	int DESTROY_LINK_ACTION_OPERATION_COUNT = WRITE_LINK_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -120824,7 +121459,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_END_DESTRUCTION_DATA__IS_DESTROY_DUPLICATES = LINK_END_DATA_FEATURE_COUNT + 1;
+	int LINK_END_DESTRUCTION_DATA__IS_DESTROY_DUPLICATES = LINK_END_DATA_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Link End Destruction Data</em>' class.
@@ -120833,7 +121469,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_END_DESTRUCTION_DATA_FEATURE_COUNT = LINK_END_DATA_FEATURE_COUNT + 2;
+	int LINK_END_DESTRUCTION_DATA_FEATURE_COUNT = LINK_END_DATA_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -121229,7 +121866,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_END_DESTRUCTION_DATA___VALIDATE_DESTROY_AT_PIN__DIAGNOSTICCHAIN_MAP = LINK_END_DATA_OPERATION_COUNT + 0;
+	int LINK_END_DESTRUCTION_DATA___VALIDATE_DESTROY_AT_PIN__DIAGNOSTICCHAIN_MAP = LINK_END_DATA_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Link End Destruction Data</em>' class.
@@ -121238,7 +121876,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LINK_END_DESTRUCTION_DATA_OPERATION_COUNT = LINK_END_DATA_OPERATION_COUNT + 1;
+	int LINK_END_DESTRUCTION_DATA_OPERATION_COUNT = LINK_END_DATA_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -121508,7 +122147,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DESTROY_OBJECT_ACTION__IS_DESTROY_OWNED_OBJECTS = ACTION_FEATURE_COUNT + 1;
+	int DESTROY_OBJECT_ACTION__IS_DESTROY_OWNED_OBJECTS = ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Target</b></em>' containment reference.
@@ -122084,7 +122724,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DESTROY_OBJECT_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int DESTROY_OBJECT_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate No Type</em>' operation.
@@ -122093,7 +122734,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DESTROY_OBJECT_ACTION___VALIDATE_NO_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int DESTROY_OBJECT_ACTION___VALIDATE_NO_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Destroy Object Action</em>' class.
@@ -122921,7 +123563,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_NODE___VALIDATE_REGION_AS_INPUT_OR_OUTPUT__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 0;
+	int EXPANSION_NODE___VALIDATE_REGION_AS_INPUT_OR_OUTPUT__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Expansion Node</em>' class.
@@ -123353,7 +123996,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_REGION__OUTPUT_ELEMENT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 1;
+	int EXPANSION_REGION__OUTPUT_ELEMENT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Input Element</b></em>' reference list.
@@ -123362,7 +124006,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_REGION__INPUT_ELEMENT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 2;
+	int EXPANSION_REGION__INPUT_ELEMENT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The number of structural features of the '<em>Expansion Region</em>' class.
@@ -123371,7 +124016,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_REGION_FEATURE_COUNT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 3;
+	int EXPANSION_REGION_FEATURE_COUNT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -124109,7 +124755,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_REGION_OPERATION_COUNT = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 0;
+	int EXPANSION_REGION_OPERATION_COUNT = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -124568,7 +125215,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LOOP_NODE__LOOP_VARIABLE_INPUT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 5;
+	int LOOP_NODE__LOOP_VARIABLE_INPUT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT
+		+ 5;
 
 	/**
 	 * The feature id for the '<em><b>Result</b></em>' containment reference list.
@@ -125342,7 +125990,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LOOP_NODE___VALIDATE_RESULT_NO_INCOMING__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 0;
+	int LOOP_NODE___VALIDATE_RESULT_NO_INCOMING__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Input Edges</em>' operation.
@@ -125351,7 +126000,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LOOP_NODE___VALIDATE_INPUT_EDGES__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 1;
+	int LOOP_NODE___VALIDATE_INPUT_EDGES__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Executable Nodes</em>' operation.
@@ -125360,7 +126010,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LOOP_NODE___VALIDATE_EXECUTABLE_NODES__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 2;
+	int LOOP_NODE___VALIDATE_EXECUTABLE_NODES__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Body Output Pins</em>' operation.
@@ -125369,7 +126020,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LOOP_NODE___VALIDATE_BODY_OUTPUT_PINS__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 3;
+	int LOOP_NODE___VALIDATE_BODY_OUTPUT_PINS__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Setup Test And Body</em>' operation.
@@ -125378,7 +126030,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LOOP_NODE___VALIDATE_SETUP_TEST_AND_BODY__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 4;
+	int LOOP_NODE___VALIDATE_SETUP_TEST_AND_BODY__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Matching Output Pins</em>' operation.
@@ -125387,7 +126040,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LOOP_NODE___VALIDATE_MATCHING_OUTPUT_PINS__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 5;
+	int LOOP_NODE___VALIDATE_MATCHING_OUTPUT_PINS__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Validate Matching Loop Variables</em>' operation.
@@ -125396,7 +126050,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LOOP_NODE___VALIDATE_MATCHING_LOOP_VARIABLES__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 6;
+	int LOOP_NODE___VALIDATE_MATCHING_LOOP_VARIABLES__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Validate Matching Result Pins</em>' operation.
@@ -125405,7 +126060,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LOOP_NODE___VALIDATE_MATCHING_RESULT_PINS__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 7;
+	int LOOP_NODE___VALIDATE_MATCHING_RESULT_PINS__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The operation id for the '<em>Validate Loop Variable Outgoing</em>' operation.
@@ -125414,7 +126070,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LOOP_NODE___VALIDATE_LOOP_VARIABLE_OUTGOING__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 8;
+	int LOOP_NODE___VALIDATE_LOOP_VARIABLE_OUTGOING__DIAGNOSTICCHAIN_MAP = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The number of operations of the '<em>Loop Node</em>' class.
@@ -125423,7 +126080,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LOOP_NODE_OPERATION_COUNT = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 9;
+	int LOOP_NODE_OPERATION_COUNT = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 9;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -126278,7 +126936,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OPAQUE_ACTION___VALIDATE_LANGUAGE_BODY_SIZE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int OPAQUE_ACTION___VALIDATE_LANGUAGE_BODY_SIZE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Opaque Action</em>' class.
@@ -127952,7 +128611,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_EXTENT_ACTION___VALIDATE_TYPE_IS_CLASSIFIER__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int READ_EXTENT_ACTION___VALIDATE_TYPE_IS_CLASSIFIER__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity Of Result</em>' operation.
@@ -127961,7 +128621,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_EXTENT_ACTION___VALIDATE_MULTIPLICITY_OF_RESULT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int READ_EXTENT_ACTION___VALIDATE_MULTIPLICITY_OF_RESULT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Read Extent Action</em>' class.
@@ -128267,7 +128928,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_IS_CLASSIFIED_OBJECT_ACTION_FEATURE_COUNT = ACTION_FEATURE_COUNT + 4;
+	int READ_IS_CLASSIFIED_OBJECT_ACTION_FEATURE_COUNT = ACTION_FEATURE_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -128825,7 +129487,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_IS_CLASSIFIED_OBJECT_ACTION___VALIDATE_NO_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int READ_IS_CLASSIFIED_OBJECT_ACTION___VALIDATE_NO_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity Of Output</em>' operation.
@@ -128834,7 +129497,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_IS_CLASSIFIED_OBJECT_ACTION___VALIDATE_MULTIPLICITY_OF_OUTPUT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int READ_IS_CLASSIFIED_OBJECT_ACTION___VALIDATE_MULTIPLICITY_OF_OUTPUT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Boolean Result</em>' operation.
@@ -128843,7 +129507,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_IS_CLASSIFIED_OBJECT_ACTION___VALIDATE_BOOLEAN_RESULT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 2;
+	int READ_IS_CLASSIFIED_OBJECT_ACTION___VALIDATE_BOOLEAN_RESULT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity Of Input</em>' operation.
@@ -128852,7 +129517,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_IS_CLASSIFIED_OBJECT_ACTION___VALIDATE_MULTIPLICITY_OF_INPUT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 3;
+	int READ_IS_CLASSIFIED_OBJECT_ACTION___VALIDATE_MULTIPLICITY_OF_INPUT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The number of operations of the '<em>Read Is Classified Object Action</em>' class.
@@ -128861,7 +129527,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_IS_CLASSIFIED_OBJECT_ACTION_OPERATION_COUNT = ACTION_OPERATION_COUNT + 4;
+	int READ_IS_CLASSIFIED_OBJECT_ACTION_OPERATION_COUNT = ACTION_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -129743,7 +130410,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_ACTION___VALIDATE_TYPE_AND_ORDERING__DIAGNOSTICCHAIN_MAP = LINK_ACTION_OPERATION_COUNT + 0;
+	int READ_LINK_ACTION___VALIDATE_TYPE_AND_ORDERING__DIAGNOSTICCHAIN_MAP = LINK_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Compatible Multiplicity</em>' operation.
@@ -129752,7 +130420,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_ACTION___VALIDATE_COMPATIBLE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = LINK_ACTION_OPERATION_COUNT + 1;
+	int READ_LINK_ACTION___VALIDATE_COMPATIBLE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = LINK_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Visibility</em>' operation.
@@ -129761,7 +130430,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_ACTION___VALIDATE_VISIBILITY__DIAGNOSTICCHAIN_MAP = LINK_ACTION_OPERATION_COUNT + 2;
+	int READ_LINK_ACTION___VALIDATE_VISIBILITY__DIAGNOSTICCHAIN_MAP = LINK_ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate One Open End</em>' operation.
@@ -129770,7 +130440,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_ACTION___VALIDATE_ONE_OPEN_END__DIAGNOSTICCHAIN_MAP = LINK_ACTION_OPERATION_COUNT + 3;
+	int READ_LINK_ACTION___VALIDATE_ONE_OPEN_END__DIAGNOSTICCHAIN_MAP = LINK_ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Navigable Open End</em>' operation.
@@ -129779,7 +130450,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_ACTION___VALIDATE_NAVIGABLE_OPEN_END__DIAGNOSTICCHAIN_MAP = LINK_ACTION_OPERATION_COUNT + 4;
+	int READ_LINK_ACTION___VALIDATE_NAVIGABLE_OPEN_END__DIAGNOSTICCHAIN_MAP = LINK_ACTION_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Open End</em>' operation.
@@ -130643,7 +131315,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_ACTION___VALIDATE_PROPERTY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int READ_LINK_OBJECT_END_ACTION___VALIDATE_PROPERTY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity Of Object</em>' operation.
@@ -130652,7 +131325,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_ACTION___VALIDATE_MULTIPLICITY_OF_OBJECT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int READ_LINK_OBJECT_END_ACTION___VALIDATE_MULTIPLICITY_OF_OBJECT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Ends Of Association</em>' operation.
@@ -130661,7 +131335,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_ACTION___VALIDATE_ENDS_OF_ASSOCIATION__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 2;
+	int READ_LINK_OBJECT_END_ACTION___VALIDATE_ENDS_OF_ASSOCIATION__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Type Of Result</em>' operation.
@@ -130670,7 +131345,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_ACTION___VALIDATE_TYPE_OF_RESULT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 3;
+	int READ_LINK_OBJECT_END_ACTION___VALIDATE_TYPE_OF_RESULT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity Of Result</em>' operation.
@@ -130679,7 +131355,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_ACTION___VALIDATE_MULTIPLICITY_OF_RESULT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 4;
+	int READ_LINK_OBJECT_END_ACTION___VALIDATE_MULTIPLICITY_OF_RESULT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Type Of Object</em>' operation.
@@ -130688,7 +131365,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_ACTION___VALIDATE_TYPE_OF_OBJECT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 5;
+	int READ_LINK_OBJECT_END_ACTION___VALIDATE_TYPE_OF_OBJECT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Validate Association Of Association</em>' operation.
@@ -130697,7 +131375,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_ACTION___VALIDATE_ASSOCIATION_OF_ASSOCIATION__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 6;
+	int READ_LINK_OBJECT_END_ACTION___VALIDATE_ASSOCIATION_OF_ASSOCIATION__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The number of operations of the '<em>Read Link Object End Action</em>' class.
@@ -130706,7 +131385,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_ACTION_OPERATION_COUNT = ACTION_OPERATION_COUNT + 7;
+	int READ_LINK_OBJECT_END_ACTION_OPERATION_COUNT = ACTION_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -130967,7 +131647,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT = ACTION_FEATURE_COUNT + 0;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT = ACTION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Qualifier</b></em>' reference.
@@ -130976,7 +131657,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION__QUALIFIER = ACTION_FEATURE_COUNT + 1;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION__QUALIFIER = ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Result</b></em>' containment reference.
@@ -130985,7 +131667,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION__RESULT = ACTION_FEATURE_COUNT + 2;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION__RESULT = ACTION_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The number of structural features of the '<em>Read Link Object End Qualifier Action</em>' class.
@@ -130994,7 +131677,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION_FEATURE_COUNT = ACTION_FEATURE_COUNT + 3;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION_FEATURE_COUNT = ACTION_FEATURE_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -131552,7 +132236,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_MULTIPLICITY_OF_OBJECT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_MULTIPLICITY_OF_OBJECT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Type Of Object</em>' operation.
@@ -131561,7 +132246,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_TYPE_OF_OBJECT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_TYPE_OF_OBJECT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity Of Qualifier</em>' operation.
@@ -131570,7 +132256,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_MULTIPLICITY_OF_QUALIFIER__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 2;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_MULTIPLICITY_OF_QUALIFIER__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Ends Of Association</em>' operation.
@@ -131579,7 +132266,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_ENDS_OF_ASSOCIATION__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 3;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_ENDS_OF_ASSOCIATION__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity Of Result</em>' operation.
@@ -131588,7 +132276,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_MULTIPLICITY_OF_RESULT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 4;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_MULTIPLICITY_OF_RESULT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Same Type</em>' operation.
@@ -131597,7 +132286,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_SAME_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 5;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_SAME_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Validate Association Of Association</em>' operation.
@@ -131606,7 +132296,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_ASSOCIATION_OF_ASSOCIATION__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 6;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_ASSOCIATION_OF_ASSOCIATION__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Validate Qualifier Attribute</em>' operation.
@@ -131615,7 +132306,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_QUALIFIER_ATTRIBUTE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 7;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION___VALIDATE_QUALIFIER_ATTRIBUTE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The number of operations of the '<em>Read Link Object End Qualifier Action</em>' class.
@@ -131624,7 +132316,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION_OPERATION_COUNT = ACTION_OPERATION_COUNT + 8;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION_OPERATION_COUNT = ACTION_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -132452,7 +133145,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_SELF_ACTION___VALIDATE_CONTAINED__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int READ_SELF_ACTION___VALIDATE_CONTAINED__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity</em>' operation.
@@ -132461,7 +133155,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_SELF_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int READ_SELF_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Not Static</em>' operation.
@@ -132470,7 +133165,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_SELF_ACTION___VALIDATE_NOT_STATIC__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 2;
+	int READ_SELF_ACTION___VALIDATE_NOT_STATIC__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Type</em>' operation.
@@ -132479,7 +133175,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_SELF_ACTION___VALIDATE_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 3;
+	int READ_SELF_ACTION___VALIDATE_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The number of operations of the '<em>Read Self Action</em>' class.
@@ -132767,7 +133464,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_STRUCTURAL_FEATURE_ACTION__RESULT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 0;
+	int READ_STRUCTURAL_FEATURE_ACTION__RESULT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The number of structural features of the '<em>Read Structural Feature Action</em>' class.
@@ -132776,7 +133474,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 1;
+	int READ_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT = STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -133379,7 +134078,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_STRUCTURAL_FEATURE_ACTION___VALIDATE_TYPE_AND_ORDERING__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 0;
+	int READ_STRUCTURAL_FEATURE_ACTION___VALIDATE_TYPE_AND_ORDERING__DIAGNOSTICCHAIN_MAP = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Read Structural Feature Action</em>' class.
@@ -133388,7 +134088,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 1;
+	int READ_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT = STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -134234,7 +134935,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_VARIABLE_ACTION___VALIDATE_TYPE_AND_ORDERING__DIAGNOSTICCHAIN_MAP = VARIABLE_ACTION_OPERATION_COUNT + 0;
+	int READ_VARIABLE_ACTION___VALIDATE_TYPE_AND_ORDERING__DIAGNOSTICCHAIN_MAP = VARIABLE_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Compatible Multiplicity</em>' operation.
@@ -134243,7 +134945,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_VARIABLE_ACTION___VALIDATE_COMPATIBLE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = VARIABLE_ACTION_OPERATION_COUNT + 1;
+	int READ_VARIABLE_ACTION___VALIDATE_COMPATIBLE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = VARIABLE_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Read Variable Action</em>' class.
@@ -134252,7 +134955,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int READ_VARIABLE_ACTION_OPERATION_COUNT = VARIABLE_ACTION_OPERATION_COUNT + 2;
+	int READ_VARIABLE_ACTION_OPERATION_COUNT = VARIABLE_ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -135107,7 +135811,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int RECLASSIFY_OBJECT_ACTION___VALIDATE_INPUT_PIN__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int RECLASSIFY_OBJECT_ACTION___VALIDATE_INPUT_PIN__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Classifier Not Abstract</em>' operation.
@@ -135116,7 +135821,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int RECLASSIFY_OBJECT_ACTION___VALIDATE_CLASSIFIER_NOT_ABSTRACT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int RECLASSIFY_OBJECT_ACTION___VALIDATE_CLASSIFIER_NOT_ABSTRACT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity</em>' operation.
@@ -135125,7 +135831,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int RECLASSIFY_OBJECT_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 2;
+	int RECLASSIFY_OBJECT_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Reclassify Object Action</em>' class.
@@ -135989,7 +136696,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDUCE_ACTION___VALIDATE_REDUCER_INPUTS_OUTPUT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int REDUCE_ACTION___VALIDATE_REDUCER_INPUTS_OUTPUT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Input Type Is Collection</em>' operation.
@@ -135998,7 +136706,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDUCE_ACTION___VALIDATE_INPUT_TYPE_IS_COLLECTION__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int REDUCE_ACTION___VALIDATE_INPUT_TYPE_IS_COLLECTION__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Output Types Are Compatible</em>' operation.
@@ -136007,7 +136716,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REDUCE_ACTION___VALIDATE_OUTPUT_TYPES_ARE_COMPATIBLE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 2;
+	int REDUCE_ACTION___VALIDATE_OUTPUT_TYPES_ARE_COMPATIBLE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Reduce Action</em>' class.
@@ -136313,7 +137023,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REMOVE_DUPLICATES = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 0;
+	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REMOVE_DUPLICATES = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Remove At</b></em>' containment reference.
@@ -136322,7 +137033,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 1;
+	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Remove Structural Feature Value Action</em>' class.
@@ -136331,7 +137043,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION_FEATURE_COUNT = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 2;
+	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION_FEATURE_COUNT = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -136970,7 +137683,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION___VALIDATE_REMOVE_AT_AND_VALUE__DIAGNOSTICCHAIN_MAP = WRITE_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 0;
+	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION___VALIDATE_REMOVE_AT_AND_VALUE__DIAGNOSTICCHAIN_MAP = WRITE_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Remove Structural Feature Value Action</em>' class.
@@ -136979,7 +137693,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION_OPERATION_COUNT = WRITE_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT + 1;
+	int REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION_OPERATION_COUNT = WRITE_STRUCTURAL_FEATURE_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -137258,7 +137973,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REMOVE_VARIABLE_VALUE_ACTION__IS_REMOVE_DUPLICATES = WRITE_VARIABLE_ACTION_FEATURE_COUNT + 0;
+	int REMOVE_VARIABLE_VALUE_ACTION__IS_REMOVE_DUPLICATES = WRITE_VARIABLE_ACTION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Remove At</b></em>' containment reference.
@@ -137267,7 +137983,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REMOVE_VARIABLE_VALUE_ACTION__REMOVE_AT = WRITE_VARIABLE_ACTION_FEATURE_COUNT + 1;
+	int REMOVE_VARIABLE_VALUE_ACTION__REMOVE_AT = WRITE_VARIABLE_ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Remove Variable Value Action</em>' class.
@@ -137276,7 +137993,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REMOVE_VARIABLE_VALUE_ACTION_FEATURE_COUNT = WRITE_VARIABLE_ACTION_FEATURE_COUNT + 2;
+	int REMOVE_VARIABLE_VALUE_ACTION_FEATURE_COUNT = WRITE_VARIABLE_ACTION_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -137861,7 +138579,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REMOVE_VARIABLE_VALUE_ACTION___VALIDATE_REMOVE_AT_AND_VALUE__DIAGNOSTICCHAIN_MAP = WRITE_VARIABLE_ACTION_OPERATION_COUNT + 0;
+	int REMOVE_VARIABLE_VALUE_ACTION___VALIDATE_REMOVE_AT_AND_VALUE__DIAGNOSTICCHAIN_MAP = WRITE_VARIABLE_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Remove Variable Value Action</em>' class.
@@ -137870,7 +138589,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REMOVE_VARIABLE_VALUE_ACTION_OPERATION_COUNT = WRITE_VARIABLE_ACTION_OPERATION_COUNT + 1;
+	int REMOVE_VARIABLE_VALUE_ACTION_OPERATION_COUNT = WRITE_VARIABLE_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -138716,7 +139436,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REPLY_ACTION___VALIDATE_PINS_MATCH_PARAMETER__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int REPLY_ACTION___VALIDATE_PINS_MATCH_PARAMETER__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Event On Reply To Call Trigger</em>' operation.
@@ -138725,7 +139446,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REPLY_ACTION___VALIDATE_EVENT_ON_REPLY_TO_CALL_TRIGGER__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int REPLY_ACTION___VALIDATE_EVENT_ON_REPLY_TO_CALL_TRIGGER__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Reply Action</em>' class.
@@ -139589,7 +140311,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SEND_OBJECT_ACTION___VALIDATE_TYPE_TARGET_PIN__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT + 0;
+	int SEND_OBJECT_ACTION___VALIDATE_TYPE_TARGET_PIN__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Send Object Action</em>' class.
@@ -139598,7 +140321,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SEND_OBJECT_ACTION_OPERATION_COUNT = INVOCATION_ACTION_OPERATION_COUNT + 1;
+	int SEND_OBJECT_ACTION_OPERATION_COUNT = INVOCATION_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -140453,7 +141177,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SEND_SIGNAL_ACTION___VALIDATE_TYPE_ORDERING_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT + 0;
+	int SEND_SIGNAL_ACTION___VALIDATE_TYPE_ORDERING_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Number Order</em>' operation.
@@ -140462,7 +141187,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SEND_SIGNAL_ACTION___VALIDATE_NUMBER_ORDER__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT + 1;
+	int SEND_SIGNAL_ACTION___VALIDATE_NUMBER_ORDER__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Type Target Pin</em>' operation.
@@ -140471,7 +141197,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SEND_SIGNAL_ACTION___VALIDATE_TYPE_TARGET_PIN__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT + 2;
+	int SEND_SIGNAL_ACTION___VALIDATE_TYPE_TARGET_PIN__DIAGNOSTICCHAIN_MAP = INVOCATION_ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Send Signal Action</em>' class.
@@ -140480,7 +141207,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SEND_SIGNAL_ACTION_OPERATION_COUNT = INVOCATION_ACTION_OPERATION_COUNT + 3;
+	int SEND_SIGNAL_ACTION_OPERATION_COUNT = INVOCATION_ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -140894,7 +141622,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SEQUENCE_NODE__EXECUTABLE_NODE = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 0;
+	int SEQUENCE_NODE__EXECUTABLE_NODE = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The number of structural features of the '<em>Sequence Node</em>' class.
@@ -140903,7 +141632,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SEQUENCE_NODE_FEATURE_COUNT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 1;
+	int SEQUENCE_NODE_FEATURE_COUNT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -141641,7 +142371,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int SEQUENCE_NODE_OPERATION_COUNT = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT + 0;
+	int SEQUENCE_NODE_OPERATION_COUNT = STRUCTURED_ACTIVITY_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -141911,7 +142642,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int START_CLASSIFIER_BEHAVIOR_ACTION_FEATURE_COUNT = ACTION_FEATURE_COUNT + 1;
+	int START_CLASSIFIER_BEHAVIOR_ACTION_FEATURE_COUNT = ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -142469,7 +143201,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int START_CLASSIFIER_BEHAVIOR_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int START_CLASSIFIER_BEHAVIOR_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Type Has Classifier</em>' operation.
@@ -142478,7 +143211,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int START_CLASSIFIER_BEHAVIOR_ACTION___VALIDATE_TYPE_HAS_CLASSIFIER__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int START_CLASSIFIER_BEHAVIOR_ACTION___VALIDATE_TYPE_HAS_CLASSIFIER__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Start Classifier Behavior Action</em>' class.
@@ -142487,7 +143221,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int START_CLASSIFIER_BEHAVIOR_ACTION_OPERATION_COUNT = ACTION_OPERATION_COUNT + 2;
+	int START_CLASSIFIER_BEHAVIOR_ACTION_OPERATION_COUNT = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -142793,7 +143528,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int START_OBJECT_BEHAVIOR_ACTION_FEATURE_COUNT = CALL_ACTION_FEATURE_COUNT + 1;
+	int START_OBJECT_BEHAVIOR_ACTION_FEATURE_COUNT = CALL_ACTION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -143396,7 +144132,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int START_OBJECT_BEHAVIOR_ACTION___VALIDATE_MULTIPLICITY_OF_OBJECT__DIAGNOSTICCHAIN_MAP = CALL_ACTION_OPERATION_COUNT + 0;
+	int START_OBJECT_BEHAVIOR_ACTION___VALIDATE_MULTIPLICITY_OF_OBJECT__DIAGNOSTICCHAIN_MAP = CALL_ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Type Of Object</em>' operation.
@@ -143405,7 +144142,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int START_OBJECT_BEHAVIOR_ACTION___VALIDATE_TYPE_OF_OBJECT__DIAGNOSTICCHAIN_MAP = CALL_ACTION_OPERATION_COUNT + 1;
+	int START_OBJECT_BEHAVIOR_ACTION___VALIDATE_TYPE_OF_OBJECT__DIAGNOSTICCHAIN_MAP = CALL_ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate No Onport</em>' operation.
@@ -143414,7 +144152,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int START_OBJECT_BEHAVIOR_ACTION___VALIDATE_NO_ONPORT__DIAGNOSTICCHAIN_MAP = CALL_ACTION_OPERATION_COUNT + 2;
+	int START_OBJECT_BEHAVIOR_ACTION___VALIDATE_NO_ONPORT__DIAGNOSTICCHAIN_MAP = CALL_ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Behavior</em>' operation.
@@ -143423,7 +144162,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int START_OBJECT_BEHAVIOR_ACTION___BEHAVIOR = CALL_ACTION_OPERATION_COUNT + 3;
+	int START_OBJECT_BEHAVIOR_ACTION___BEHAVIOR = CALL_ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The number of operations of the '<em>Start Object Behavior Action</em>' class.
@@ -143432,7 +144172,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int START_OBJECT_BEHAVIOR_ACTION_OPERATION_COUNT = CALL_ACTION_OPERATION_COUNT + 4;
+	int START_OBJECT_BEHAVIOR_ACTION_OPERATION_COUNT = CALL_ACTION_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -144278,7 +145019,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEST_IDENTITY_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int TEST_IDENTITY_ACTION___VALIDATE_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate No Type</em>' operation.
@@ -144287,7 +145029,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEST_IDENTITY_ACTION___VALIDATE_NO_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int TEST_IDENTITY_ACTION___VALIDATE_NO_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Result Is Boolean</em>' operation.
@@ -144296,7 +145039,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TEST_IDENTITY_ACTION___VALIDATE_RESULT_IS_BOOLEAN__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 2;
+	int TEST_IDENTITY_ACTION___VALIDATE_RESULT_IS_BOOLEAN__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Test Identity Action</em>' class.
@@ -145151,7 +145895,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int UNMARSHALL_ACTION___VALIDATE_STRUCTURAL_FEATURE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 0;
+	int UNMARSHALL_ACTION___VALIDATE_STRUCTURAL_FEATURE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Number Of Result</em>' operation.
@@ -145160,7 +145905,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int UNMARSHALL_ACTION___VALIDATE_NUMBER_OF_RESULT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 1;
+	int UNMARSHALL_ACTION___VALIDATE_NUMBER_OF_RESULT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Type Ordering And Multiplicity</em>' operation.
@@ -145169,7 +145915,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int UNMARSHALL_ACTION___VALIDATE_TYPE_ORDERING_AND_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 2;
+	int UNMARSHALL_ACTION___VALIDATE_TYPE_ORDERING_AND_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Multiplicity Of Object</em>' operation.
@@ -145178,7 +145925,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int UNMARSHALL_ACTION___VALIDATE_MULTIPLICITY_OF_OBJECT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 3;
+	int UNMARSHALL_ACTION___VALIDATE_MULTIPLICITY_OF_OBJECT__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Object Type</em>' operation.
@@ -145187,7 +145935,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int UNMARSHALL_ACTION___VALIDATE_OBJECT_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT + 4;
+	int UNMARSHALL_ACTION___VALIDATE_OBJECT_TYPE__DIAGNOSTICCHAIN_MAP = ACTION_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The number of operations of the '<em>Unmarshall Action</em>' class.
@@ -146240,7 +146989,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VALUE_PIN___VALIDATE_NO_INCOMING_EDGES__DIAGNOSTICCHAIN_MAP = INPUT_PIN_OPERATION_COUNT + 0;
+	int VALUE_PIN___VALIDATE_NO_INCOMING_EDGES__DIAGNOSTICCHAIN_MAP = INPUT_PIN_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Compatible Type</em>' operation.
@@ -146249,7 +146999,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int VALUE_PIN___VALIDATE_COMPATIBLE_TYPE__DIAGNOSTICCHAIN_MAP = INPUT_PIN_OPERATION_COUNT + 1;
+	int VALUE_PIN___VALIDATE_COMPATIBLE_TYPE__DIAGNOSTICCHAIN_MAP = INPUT_PIN_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Value Pin</em>' class.
@@ -147698,7 +148449,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FINAL_NODE___VALIDATE_NO_OUTGOING_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 0;
+	int FINAL_NODE___VALIDATE_NO_OUTGOING_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Final Node</em>' class.
@@ -149246,7 +149998,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARAMETER_NODE___VALIDATE_NO_OUTGOING_EDGES__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 0;
+	int ACTIVITY_PARAMETER_NODE___VALIDATE_NO_OUTGOING_EDGES__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Has Parameters</em>' operation.
@@ -149255,7 +150008,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARAMETER_NODE___VALIDATE_HAS_PARAMETERS__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 1;
+	int ACTIVITY_PARAMETER_NODE___VALIDATE_HAS_PARAMETERS__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Same Type</em>' operation.
@@ -149264,7 +150018,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARAMETER_NODE___VALIDATE_SAME_TYPE__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 2;
+	int ACTIVITY_PARAMETER_NODE___VALIDATE_SAME_TYPE__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate No Incoming Edges</em>' operation.
@@ -149273,7 +150028,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARAMETER_NODE___VALIDATE_NO_INCOMING_EDGES__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 3;
+	int ACTIVITY_PARAMETER_NODE___VALIDATE_NO_INCOMING_EDGES__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate No Edges</em>' operation.
@@ -149282,7 +150038,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARAMETER_NODE___VALIDATE_NO_EDGES__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT + 4;
+	int ACTIVITY_PARAMETER_NODE___VALIDATE_NO_EDGES__DIAGNOSTICCHAIN_MAP = OBJECT_NODE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The number of operations of the '<em>Activity Parameter Node</em>' class.
@@ -149291,7 +150048,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARAMETER_NODE_OPERATION_COUNT = OBJECT_NODE_OPERATION_COUNT + 5;
+	int ACTIVITY_PARAMETER_NODE_OPERATION_COUNT = OBJECT_NODE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -150830,7 +151588,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROL_FLOW___VALIDATE_OBJECT_NODES__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT + 0;
+	int CONTROL_FLOW___VALIDATE_OBJECT_NODES__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Control Flow</em>' class.
@@ -151640,7 +152399,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DATA_STORE_NODE_OPERATION_COUNT = CENTRAL_BUFFER_NODE_OPERATION_COUNT + 0;
+	int DATA_STORE_NODE_OPERATION_COUNT = CENTRAL_BUFFER_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -152378,7 +153138,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DECISION_NODE___VALIDATE_ZERO_INPUT_PARAMETERS__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 0;
+	int DECISION_NODE___VALIDATE_ZERO_INPUT_PARAMETERS__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Edges</em>' operation.
@@ -152387,7 +153148,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DECISION_NODE___VALIDATE_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 1;
+	int DECISION_NODE___VALIDATE_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Decision Input Flow Incoming</em>' operation.
@@ -152396,7 +153158,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DECISION_NODE___VALIDATE_DECISION_INPUT_FLOW_INCOMING__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 2;
+	int DECISION_NODE___VALIDATE_DECISION_INPUT_FLOW_INCOMING__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Two Input Parameters</em>' operation.
@@ -152405,7 +153168,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DECISION_NODE___VALIDATE_TWO_INPUT_PARAMETERS__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 3;
+	int DECISION_NODE___VALIDATE_TWO_INPUT_PARAMETERS__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Incoming Outgoing Edges</em>' operation.
@@ -152414,7 +153178,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DECISION_NODE___VALIDATE_INCOMING_OUTGOING_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 4;
+	int DECISION_NODE___VALIDATE_INCOMING_OUTGOING_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Incoming Control One Input Parameter</em>' operation.
@@ -152423,7 +153188,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DECISION_NODE___VALIDATE_INCOMING_CONTROL_ONE_INPUT_PARAMETER__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 5;
+	int DECISION_NODE___VALIDATE_INCOMING_CONTROL_ONE_INPUT_PARAMETER__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Validate Parameters</em>' operation.
@@ -152432,7 +153198,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DECISION_NODE___VALIDATE_PARAMETERS__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 6;
+	int DECISION_NODE___VALIDATE_PARAMETERS__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Validate Incoming Object One Input Parameter</em>' operation.
@@ -152441,7 +153208,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DECISION_NODE___VALIDATE_INCOMING_OBJECT_ONE_INPUT_PARAMETER__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 7;
+	int DECISION_NODE___VALIDATE_INCOMING_OBJECT_ONE_INPUT_PARAMETER__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The number of operations of the '<em>Decision Node</em>' class.
@@ -153224,7 +153992,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OBJECT_FLOW___VALIDATE_INPUT_AND_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT + 0;
+	int OBJECT_FLOW___VALIDATE_INPUT_AND_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate No Executable Nodes</em>' operation.
@@ -153233,7 +154002,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OBJECT_FLOW___VALIDATE_NO_EXECUTABLE_NODES__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT + 1;
+	int OBJECT_FLOW___VALIDATE_NO_EXECUTABLE_NODES__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Transformation Behavior</em>' operation.
@@ -153242,7 +154012,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OBJECT_FLOW___VALIDATE_TRANSFORMATION_BEHAVIOR__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT + 2;
+	int OBJECT_FLOW___VALIDATE_TRANSFORMATION_BEHAVIOR__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Selection Behavior</em>' operation.
@@ -153251,7 +154022,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OBJECT_FLOW___VALIDATE_SELECTION_BEHAVIOR__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT + 3;
+	int OBJECT_FLOW___VALIDATE_SELECTION_BEHAVIOR__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Compatible Types</em>' operation.
@@ -153260,7 +154032,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OBJECT_FLOW___VALIDATE_COMPATIBLE_TYPES__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT + 4;
+	int OBJECT_FLOW___VALIDATE_COMPATIBLE_TYPES__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Same Upper Bounds</em>' operation.
@@ -153269,7 +154042,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OBJECT_FLOW___VALIDATE_SAME_UPPER_BOUNDS__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT + 5;
+	int OBJECT_FLOW___VALIDATE_SAME_UPPER_BOUNDS__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Validate Target</em>' operation.
@@ -153278,7 +154052,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OBJECT_FLOW___VALIDATE_TARGET__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT + 6;
+	int OBJECT_FLOW___VALIDATE_TARGET__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Validate Is Multicast Or Is Multireceive</em>' operation.
@@ -153287,7 +154062,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OBJECT_FLOW___VALIDATE_IS_MULTICAST_OR_IS_MULTIRECEIVE__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT + 7;
+	int OBJECT_FLOW___VALIDATE_IS_MULTICAST_OR_IS_MULTIRECEIVE__DIAGNOSTICCHAIN_MAP = ACTIVITY_EDGE_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The number of operations of the '<em>Object Flow</em>' class.
@@ -154745,7 +155521,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FORK_NODE___VALIDATE_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 0;
+	int FORK_NODE___VALIDATE_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate One Incoming Edge</em>' operation.
@@ -154754,7 +155531,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FORK_NODE___VALIDATE_ONE_INCOMING_EDGE__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 1;
+	int FORK_NODE___VALIDATE_ONE_INCOMING_EDGE__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Fork Node</em>' class.
@@ -155483,7 +156261,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INITIAL_NODE___VALIDATE_NO_INCOMING_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 0;
+	int INITIAL_NODE___VALIDATE_NO_INCOMING_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Control Edges</em>' operation.
@@ -155492,7 +156271,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INITIAL_NODE___VALIDATE_CONTROL_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 1;
+	int INITIAL_NODE___VALIDATE_CONTROL_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Initial Node</em>' class.
@@ -156239,7 +157019,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE___VALIDATE_ONE_OUTGOING_EDGE__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 0;
+	int JOIN_NODE___VALIDATE_ONE_OUTGOING_EDGE__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Incoming Object Flow</em>' operation.
@@ -156248,7 +157029,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE___VALIDATE_INCOMING_OBJECT_FLOW__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 1;
+	int JOIN_NODE___VALIDATE_INCOMING_OBJECT_FLOW__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Join Node</em>' class.
@@ -156977,7 +157759,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MERGE_NODE___VALIDATE_ONE_OUTGOING_EDGE__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 0;
+	int MERGE_NODE___VALIDATE_ONE_OUTGOING_EDGE__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Edges</em>' operation.
@@ -156986,7 +157769,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MERGE_NODE___VALIDATE_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT + 1;
+	int MERGE_NODE___VALIDATE_EDGES__DIAGNOSTICCHAIN_MAP = CONTROL_NODE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Merge Node</em>' class.
@@ -157688,7 +158472,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_VALUE_OPERATION_COUNT = VALUE_SPECIFICATION_OPERATION_COUNT + 0;
+	int INSTANCE_VALUE_OPERATION_COUNT = VALUE_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -163520,7 +164305,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FUNCTION_BEHAVIOR___VALIDATE_ONE_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP = OPAQUE_BEHAVIOR_OPERATION_COUNT + 0;
+	int FUNCTION_BEHAVIOR___VALIDATE_ONE_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP = OPAQUE_BEHAVIOR_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Types Of Parameters</em>' operation.
@@ -163529,7 +164315,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FUNCTION_BEHAVIOR___VALIDATE_TYPES_OF_PARAMETERS__DIAGNOSTICCHAIN_MAP = OPAQUE_BEHAVIOR_OPERATION_COUNT + 1;
+	int FUNCTION_BEHAVIOR___VALIDATE_TYPES_OF_PARAMETERS__DIAGNOSTICCHAIN_MAP = OPAQUE_BEHAVIOR_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Has All Data Type Attributes</em>' operation.
@@ -163538,7 +164325,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FUNCTION_BEHAVIOR___HAS_ALL_DATA_TYPE_ATTRIBUTES__DATATYPE = OPAQUE_BEHAVIOR_OPERATION_COUNT + 2;
+	int FUNCTION_BEHAVIOR___HAS_ALL_DATA_TYPE_ATTRIBUTES__DATATYPE = OPAQUE_BEHAVIOR_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Function Behavior</em>' class.
@@ -164798,7 +165586,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TIME_EVENT___VALIDATE_WHEN_NON_NEGATIVE__DIAGNOSTICCHAIN_MAP = EVENT_OPERATION_COUNT + 0;
+	int TIME_EVENT___VALIDATE_WHEN_NON_NEGATIVE__DIAGNOSTICCHAIN_MAP = EVENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Time Event</em>' class.
@@ -165509,7 +166298,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TIME_EXPRESSION___VALIDATE_NO_EXPR_REQUIRES_OBSERVATION__DIAGNOSTICCHAIN_MAP = VALUE_SPECIFICATION_OPERATION_COUNT + 0;
+	int TIME_EXPRESSION___VALIDATE_NO_EXPR_REQUIRES_OBSERVATION__DIAGNOSTICCHAIN_MAP = VALUE_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Time Expression</em>' class.
@@ -165518,7 +166308,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TIME_EXPRESSION_OPERATION_COUNT = VALUE_SPECIFICATION_OPERATION_COUNT + 1;
+	int TIME_EXPRESSION_OPERATION_COUNT = VALUE_SPECIFICATION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -169109,7 +169900,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NODE___VALIDATE_INTERNAL_STRUCTURE__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 1;
+	int NODE___VALIDATE_INTERNAL_STRUCTURE__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Create Communication Path</em>' operation.
@@ -169118,7 +169910,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NODE___CREATE_COMMUNICATION_PATH__BOOLEAN_AGGREGATIONKIND_STRING_INT_INT_NODE_BOOLEAN_AGGREGATIONKIND_STRING_INT_INT = CLASS_OPERATION_COUNT + 2;
+	int NODE___CREATE_COMMUNICATION_PATH__BOOLEAN_AGGREGATIONKIND_STRING_INT_INT_NODE_BOOLEAN_AGGREGATIONKIND_STRING_INT_INT = CLASS_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get Communication Paths</em>' operation.
@@ -172439,7 +173232,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INFORMATION_FLOW__RELATED_ELEMENT = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 0;
+	int INFORMATION_FLOW__RELATED_ELEMENT = PACKAGEABLE_ELEMENT_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Source</b></em>' reference list.
@@ -172475,7 +173269,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INFORMATION_FLOW__INFORMATION_SOURCE = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 4;
+	int INFORMATION_FLOW__INFORMATION_SOURCE = PACKAGEABLE_ELEMENT_FEATURE_COUNT
+		+ 4;
 
 	/**
 	 * The feature id for the '<em><b>Information Target</b></em>' reference list.
@@ -172484,7 +173279,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INFORMATION_FLOW__INFORMATION_TARGET = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 5;
+	int INFORMATION_FLOW__INFORMATION_TARGET = PACKAGEABLE_ELEMENT_FEATURE_COUNT
+		+ 5;
 
 	/**
 	 * The feature id for the '<em><b>Realization</b></em>' reference list.
@@ -172502,7 +173298,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INFORMATION_FLOW__REALIZING_ACTIVITY_EDGE = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 7;
+	int INFORMATION_FLOW__REALIZING_ACTIVITY_EDGE = PACKAGEABLE_ELEMENT_FEATURE_COUNT
+		+ 7;
 
 	/**
 	 * The feature id for the '<em><b>Realizing Connector</b></em>' reference list.
@@ -172511,7 +173308,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INFORMATION_FLOW__REALIZING_CONNECTOR = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 8;
+	int INFORMATION_FLOW__REALIZING_CONNECTOR = PACKAGEABLE_ELEMENT_FEATURE_COUNT
+		+ 8;
 
 	/**
 	 * The feature id for the '<em><b>Realizing Message</b></em>' reference list.
@@ -172520,7 +173318,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INFORMATION_FLOW__REALIZING_MESSAGE = PACKAGEABLE_ELEMENT_FEATURE_COUNT + 9;
+	int INFORMATION_FLOW__REALIZING_MESSAGE = PACKAGEABLE_ELEMENT_FEATURE_COUNT
+		+ 9;
 
 	/**
 	 * The number of structural features of the '<em>Information Flow</em>' class.
@@ -173024,7 +173823,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INFORMATION_FLOW___VALIDATE_MUST_CONFORM__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 0;
+	int INFORMATION_FLOW___VALIDATE_MUST_CONFORM__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Sources And Targets Kind</em>' operation.
@@ -173033,7 +173833,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INFORMATION_FLOW___VALIDATE_SOURCES_AND_TARGETS_KIND__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 1;
+	int INFORMATION_FLOW___VALIDATE_SOURCES_AND_TARGETS_KIND__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Convey Classifiers</em>' operation.
@@ -173042,7 +173843,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INFORMATION_FLOW___VALIDATE_CONVEY_CLASSIFIERS__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 2;
+	int INFORMATION_FLOW___VALIDATE_CONVEY_CLASSIFIERS__DIAGNOSTICCHAIN_MAP = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Information Flow</em>' class.
@@ -173051,7 +173853,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INFORMATION_FLOW_OPERATION_COUNT = PACKAGEABLE_ELEMENT_OPERATION_COUNT + 3;
+	int INFORMATION_FLOW_OPERATION_COUNT = PACKAGEABLE_ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -173690,7 +174493,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE___VALIDATE_SENDING_RECEIVING_MESSAGE_EVENT__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 0;
+	int MESSAGE___VALIDATE_SENDING_RECEIVING_MESSAGE_EVENT__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Arguments</em>' operation.
@@ -173699,7 +174503,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE___VALIDATE_ARGUMENTS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 1;
+	int MESSAGE___VALIDATE_ARGUMENTS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Cannot Cross Boundaries</em>' operation.
@@ -173708,7 +174513,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE___VALIDATE_CANNOT_CROSS_BOUNDARIES__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 2;
+	int MESSAGE___VALIDATE_CANNOT_CROSS_BOUNDARIES__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Signature Is Signal</em>' operation.
@@ -173717,7 +174523,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE___VALIDATE_SIGNATURE_IS_SIGNAL__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 3;
+	int MESSAGE___VALIDATE_SIGNATURE_IS_SIGNAL__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Occurrence Specifications</em>' operation.
@@ -173726,7 +174533,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE___VALIDATE_OCCURRENCE_SPECIFICATIONS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 4;
+	int MESSAGE___VALIDATE_OCCURRENCE_SPECIFICATIONS__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Signature Refer To</em>' operation.
@@ -173735,7 +174543,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE___VALIDATE_SIGNATURE_REFER_TO__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 5;
+	int MESSAGE___VALIDATE_SIGNATURE_REFER_TO__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Validate Signature Is Operation Request</em>' operation.
@@ -173744,7 +174553,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE___VALIDATE_SIGNATURE_IS_OPERATION_REQUEST__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 6;
+	int MESSAGE___VALIDATE_SIGNATURE_IS_OPERATION_REQUEST__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Validate Signature Is Operation Reply</em>' operation.
@@ -173753,7 +174563,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE___VALIDATE_SIGNATURE_IS_OPERATION_REPLY__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 7;
+	int MESSAGE___VALIDATE_SIGNATURE_IS_OPERATION_REPLY__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The operation id for the '<em>Get Message Kind</em>' operation.
@@ -175517,7 +176328,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION___VALIDATE_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT + 0;
+	int INTERACTION___VALIDATE_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP = BEHAVIOR_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Interaction</em>' class.
@@ -175634,7 +176446,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_FRAGMENT__ENCLOSING_OPERAND = NAMED_ELEMENT_FEATURE_COUNT + 1;
+	int INTERACTION_FRAGMENT__ENCLOSING_OPERAND = NAMED_ELEMENT_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Enclosing Interaction</b></em>' container reference.
@@ -175643,7 +176456,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_FRAGMENT__ENCLOSING_INTERACTION = NAMED_ELEMENT_FEATURE_COUNT + 2;
+	int INTERACTION_FRAGMENT__ENCLOSING_INTERACTION = NAMED_ELEMENT_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>General Ordering</b></em>' containment reference list.
@@ -175652,7 +176466,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_FRAGMENT__GENERAL_ORDERING = NAMED_ELEMENT_FEATURE_COUNT + 3;
+	int INTERACTION_FRAGMENT__GENERAL_ORDERING = NAMED_ELEMENT_FEATURE_COUNT
+		+ 3;
 
 	/**
 	 * The number of structural features of the '<em>Interaction Fragment</em>' class.
@@ -176129,7 +176944,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_FRAGMENT_OPERATION_COUNT = NAMED_ELEMENT_OPERATION_COUNT + 0;
+	int INTERACTION_FRAGMENT_OPERATION_COUNT = NAMED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -176741,7 +177557,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LIFELINE___VALIDATE_SELECTOR_SPECIFIED__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 0;
+	int LIFELINE___VALIDATE_SELECTOR_SPECIFIED__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Interaction Uses Share Lifeline</em>' operation.
@@ -176750,7 +177567,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LIFELINE___VALIDATE_INTERACTION_USES_SHARE_LIFELINE__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 1;
+	int LIFELINE___VALIDATE_INTERACTION_USES_SHARE_LIFELINE__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Same Classifier</em>' operation.
@@ -176759,7 +177577,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LIFELINE___VALIDATE_SAME_CLASSIFIER__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 2;
+	int LIFELINE___VALIDATE_SAME_CLASSIFIER__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Selector Int Or String</em>' operation.
@@ -176768,7 +177587,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LIFELINE___VALIDATE_SELECTOR_INT_OR_STRING__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 3;
+	int LIFELINE___VALIDATE_SELECTOR_INT_OR_STRING__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The number of operations of the '<em>Lifeline</em>' class.
@@ -176948,7 +177768,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_USE__RETURN_VALUE_RECIPIENT = INTERACTION_FRAGMENT_FEATURE_COUNT + 4;
+	int INTERACTION_USE__RETURN_VALUE_RECIPIENT = INTERACTION_FRAGMENT_FEATURE_COUNT
+		+ 4;
 
 	/**
 	 * The number of structural features of the '<em>Interaction Use</em>' class.
@@ -177425,7 +178246,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_USE___VALIDATE_GATES_MATCH__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT + 0;
+	int INTERACTION_USE___VALIDATE_GATES_MATCH__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Arguments Are Constants</em>' operation.
@@ -177434,7 +178256,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_USE___VALIDATE_ARGUMENTS_ARE_CONSTANTS__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT + 1;
+	int INTERACTION_USE___VALIDATE_ARGUMENTS_ARE_CONSTANTS__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Return Value Recipient Coverage</em>' operation.
@@ -177443,7 +178266,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_USE___VALIDATE_RETURN_VALUE_RECIPIENT_COVERAGE__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT + 2;
+	int INTERACTION_USE___VALIDATE_RETURN_VALUE_RECIPIENT_COVERAGE__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Arguments Correspond To Parameters</em>' operation.
@@ -177452,7 +178276,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_USE___VALIDATE_ARGUMENTS_CORRESPOND_TO_PARAMETERS__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT + 3;
+	int INTERACTION_USE___VALIDATE_ARGUMENTS_CORRESPOND_TO_PARAMETERS__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Return Value Type Recipient Correspondence</em>' operation.
@@ -177461,7 +178286,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_USE___VALIDATE_RETURN_VALUE_TYPE_RECIPIENT_CORRESPONDENCE__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT + 4;
+	int INTERACTION_USE___VALIDATE_RETURN_VALUE_TYPE_RECIPIENT_CORRESPONDENCE__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate All Lifelines</em>' operation.
@@ -177470,7 +178296,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_USE___VALIDATE_ALL_LIFELINES__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT + 5;
+	int INTERACTION_USE___VALIDATE_ALL_LIFELINES__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The number of operations of the '<em>Interaction Use</em>' class.
@@ -177479,7 +178306,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_USE_OPERATION_COUNT = INTERACTION_FRAGMENT_OPERATION_COUNT + 6;
+	int INTERACTION_USE_OPERATION_COUNT = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -178181,7 +179009,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PART_DECOMPOSITION___VALIDATE_COMMUTATIVITY_OF_DECOMPOSITION__DIAGNOSTICCHAIN_MAP = INTERACTION_USE_OPERATION_COUNT + 0;
+	int PART_DECOMPOSITION___VALIDATE_COMMUTATIVITY_OF_DECOMPOSITION__DIAGNOSTICCHAIN_MAP = INTERACTION_USE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Assume</em>' operation.
@@ -178190,7 +179019,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PART_DECOMPOSITION___VALIDATE_ASSUME__DIAGNOSTICCHAIN_MAP = INTERACTION_USE_OPERATION_COUNT + 1;
+	int PART_DECOMPOSITION___VALIDATE_ASSUME__DIAGNOSTICCHAIN_MAP = INTERACTION_USE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Parts Of Internal Structures</em>' operation.
@@ -178199,7 +179029,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PART_DECOMPOSITION___VALIDATE_PARTS_OF_INTERNAL_STRUCTURES__DIAGNOSTICCHAIN_MAP = INTERACTION_USE_OPERATION_COUNT + 2;
+	int PART_DECOMPOSITION___VALIDATE_PARTS_OF_INTERNAL_STRUCTURES__DIAGNOSTICCHAIN_MAP = INTERACTION_USE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Part Decomposition</em>' class.
@@ -178208,7 +179039,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PART_DECOMPOSITION_OPERATION_COUNT = INTERACTION_USE_OPERATION_COUNT + 3;
+	int PART_DECOMPOSITION_OPERATION_COUNT = INTERACTION_USE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -179432,7 +180264,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GATE___VALIDATE_ACTUAL_GATE_MATCHED__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT + 0;
+	int GATE___VALIDATE_ACTUAL_GATE_MATCHED__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Inside Cf Matched</em>' operation.
@@ -179441,7 +180274,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GATE___VALIDATE_INSIDE_CF_MATCHED__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT + 1;
+	int GATE___VALIDATE_INSIDE_CF_MATCHED__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Outside Cf Matched</em>' operation.
@@ -179450,7 +180284,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GATE___VALIDATE_OUTSIDE_CF_MATCHED__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT + 2;
+	int GATE___VALIDATE_OUTSIDE_CF_MATCHED__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Formal Gate Distinguishable</em>' operation.
@@ -179459,7 +180294,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GATE___VALIDATE_FORMAL_GATE_DISTINGUISHABLE__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT + 3;
+	int GATE___VALIDATE_FORMAL_GATE_DISTINGUISHABLE__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Actual Gate Distinguishable</em>' operation.
@@ -179468,7 +180304,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GATE___VALIDATE_ACTUAL_GATE_DISTINGUISHABLE__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT + 4;
+	int GATE___VALIDATE_ACTUAL_GATE_DISTINGUISHABLE__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Outside Cf Gate Distinguishable</em>' operation.
@@ -179477,7 +180314,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GATE___VALIDATE_OUTSIDE_CF_GATE_DISTINGUISHABLE__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT + 5;
+	int GATE___VALIDATE_OUTSIDE_CF_GATE_DISTINGUISHABLE__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Validate Inside Cf Gate Distinguishable</em>' operation.
@@ -179486,7 +180324,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GATE___VALIDATE_INSIDE_CF_GATE_DISTINGUISHABLE__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT + 6;
+	int GATE___VALIDATE_INSIDE_CF_GATE_DISTINGUISHABLE__DIAGNOSTICCHAIN_MAP = MESSAGE_END_OPERATION_COUNT
+		+ 6;
 
 	/**
 	 * The operation id for the '<em>Is Outside CF</em>' operation.
@@ -179729,7 +180568,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_OPERAND__ENCLOSING_INTERACTION = NAMESPACE_FEATURE_COUNT + 2;
+	int INTERACTION_OPERAND__ENCLOSING_INTERACTION = NAMESPACE_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>General Ordering</b></em>' containment reference list.
@@ -180350,7 +181190,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_OPERAND___VALIDATE_GUARD_CONTAIN_REFERENCES__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 0;
+	int INTERACTION_OPERAND___VALIDATE_GUARD_CONTAIN_REFERENCES__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Guard Directly Prior</em>' operation.
@@ -180359,7 +181200,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_OPERAND___VALIDATE_GUARD_DIRECTLY_PRIOR__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT + 1;
+	int INTERACTION_OPERAND___VALIDATE_GUARD_DIRECTLY_PRIOR__DIAGNOSTICCHAIN_MAP = NAMESPACE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Interaction Operand</em>' class.
@@ -181052,7 +181894,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_CONSTRAINT___VALIDATE_MININT_MAXINT__DIAGNOSTICCHAIN_MAP = CONSTRAINT_OPERATION_COUNT + 0;
+	int INTERACTION_CONSTRAINT___VALIDATE_MININT_MAXINT__DIAGNOSTICCHAIN_MAP = CONSTRAINT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Minint Non Negative</em>' operation.
@@ -181061,7 +181904,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_CONSTRAINT___VALIDATE_MININT_NON_NEGATIVE__DIAGNOSTICCHAIN_MAP = CONSTRAINT_OPERATION_COUNT + 1;
+	int INTERACTION_CONSTRAINT___VALIDATE_MININT_NON_NEGATIVE__DIAGNOSTICCHAIN_MAP = CONSTRAINT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Maxint Positive</em>' operation.
@@ -181070,7 +181914,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_CONSTRAINT___VALIDATE_MAXINT_POSITIVE__DIAGNOSTICCHAIN_MAP = CONSTRAINT_OPERATION_COUNT + 2;
+	int INTERACTION_CONSTRAINT___VALIDATE_MAXINT_POSITIVE__DIAGNOSTICCHAIN_MAP = CONSTRAINT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Dynamic Variables</em>' operation.
@@ -181079,7 +181924,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_CONSTRAINT___VALIDATE_DYNAMIC_VARIABLES__DIAGNOSTICCHAIN_MAP = CONSTRAINT_OPERATION_COUNT + 3;
+	int INTERACTION_CONSTRAINT___VALIDATE_DYNAMIC_VARIABLES__DIAGNOSTICCHAIN_MAP = CONSTRAINT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Global Data</em>' operation.
@@ -181088,7 +181934,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_CONSTRAINT___VALIDATE_GLOBAL_DATA__DIAGNOSTICCHAIN_MAP = CONSTRAINT_OPERATION_COUNT + 4;
+	int INTERACTION_CONSTRAINT___VALIDATE_GLOBAL_DATA__DIAGNOSTICCHAIN_MAP = CONSTRAINT_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate Maxint Greater Equal Minint</em>' operation.
@@ -181097,7 +181944,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INTERACTION_CONSTRAINT___VALIDATE_MAXINT_GREATER_EQUAL_MININT__DIAGNOSTICCHAIN_MAP = CONSTRAINT_OPERATION_COUNT + 5;
+	int INTERACTION_CONSTRAINT___VALIDATE_MAXINT_GREATER_EQUAL_MININT__DIAGNOSTICCHAIN_MAP = CONSTRAINT_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The number of operations of the '<em>Interaction Constraint</em>' class.
@@ -181691,7 +182539,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GENERAL_ORDERING___VALIDATE_IRREFLEXIVE_TRANSITIVE_CLOSURE__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT + 0;
+	int GENERAL_ORDERING___VALIDATE_IRREFLEXIVE_TRANSITIVE_CLOSURE__DIAGNOSTICCHAIN_MAP = NAMED_ELEMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>General Ordering</em>' class.
@@ -181835,7 +182684,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OCCURRENCE_SPECIFICATION__TO_AFTER = INTERACTION_FRAGMENT_FEATURE_COUNT + 0;
+	int OCCURRENCE_SPECIFICATION__TO_AFTER = INTERACTION_FRAGMENT_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>To Before</b></em>' reference list.
@@ -181844,7 +182694,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OCCURRENCE_SPECIFICATION__TO_BEFORE = INTERACTION_FRAGMENT_FEATURE_COUNT + 1;
+	int OCCURRENCE_SPECIFICATION__TO_BEFORE = INTERACTION_FRAGMENT_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The number of structural features of the '<em>Occurrence Specification</em>' class.
@@ -181853,7 +182704,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OCCURRENCE_SPECIFICATION_FEATURE_COUNT = INTERACTION_FRAGMENT_FEATURE_COUNT + 2;
+	int OCCURRENCE_SPECIFICATION_FEATURE_COUNT = INTERACTION_FRAGMENT_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -182321,7 +183173,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OCCURRENCE_SPECIFICATION___GET_COVERED = INTERACTION_FRAGMENT_OPERATION_COUNT + 0;
+	int OCCURRENCE_SPECIFICATION___GET_COVERED = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Set Covered</em>' operation.
@@ -182330,7 +183183,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OCCURRENCE_SPECIFICATION___SET_COVERED__LIFELINE = INTERACTION_FRAGMENT_OPERATION_COUNT + 1;
+	int OCCURRENCE_SPECIFICATION___SET_COVERED__LIFELINE = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Occurrence Specification</em>' class.
@@ -182339,7 +183193,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int OCCURRENCE_SPECIFICATION_OPERATION_COUNT = INTERACTION_FRAGMENT_OPERATION_COUNT + 2;
+	int OCCURRENCE_SPECIFICATION_OPERATION_COUNT = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -183644,7 +184499,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INFORMATION_ITEM___VALIDATE_SOURCES_AND_TARGETS__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT + 0;
+	int INFORMATION_ITEM___VALIDATE_SOURCES_AND_TARGETS__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Has No</em>' operation.
@@ -183653,7 +184509,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INFORMATION_ITEM___VALIDATE_HAS_NO__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT + 1;
+	int INFORMATION_ITEM___VALIDATE_HAS_NO__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Not Instantiable</em>' operation.
@@ -183662,7 +184519,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int INFORMATION_ITEM___VALIDATE_NOT_INSTANTIABLE__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT + 2;
+	int INFORMATION_ITEM___VALIDATE_NOT_INSTANTIABLE__DIAGNOSTICCHAIN_MAP = CLASSIFIER_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Information Item</em>' class.
@@ -183806,7 +184664,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXECUTION_SPECIFICATION__FINISH = INTERACTION_FRAGMENT_FEATURE_COUNT + 0;
+	int EXECUTION_SPECIFICATION__FINISH = INTERACTION_FRAGMENT_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Start</b></em>' reference.
@@ -183824,7 +184683,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXECUTION_SPECIFICATION_FEATURE_COUNT = INTERACTION_FRAGMENT_FEATURE_COUNT + 2;
+	int EXECUTION_SPECIFICATION_FEATURE_COUNT = INTERACTION_FRAGMENT_FEATURE_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -184292,7 +185152,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXECUTION_SPECIFICATION___VALIDATE_SAME_LIFELINE__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT + 0;
+	int EXECUTION_SPECIFICATION___VALIDATE_SAME_LIFELINE__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Execution Specification</em>' class.
@@ -184301,7 +185162,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXECUTION_SPECIFICATION_OPERATION_COUNT = INTERACTION_FRAGMENT_OPERATION_COUNT + 1;
+	int EXECUTION_SPECIFICATION_OPERATION_COUNT = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -184454,7 +185316,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTION_EXECUTION_SPECIFICATION__ACTION = EXECUTION_SPECIFICATION_FEATURE_COUNT + 0;
+	int ACTION_EXECUTION_SPECIFICATION__ACTION = EXECUTION_SPECIFICATION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The number of structural features of the '<em>Action Execution Specification</em>' class.
@@ -184463,7 +185326,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTION_EXECUTION_SPECIFICATION_FEATURE_COUNT = EXECUTION_SPECIFICATION_FEATURE_COUNT + 1;
+	int ACTION_EXECUTION_SPECIFICATION_FEATURE_COUNT = EXECUTION_SPECIFICATION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -184940,7 +185804,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTION_EXECUTION_SPECIFICATION___VALIDATE_ACTION_REFERENCED__DIAGNOSTICCHAIN_MAP = EXECUTION_SPECIFICATION_OPERATION_COUNT + 0;
+	int ACTION_EXECUTION_SPECIFICATION___VALIDATE_ACTION_REFERENCED__DIAGNOSTICCHAIN_MAP = EXECUTION_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Action Execution Specification</em>' class.
@@ -184949,7 +185814,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTION_EXECUTION_SPECIFICATION_OPERATION_COUNT = EXECUTION_SPECIFICATION_OPERATION_COUNT + 1;
+	int ACTION_EXECUTION_SPECIFICATION_OPERATION_COUNT = EXECUTION_SPECIFICATION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -185102,7 +185968,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIOR_EXECUTION_SPECIFICATION__BEHAVIOR = EXECUTION_SPECIFICATION_FEATURE_COUNT + 0;
+	int BEHAVIOR_EXECUTION_SPECIFICATION__BEHAVIOR = EXECUTION_SPECIFICATION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The number of structural features of the '<em>Behavior Execution Specification</em>' class.
@@ -185111,7 +185978,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIOR_EXECUTION_SPECIFICATION_FEATURE_COUNT = EXECUTION_SPECIFICATION_FEATURE_COUNT + 1;
+	int BEHAVIOR_EXECUTION_SPECIFICATION_FEATURE_COUNT = EXECUTION_SPECIFICATION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -185588,7 +186456,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BEHAVIOR_EXECUTION_SPECIFICATION_OPERATION_COUNT = EXECUTION_SPECIFICATION_OPERATION_COUNT + 0;
+	int BEHAVIOR_EXECUTION_SPECIFICATION_OPERATION_COUNT = EXECUTION_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -185723,7 +186592,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMBINED_FRAGMENT__CFRAGMENT_GATE = INTERACTION_FRAGMENT_FEATURE_COUNT + 0;
+	int COMBINED_FRAGMENT__CFRAGMENT_GATE = INTERACTION_FRAGMENT_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Interaction Operator</b></em>' attribute.
@@ -185732,7 +186602,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMBINED_FRAGMENT__INTERACTION_OPERATOR = INTERACTION_FRAGMENT_FEATURE_COUNT + 1;
+	int COMBINED_FRAGMENT__INTERACTION_OPERATOR = INTERACTION_FRAGMENT_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>Operand</b></em>' containment reference list.
@@ -185750,7 +186621,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMBINED_FRAGMENT_FEATURE_COUNT = INTERACTION_FRAGMENT_FEATURE_COUNT + 3;
+	int COMBINED_FRAGMENT_FEATURE_COUNT = INTERACTION_FRAGMENT_FEATURE_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -186218,7 +187090,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMBINED_FRAGMENT___VALIDATE_BREAK__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT + 0;
+	int COMBINED_FRAGMENT___VALIDATE_BREAK__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Consider And Ignore</em>' operation.
@@ -186227,7 +187100,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMBINED_FRAGMENT___VALIDATE_CONSIDER_AND_IGNORE__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT + 1;
+	int COMBINED_FRAGMENT___VALIDATE_CONSIDER_AND_IGNORE__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Opt Loop Break Neg</em>' operation.
@@ -186236,7 +187110,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMBINED_FRAGMENT___VALIDATE_OPT_LOOP_BREAK_NEG__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT + 2;
+	int COMBINED_FRAGMENT___VALIDATE_OPT_LOOP_BREAK_NEG__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Combined Fragment</em>' class.
@@ -186245,7 +187120,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMBINED_FRAGMENT_OPERATION_COUNT = INTERACTION_FRAGMENT_OPERATION_COUNT + 3;
+	int COMBINED_FRAGMENT_OPERATION_COUNT = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -186416,7 +187292,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONSIDER_IGNORE_FRAGMENT_FEATURE_COUNT = COMBINED_FRAGMENT_FEATURE_COUNT + 1;
+	int CONSIDER_IGNORE_FRAGMENT_FEATURE_COUNT = COMBINED_FRAGMENT_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -186911,7 +187788,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONSIDER_IGNORE_FRAGMENT___VALIDATE_CONSIDER_OR_IGNORE__DIAGNOSTICCHAIN_MAP = COMBINED_FRAGMENT_OPERATION_COUNT + 0;
+	int CONSIDER_IGNORE_FRAGMENT___VALIDATE_CONSIDER_OR_IGNORE__DIAGNOSTICCHAIN_MAP = COMBINED_FRAGMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Type</em>' operation.
@@ -186920,7 +187798,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONSIDER_IGNORE_FRAGMENT___VALIDATE_TYPE__DIAGNOSTICCHAIN_MAP = COMBINED_FRAGMENT_OPERATION_COUNT + 1;
+	int CONSIDER_IGNORE_FRAGMENT___VALIDATE_TYPE__DIAGNOSTICCHAIN_MAP = COMBINED_FRAGMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Consider Ignore Fragment</em>' class.
@@ -186929,7 +187808,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONSIDER_IGNORE_FRAGMENT_OPERATION_COUNT = COMBINED_FRAGMENT_OPERATION_COUNT + 2;
+	int CONSIDER_IGNORE_FRAGMENT_OPERATION_COUNT = COMBINED_FRAGMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -187541,7 +188421,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONTINUATION___VALIDATE_FIRST_OR_LAST_INTERACTION_FRAGMENT__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT + 0;
+	int CONTINUATION___VALIDATE_FIRST_OR_LAST_INTERACTION_FRAGMENT__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Same Name</em>' operation.
@@ -187550,7 +188431,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONTINUATION___VALIDATE_SAME_NAME__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT + 1;
+	int CONTINUATION___VALIDATE_SAME_NAME__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Global</em>' operation.
@@ -187559,7 +188441,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CONTINUATION___VALIDATE_GLOBAL__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT + 2;
+	int CONTINUATION___VALIDATE_GLOBAL__DIAGNOSTICCHAIN_MAP = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The number of operations of the '<em>Continuation</em>' class.
@@ -187721,7 +188604,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE_OCCURRENCE_SPECIFICATION__MESSAGE = OCCURRENCE_SPECIFICATION_FEATURE_COUNT + 0;
+	int MESSAGE_OCCURRENCE_SPECIFICATION__MESSAGE = OCCURRENCE_SPECIFICATION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The number of structural features of the '<em>Message Occurrence Specification</em>' class.
@@ -187730,7 +188614,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE_OCCURRENCE_SPECIFICATION_FEATURE_COUNT = OCCURRENCE_SPECIFICATION_FEATURE_COUNT + 1;
+	int MESSAGE_OCCURRENCE_SPECIFICATION_FEATURE_COUNT = OCCURRENCE_SPECIFICATION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -188216,7 +189101,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE_OCCURRENCE_SPECIFICATION___OPPOSITE_END = OCCURRENCE_SPECIFICATION_OPERATION_COUNT + 0;
+	int MESSAGE_OCCURRENCE_SPECIFICATION___OPPOSITE_END = OCCURRENCE_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Is Send</em>' operation.
@@ -188225,7 +189111,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE_OCCURRENCE_SPECIFICATION___IS_SEND = OCCURRENCE_SPECIFICATION_OPERATION_COUNT + 1;
+	int MESSAGE_OCCURRENCE_SPECIFICATION___IS_SEND = OCCURRENCE_SPECIFICATION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Is Receive</em>' operation.
@@ -188234,7 +189121,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE_OCCURRENCE_SPECIFICATION___IS_RECEIVE = OCCURRENCE_SPECIFICATION_OPERATION_COUNT + 2;
+	int MESSAGE_OCCURRENCE_SPECIFICATION___IS_RECEIVE = OCCURRENCE_SPECIFICATION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Enclosing Fragment</em>' operation.
@@ -188243,7 +189131,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE_OCCURRENCE_SPECIFICATION___ENCLOSING_FRAGMENT = OCCURRENCE_SPECIFICATION_OPERATION_COUNT + 3;
+	int MESSAGE_OCCURRENCE_SPECIFICATION___ENCLOSING_FRAGMENT = OCCURRENCE_SPECIFICATION_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The number of operations of the '<em>Message Occurrence Specification</em>' class.
@@ -188252,7 +189141,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MESSAGE_OCCURRENCE_SPECIFICATION_OPERATION_COUNT = OCCURRENCE_SPECIFICATION_OPERATION_COUNT + 4;
+	int MESSAGE_OCCURRENCE_SPECIFICATION_OPERATION_COUNT = OCCURRENCE_SPECIFICATION_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -188414,7 +189304,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DESTRUCTION_OCCURRENCE_SPECIFICATION_FEATURE_COUNT = MESSAGE_OCCURRENCE_SPECIFICATION_FEATURE_COUNT + 0;
+	int DESTRUCTION_OCCURRENCE_SPECIFICATION_FEATURE_COUNT = MESSAGE_OCCURRENCE_SPECIFICATION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -188936,7 +189827,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DESTRUCTION_OCCURRENCE_SPECIFICATION___VALIDATE_NO_OCCURRENCE_SPECIFICATIONS_BELOW__DIAGNOSTICCHAIN_MAP = MESSAGE_OCCURRENCE_SPECIFICATION_OPERATION_COUNT + 0;
+	int DESTRUCTION_OCCURRENCE_SPECIFICATION___VALIDATE_NO_OCCURRENCE_SPECIFICATIONS_BELOW__DIAGNOSTICCHAIN_MAP = MESSAGE_OCCURRENCE_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Destruction Occurrence Specification</em>' class.
@@ -188945,7 +189837,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DESTRUCTION_OCCURRENCE_SPECIFICATION_OPERATION_COUNT = MESSAGE_OCCURRENCE_SPECIFICATION_OPERATION_COUNT + 1;
+	int DESTRUCTION_OCCURRENCE_SPECIFICATION_OPERATION_COUNT = MESSAGE_OCCURRENCE_SPECIFICATION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -189098,7 +189991,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXECUTION_OCCURRENCE_SPECIFICATION__EXECUTION = OCCURRENCE_SPECIFICATION_FEATURE_COUNT + 0;
+	int EXECUTION_OCCURRENCE_SPECIFICATION__EXECUTION = OCCURRENCE_SPECIFICATION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The number of structural features of the '<em>Execution Occurrence Specification</em>' class.
@@ -189107,7 +190001,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXECUTION_OCCURRENCE_SPECIFICATION_FEATURE_COUNT = OCCURRENCE_SPECIFICATION_FEATURE_COUNT + 1;
+	int EXECUTION_OCCURRENCE_SPECIFICATION_FEATURE_COUNT = OCCURRENCE_SPECIFICATION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -189593,7 +190488,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXECUTION_OCCURRENCE_SPECIFICATION_OPERATION_COUNT = OCCURRENCE_SPECIFICATION_OPERATION_COUNT + 0;
+	int EXECUTION_OCCURRENCE_SPECIFICATION_OPERATION_COUNT = OCCURRENCE_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -190205,7 +191101,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_INVARIANT_OPERATION_COUNT = INTERACTION_FRAGMENT_OPERATION_COUNT + 0;
+	int STATE_INVARIANT_OPERATION_COUNT = INTERACTION_FRAGMENT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -191303,7 +192200,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FINAL_STATE___VALIDATE_NO_EXIT_BEHAVIOR__DIAGNOSTICCHAIN_MAP = STATE_OPERATION_COUNT + 0;
+	int FINAL_STATE___VALIDATE_NO_EXIT_BEHAVIOR__DIAGNOSTICCHAIN_MAP = STATE_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate No Outgoing Transitions</em>' operation.
@@ -191312,7 +192210,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FINAL_STATE___VALIDATE_NO_OUTGOING_TRANSITIONS__DIAGNOSTICCHAIN_MAP = STATE_OPERATION_COUNT + 1;
+	int FINAL_STATE___VALIDATE_NO_OUTGOING_TRANSITIONS__DIAGNOSTICCHAIN_MAP = STATE_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate No Regions</em>' operation.
@@ -191321,7 +192220,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FINAL_STATE___VALIDATE_NO_REGIONS__DIAGNOSTICCHAIN_MAP = STATE_OPERATION_COUNT + 2;
+	int FINAL_STATE___VALIDATE_NO_REGIONS__DIAGNOSTICCHAIN_MAP = STATE_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Cannot Reference Submachine</em>' operation.
@@ -191330,7 +192230,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FINAL_STATE___VALIDATE_CANNOT_REFERENCE_SUBMACHINE__DIAGNOSTICCHAIN_MAP = STATE_OPERATION_COUNT + 3;
+	int FINAL_STATE___VALIDATE_CANNOT_REFERENCE_SUBMACHINE__DIAGNOSTICCHAIN_MAP = STATE_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate No Entry Behavior</em>' operation.
@@ -191339,7 +192240,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FINAL_STATE___VALIDATE_NO_ENTRY_BEHAVIOR__DIAGNOSTICCHAIN_MAP = STATE_OPERATION_COUNT + 4;
+	int FINAL_STATE___VALIDATE_NO_ENTRY_BEHAVIOR__DIAGNOSTICCHAIN_MAP = STATE_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Validate No State Behavior</em>' operation.
@@ -191348,7 +192250,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FINAL_STATE___VALIDATE_NO_STATE_BEHAVIOR__DIAGNOSTICCHAIN_MAP = STATE_OPERATION_COUNT + 5;
+	int FINAL_STATE___VALIDATE_NO_STATE_BEHAVIOR__DIAGNOSTICCHAIN_MAP = STATE_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The number of operations of the '<em>Final State</em>' class.
@@ -192365,7 +193268,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROTOCOL_TRANSITION___VALIDATE_REFERS_TO_OPERATION__DIAGNOSTICCHAIN_MAP = TRANSITION_OPERATION_COUNT + 0;
+	int PROTOCOL_TRANSITION___VALIDATE_REFERS_TO_OPERATION__DIAGNOSTICCHAIN_MAP = TRANSITION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Associated Actions</em>' operation.
@@ -192374,7 +193278,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROTOCOL_TRANSITION___VALIDATE_ASSOCIATED_ACTIONS__DIAGNOSTICCHAIN_MAP = TRANSITION_OPERATION_COUNT + 1;
+	int PROTOCOL_TRANSITION___VALIDATE_ASSOCIATED_ACTIONS__DIAGNOSTICCHAIN_MAP = TRANSITION_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Belongs To Psm</em>' operation.
@@ -192383,7 +193288,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROTOCOL_TRANSITION___VALIDATE_BELONGS_TO_PSM__DIAGNOSTICCHAIN_MAP = TRANSITION_OPERATION_COUNT + 2;
+	int PROTOCOL_TRANSITION___VALIDATE_BELONGS_TO_PSM__DIAGNOSTICCHAIN_MAP = TRANSITION_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Get Referreds</em>' operation.
@@ -193985,7 +194891,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ASSOCIATION_CLASS___VALIDATE_SPECIALIZED_END_NUMBER__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 0;
+	int ASSOCIATION_CLASS___VALIDATE_SPECIALIZED_END_NUMBER__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Specialized End Types</em>' operation.
@@ -193994,7 +194901,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ASSOCIATION_CLASS___VALIDATE_SPECIALIZED_END_TYPES__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 1;
+	int ASSOCIATION_CLASS___VALIDATE_SPECIALIZED_END_TYPES__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Validate Binary Associations</em>' operation.
@@ -194003,7 +194911,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ASSOCIATION_CLASS___VALIDATE_BINARY_ASSOCIATIONS__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 2;
+	int ASSOCIATION_CLASS___VALIDATE_BINARY_ASSOCIATIONS__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Validate Association Ends</em>' operation.
@@ -194012,7 +194921,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ASSOCIATION_CLASS___VALIDATE_ASSOCIATION_ENDS__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 3;
+	int ASSOCIATION_CLASS___VALIDATE_ASSOCIATION_ENDS__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Validate Ends Must Be Typed</em>' operation.
@@ -194021,7 +194931,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ASSOCIATION_CLASS___VALIDATE_ENDS_MUST_BE_TYPED__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 4;
+	int ASSOCIATION_CLASS___VALIDATE_ENDS_MUST_BE_TYPED__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 4;
 
 	/**
 	 * The operation id for the '<em>Is Binary</em>' operation.
@@ -194048,7 +194959,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ASSOCIATION_CLASS___VALIDATE_CANNOT_BE_DEFINED__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 7;
+	int ASSOCIATION_CLASS___VALIDATE_CANNOT_BE_DEFINED__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 7;
 
 	/**
 	 * The operation id for the '<em>Validate Disjoint Attributes Ends</em>' operation.
@@ -194057,7 +194969,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ASSOCIATION_CLASS___VALIDATE_DISJOINT_ATTRIBUTES_ENDS__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 8;
+	int ASSOCIATION_CLASS___VALIDATE_DISJOINT_ATTRIBUTES_ENDS__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 8;
 
 	/**
 	 * The number of operations of the '<em>Association Class</em>' class.
@@ -195641,7 +196554,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPONENT___VALIDATE_NO_NESTED_CLASSIFIERS__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 0;
+	int COMPONENT___VALIDATE_NO_NESTED_CLASSIFIERS__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate No Packaged Elements</em>' operation.
@@ -195650,7 +196564,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPONENT___VALIDATE_NO_PACKAGED_ELEMENTS__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT + 1;
+	int COMPONENT___VALIDATE_NO_PACKAGED_ELEMENTS__DIAGNOSTICCHAIN_MAP = CLASS_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Create Owned Class</em>' operation.
@@ -195659,7 +196574,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPONENT___CREATE_OWNED_CLASS__STRING_BOOLEAN = CLASS_OPERATION_COUNT + 2;
+	int COMPONENT___CREATE_OWNED_CLASS__STRING_BOOLEAN = CLASS_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The operation id for the '<em>Create Owned Enumeration</em>' operation.
@@ -195668,7 +196584,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPONENT___CREATE_OWNED_ENUMERATION__STRING = CLASS_OPERATION_COUNT + 3;
+	int COMPONENT___CREATE_OWNED_ENUMERATION__STRING = CLASS_OPERATION_COUNT
+		+ 3;
 
 	/**
 	 * The operation id for the '<em>Create Owned Interface</em>' operation.
@@ -195686,7 +196603,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPONENT___CREATE_OWNED_PRIMITIVE_TYPE__STRING = CLASS_OPERATION_COUNT + 5;
+	int COMPONENT___CREATE_OWNED_PRIMITIVE_TYPE__STRING = CLASS_OPERATION_COUNT
+		+ 5;
 
 	/**
 	 * The operation id for the '<em>Get Provideds</em>' operation.
@@ -195884,7 +196802,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COMPONENT_REALIZATION__REALIZING_CLASSIFIER = REALIZATION_FEATURE_COUNT + 0;
+	int COMPONENT_REALIZATION__REALIZING_CLASSIFIER = REALIZATION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>Abstraction</b></em>' container reference.
@@ -197747,7 +198666,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTOR___VALIDATE_ASSOCIATIONS__DIAGNOSTICCHAIN_MAP = BEHAVIORED_CLASSIFIER_OPERATION_COUNT + 0;
+	int ACTOR___VALIDATE_ASSOCIATIONS__DIAGNOSTICCHAIN_MAP = BEHAVIORED_CLASSIFIER_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Must Have Name</em>' operation.
@@ -197756,7 +198676,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTOR___VALIDATE_MUST_HAVE_NAME__DIAGNOSTICCHAIN_MAP = BEHAVIORED_CLASSIFIER_OPERATION_COUNT + 1;
+	int ACTOR___VALIDATE_MUST_HAVE_NAME__DIAGNOSTICCHAIN_MAP = BEHAVIORED_CLASSIFIER_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Actor</em>' class.
@@ -198467,7 +199388,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DURATION___VALIDATE_NO_EXPR_REQUIRES_OBSERVATION__DIAGNOSTICCHAIN_MAP = VALUE_SPECIFICATION_OPERATION_COUNT + 0;
+	int DURATION___VALIDATE_NO_EXPR_REQUIRES_OBSERVATION__DIAGNOSTICCHAIN_MAP = VALUE_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Duration</em>' class.
@@ -199286,7 +200208,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DURATION_CONSTRAINT__FIRST_EVENT = INTERVAL_CONSTRAINT_FEATURE_COUNT + 0;
+	int DURATION_CONSTRAINT__FIRST_EVENT = INTERVAL_CONSTRAINT_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The number of structural features of the '<em>Duration Constraint</em>' class.
@@ -199295,7 +200218,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DURATION_CONSTRAINT_FEATURE_COUNT = INTERVAL_CONSTRAINT_FEATURE_COUNT + 1;
+	int DURATION_CONSTRAINT_FEATURE_COUNT = INTERVAL_CONSTRAINT_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -199817,7 +200741,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DURATION_CONSTRAINT___VALIDATE_FIRST_EVENT_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = INTERVAL_CONSTRAINT_OPERATION_COUNT + 0;
+	int DURATION_CONSTRAINT___VALIDATE_FIRST_EVENT_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = INTERVAL_CONSTRAINT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Validate Has One Or Two Constrained Elements</em>' operation.
@@ -199826,7 +200751,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DURATION_CONSTRAINT___VALIDATE_HAS_ONE_OR_TWO_CONSTRAINED_ELEMENTS__DIAGNOSTICCHAIN_MAP = INTERVAL_CONSTRAINT_OPERATION_COUNT + 1;
+	int DURATION_CONSTRAINT___VALIDATE_HAS_ONE_OR_TWO_CONSTRAINED_ELEMENTS__DIAGNOSTICCHAIN_MAP = INTERVAL_CONSTRAINT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The number of operations of the '<em>Duration Constraint</em>' class.
@@ -199835,7 +200761,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DURATION_CONSTRAINT_OPERATION_COUNT = INTERVAL_CONSTRAINT_OPERATION_COUNT + 2;
+	int DURATION_CONSTRAINT_OPERATION_COUNT = INTERVAL_CONSTRAINT_OPERATION_COUNT
+		+ 2;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -201869,7 +202796,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DURATION_OBSERVATION___VALIDATE_FIRST_EVENT_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = OBSERVATION_OPERATION_COUNT + 0;
+	int DURATION_OBSERVATION___VALIDATE_FIRST_EVENT_MULTIPLICITY__DIAGNOSTICCHAIN_MAP = OBSERVATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Duration Observation</em>' class.
@@ -202004,7 +202932,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LITERAL_SPECIFICATION_FEATURE_COUNT = VALUE_SPECIFICATION_FEATURE_COUNT + 0;
+	int LITERAL_SPECIFICATION_FEATURE_COUNT = VALUE_SPECIFICATION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -202562,7 +203491,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LITERAL_SPECIFICATION_OPERATION_COUNT = VALUE_SPECIFICATION_OPERATION_COUNT + 0;
+	int LITERAL_SPECIFICATION_OPERATION_COUNT = VALUE_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -203255,7 +204185,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LITERAL_BOOLEAN_OPERATION_COUNT = LITERAL_SPECIFICATION_OPERATION_COUNT + 0;
+	int LITERAL_BOOLEAN_OPERATION_COUNT = LITERAL_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -203948,7 +204879,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LITERAL_INTEGER_OPERATION_COUNT = LITERAL_SPECIFICATION_OPERATION_COUNT + 0;
+	int LITERAL_INTEGER_OPERATION_COUNT = LITERAL_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -204632,7 +205564,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LITERAL_NULL_OPERATION_COUNT = LITERAL_SPECIFICATION_OPERATION_COUNT + 0;
+	int LITERAL_NULL_OPERATION_COUNT = LITERAL_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -205325,7 +206258,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LITERAL_REAL_OPERATION_COUNT = LITERAL_SPECIFICATION_OPERATION_COUNT + 0;
+	int LITERAL_REAL_OPERATION_COUNT = LITERAL_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -206018,7 +206952,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LITERAL_STRING_OPERATION_COUNT = LITERAL_SPECIFICATION_OPERATION_COUNT + 0;
+	int LITERAL_STRING_OPERATION_COUNT = LITERAL_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -206144,7 +207079,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LITERAL_UNLIMITED_NATURAL__VALUE = LITERAL_SPECIFICATION_FEATURE_COUNT + 0;
+	int LITERAL_UNLIMITED_NATURAL__VALUE = LITERAL_SPECIFICATION_FEATURE_COUNT
+		+ 0;
 
 	/**
 	 * The number of structural features of the '<em>Literal Unlimited Natural</em>' class.
@@ -206153,7 +207089,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LITERAL_UNLIMITED_NATURAL_FEATURE_COUNT = LITERAL_SPECIFICATION_FEATURE_COUNT + 1;
+	int LITERAL_UNLIMITED_NATURAL_FEATURE_COUNT = LITERAL_SPECIFICATION_FEATURE_COUNT
+		+ 1;
 
 	/**
 	 * The operation id for the '<em>Get EAnnotation</em>' operation.
@@ -206711,7 +207648,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int LITERAL_UNLIMITED_NATURAL_OPERATION_COUNT = LITERAL_SPECIFICATION_OPERATION_COUNT + 0;
+	int LITERAL_UNLIMITED_NATURAL_OPERATION_COUNT = LITERAL_SPECIFICATION_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -207386,7 +208324,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TIME_CONSTRAINT___VALIDATE_HAS_ONE_CONSTRAINED_ELEMENT__DIAGNOSTICCHAIN_MAP = INTERVAL_CONSTRAINT_OPERATION_COUNT + 0;
+	int TIME_CONSTRAINT___VALIDATE_HAS_ONE_CONSTRAINED_ELEMENT__DIAGNOSTICCHAIN_MAP = INTERVAL_CONSTRAINT_OPERATION_COUNT
+		+ 0;
 
 	/**
 	 * The number of operations of the '<em>Time Constraint</em>' class.
@@ -207395,7 +208334,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	int TIME_CONSTRAINT_OPERATION_COUNT = INTERVAL_CONSTRAINT_OPERATION_COUNT + 1;
+	int TIME_CONSTRAINT_OPERATION_COUNT = INTERVAL_CONSTRAINT_OPERATION_COUNT
+		+ 1;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -210657,6 +211597,16 @@
 	EOperation getPackage__UnapplyProfile__Profile();
 
 	/**
+	 * Returns the meta object for the '{@link org.eclipse.uml2.uml.Package#applyProfiles(org.eclipse.emf.common.util.EList) <em>Apply Profiles</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Apply Profiles</em>' operation.
+	 * @see org.eclipse.uml2.uml.Package#applyProfiles(org.eclipse.emf.common.util.EList)
+	 * @generated
+	 */
+	EOperation getPackage__ApplyProfiles__EList();
+
+	/**
 	 * Returns the meta object for the '{@link org.eclipse.uml2.uml.Package#allApplicableStereotypes() <em>All Applicable Stereotypes</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -225947,6 +226897,15 @@
 			.getPackage__UnapplyProfile__Profile();
 
 		/**
+		 * The meta object literal for the '<em><b>Apply Profiles</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation PACKAGE___APPLY_PROFILES__ELIST = eINSTANCE
+			.getPackage__ApplyProfiles__EList();
+
+		/**
 		 * The meta object literal for the '<em><b>All Applicable Stereotypes</b></em>' operation.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLPlugin.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLPlugin.java
index 1f015cd..d4ad392 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLPlugin.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/UMLPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 215488
- *   Kenn Hussey (CEA) - 279044
+ *   Kenn Hussey (CEA) - 279044, 485756
  *   Christian W. Damus (CEA) - 401804
  *
  */
@@ -67,7 +67,8 @@
 		}
 
 		@Override
-		protected boolean readElement(IConfigurationElement element, boolean add) {
+		protected boolean readElement(IConfigurationElement element,
+				boolean add) {
 
 			if (element.getName().equals(TAG_PROFILE)) {
 				String uri = element.getAttribute(ATT_URI);
@@ -85,8 +86,9 @@
 							if (profileLocation.isRelative()) {
 								profileLocation = URI.createPlatformPluginURI(
 									element.getDeclaringExtension()
-										.getContributor().getName()
-										+ '/' + location, false);
+										.getContributor().getName() + '/'
+										+ location,
+									false);
 							}
 
 							ePackageNsURIToProfileLocationMap.put(uri,
@@ -109,14 +111,14 @@
 			extends PackageRegistryReader {
 
 		protected GeneratedPackageRegistryReader() {
-			super(Platform.getExtensionRegistry(), UMLPlugin.INSTANCE
-				.getSymbolicName(), GENERATED_PACKAGE_PPID);
+			super(Platform.getExtensionRegistry(),
+				UMLPlugin.INSTANCE.getSymbolicName(), GENERATED_PACKAGE_PPID);
 		}
 
 		protected GeneratedPackageRegistryReader(
 				Map<String, URI> ePackageNsURIToProfileLocationMap) {
-			super(Platform.getExtensionRegistry(), UMLPlugin.INSTANCE
-				.getSymbolicName(), GENERATED_PACKAGE_PPID,
+			super(Platform.getExtensionRegistry(),
+				UMLPlugin.INSTANCE.getSymbolicName(), GENERATED_PACKAGE_PPID,
 				ePackageNsURIToProfileLocationMap);
 		}
 	}
@@ -125,14 +127,14 @@
 			extends PackageRegistryReader {
 
 		protected DynamicPackageRegistryReader() {
-			super(Platform.getExtensionRegistry(), UMLPlugin.INSTANCE
-				.getSymbolicName(), DYNAMIC_PACKAGE_PPID);
+			super(Platform.getExtensionRegistry(),
+				UMLPlugin.INSTANCE.getSymbolicName(), DYNAMIC_PACKAGE_PPID);
 		}
 
 		protected DynamicPackageRegistryReader(
 				Map<String, URI> ePackageNsURIToProfileLocationMap) {
-			super(Platform.getExtensionRegistry(), UMLPlugin.INSTANCE
-				.getSymbolicName(), DYNAMIC_PACKAGE_PPID,
+			super(Platform.getExtensionRegistry(),
+				UMLPlugin.INSTANCE.getSymbolicName(), DYNAMIC_PACKAGE_PPID,
 				ePackageNsURIToProfileLocationMap);
 		}
 	}
@@ -288,8 +290,8 @@
 			// URI. Let's force the issue by asking EMF to map some
 			// representative URI that maps to the resources plug-in
 			Set<URI> umlResourceURIs = new HashSet<URI>();
-			umlResourceURIs.add(URIConverter.INSTANCE.normalize(URI
-				.createURI(UMLResource.LIBRARIES_PATHMAP)));
+			umlResourceURIs.add(URIConverter.INSTANCE
+				.normalize(URI.createURI(UMLResource.LIBRARIES_PATHMAP)));
 
 			URIConverter.URI_MAP.putAll(EcorePlugin
 				.computePlatformResourceToPlatformPluginMap(umlResourceURIs));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/VisibilityKind.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/VisibilityKind.java
index eeb4c8d..e8b3811 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/VisibilityKind.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/VisibilityKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *   Christian W. Damus (CEA) - 251963
  *
  */
@@ -33,7 +33,7 @@
  * @generated
  */
 public enum VisibilityKind
-		implements Enumerator {
+	implements Enumerator {
 	/**
 	 * The '<em><b>Public</b></em>' literal object.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AbstractionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AbstractionImpl.java
index d988693..662b856 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AbstractionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AbstractionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -100,8 +100,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -204,7 +204,8 @@
 	 * @generated
 	 */
 	public OpaqueExpression createMapping(String name, Type type) {
-		OpaqueExpression newMapping = (OpaqueExpression) create(UMLPackage.Literals.OPAQUE_EXPRESSION);
+		OpaqueExpression newMapping = (OpaqueExpression) create(
+			UMLPackage.Literals.OPAQUE_EXPRESSION);
 		setMapping(newMapping);
 		if (name != null)
 			newMapping.setName(name);
@@ -223,11 +224,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ABSTRACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ABSTRACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ABSTRACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ABSTRACTION__OWNING_TEMPLATE_PARAMETER :
@@ -311,13 +312,13 @@
 		switch (featureID) {
 			case UMLPackage.ABSTRACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ABSTRACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ABSTRACTION__NAME :
 				setName((String) newValue);
@@ -336,13 +337,13 @@
 				return;
 			case UMLPackage.ABSTRACTION__CLIENT :
 				getClients().clear();
-				getClients().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getClients()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.ABSTRACTION__SUPPLIER :
 				getSuppliers().clear();
-				getSuppliers().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getSuppliers()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.ABSTRACTION__MAPPING :
 				setMapping((OpaqueExpression) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptCallActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptCallActionImpl.java
index d141bfa..a896e45 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptCallActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptCallActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -122,12 +122,11 @@
 			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.ACCEPT_CALL_ACTION__OUTPUT,
-							OUTPUT_ESUBSETS));
+				cache.put(eResource, this, UMLPackage.Literals.ACTION__OUTPUT,
+					outputs = new DerivedUnionEObjectEList<OutputPin>(
+						OutputPin.class, this,
+						UMLPackage.ACCEPT_CALL_ACTION__OUTPUT,
+						OUTPUT_ESUBSETS));
 			}
 			return outputs;
 		}
@@ -147,16 +146,15 @@
 			if (returnInformation != oldReturnInformation) {
 				InternalEObject newReturnInformation = (InternalEObject) returnInformation;
 				NotificationChain msgs = oldReturnInformation.eInverseRemove(
-					this, EOPPOSITE_FEATURE_BASE
+					this,
+					EOPPOSITE_FEATURE_BASE
 						- UMLPackage.ACCEPT_CALL_ACTION__RETURN_INFORMATION,
 					null, null);
 				if (newReturnInformation.eInternalContainer() == null) {
-					msgs = newReturnInformation
-						.eInverseAdd(
-							this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.ACCEPT_CALL_ACTION__RETURN_INFORMATION,
-							null, msgs);
+					msgs = newReturnInformation.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.ACCEPT_CALL_ACTION__RETURN_INFORMATION,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -210,12 +208,14 @@
 			NotificationChain msgs = null;
 			if (returnInformation != null)
 				msgs = ((InternalEObject) returnInformation).eInverseRemove(
-					this, EOPPOSITE_FEATURE_BASE
+					this,
+					EOPPOSITE_FEATURE_BASE
 						- UMLPackage.ACCEPT_CALL_ACTION__RETURN_INFORMATION,
 					null, msgs);
 			if (newReturnInformation != null)
 				msgs = ((InternalEObject) newReturnInformation).eInverseAdd(
-					this, EOPPOSITE_FEATURE_BASE
+					this,
+					EOPPOSITE_FEATURE_BASE
 						- UMLPackage.ACCEPT_CALL_ACTION__RETURN_INFORMATION,
 					null, msgs);
 			msgs = basicSetReturnInformation(newReturnInformation, msgs);
@@ -233,7 +233,8 @@
 	 * @generated
 	 */
 	public OutputPin createReturnInformation(String name, Type type) {
-		OutputPin newReturnInformation = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newReturnInformation = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setReturnInformation(newReturnInformation);
 		if (name != null)
 			newReturnInformation.setName(name);
@@ -285,11 +286,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ACCEPT_CALL_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACCEPT_CALL_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACCEPT_CALL_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ACCEPT_CALL_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -298,14 +299,14 @@
 			case UMLPackage.ACCEPT_CALL_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.ACCEPT_CALL_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ACCEPT_CALL_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ACCEPT_CALL_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACCEPT_CALL_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -428,13 +429,13 @@
 		switch (featureID) {
 			case UMLPackage.ACCEPT_CALL_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ACCEPT_CALL_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ACCEPT_CALL_ACTION__NAME :
 				setName((String) newValue);
@@ -453,50 +454,49 @@
 				return;
 			case UMLPackage.ACCEPT_CALL_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.ACCEPT_CALL_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.ACCEPT_CALL_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ACCEPT_CALL_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ACCEPT_CALL_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.ACCEPT_CALL_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.ACCEPT_CALL_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.ACCEPT_CALL_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.ACCEPT_CALL_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ACCEPT_CALL_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ACCEPT_CALL_ACTION__IS_UNMARSHALL :
 				setIsUnmarshall((Boolean) newValue);
@@ -651,7 +651,8 @@
 			case UMLPackage.ACCEPT_CALL_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.ACCEPT_CALL_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.ACCEPT_CALL_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -661,7 +662,8 @@
 			case UMLPackage.ACCEPT_CALL_ACTION__OUTPUT :
 				return isSetOutputs();
 			case UMLPackage.ACCEPT_CALL_ACTION__IS_UNMARSHALL :
-				return ((eFlags & IS_UNMARSHALL_EFLAG) != 0) != IS_UNMARSHALL_EDEFAULT;
+				return ((eFlags
+					& IS_UNMARSHALL_EFLAG) != 0) != IS_UNMARSHALL_EDEFAULT;
 			case UMLPackage.ACCEPT_CALL_ACTION__RESULT :
 				return results != null && !results.isEmpty();
 			case UMLPackage.ACCEPT_CALL_ACTION__TRIGGER :
@@ -729,7 +731,8 @@
 			case UMLPackage.ACCEPT_CALL_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ACCEPT_CALL_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACCEPT_CALL_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ACCEPT_CALL_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -737,7 +740,8 @@
 			case UMLPackage.ACCEPT_CALL_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ACCEPT_CALL_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACCEPT_CALL_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -814,8 +818,8 @@
 			case UMLPackage.ACCEPT_CALL_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ACCEPT_CALL_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ACCEPT_CALL_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.ACCEPT_CALL_ACTION___GET_CONTEXT :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptEventActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptEventActionImpl.java
index 017550d..b5359cd 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptEventActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AcceptEventActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -157,12 +157,11 @@
 			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.ACCEPT_EVENT_ACTION__OUTPUT,
-							OUTPUT_ESUBSETS));
+				cache.put(eResource, this, UMLPackage.Literals.ACTION__OUTPUT,
+					outputs = new DerivedUnionEObjectEList<OutputPin>(
+						OutputPin.class, this,
+						UMLPackage.ACCEPT_EVENT_ACTION__OUTPUT,
+						OUTPUT_ESUBSETS));
 			}
 			return outputs;
 		}
@@ -215,7 +214,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		getResults().add(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -382,11 +382,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ACCEPT_EVENT_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACCEPT_EVENT_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACCEPT_EVENT_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ACCEPT_EVENT_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -395,14 +395,14 @@
 			case UMLPackage.ACCEPT_EVENT_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.ACCEPT_EVENT_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ACCEPT_EVENT_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ACCEPT_EVENT_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACCEPT_EVENT_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -519,13 +519,13 @@
 		switch (featureID) {
 			case UMLPackage.ACCEPT_EVENT_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ACCEPT_EVENT_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ACCEPT_EVENT_ACTION__NAME :
 				setName((String) newValue);
@@ -544,50 +544,49 @@
 				return;
 			case UMLPackage.ACCEPT_EVENT_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.ACCEPT_EVENT_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.ACCEPT_EVENT_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ACCEPT_EVENT_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ACCEPT_EVENT_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.ACCEPT_EVENT_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.ACCEPT_EVENT_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.ACCEPT_EVENT_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.ACCEPT_EVENT_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ACCEPT_EVENT_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ACCEPT_EVENT_ACTION__IS_UNMARSHALL :
 				setIsUnmarshall((Boolean) newValue);
@@ -736,7 +735,8 @@
 			case UMLPackage.ACCEPT_EVENT_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.ACCEPT_EVENT_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.ACCEPT_EVENT_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -746,7 +746,8 @@
 			case UMLPackage.ACCEPT_EVENT_ACTION__OUTPUT :
 				return isSetOutputs();
 			case UMLPackage.ACCEPT_EVENT_ACTION__IS_UNMARSHALL :
-				return ((eFlags & IS_UNMARSHALL_EFLAG) != 0) != IS_UNMARSHALL_EDEFAULT;
+				return ((eFlags
+					& IS_UNMARSHALL_EFLAG) != 0) != IS_UNMARSHALL_EDEFAULT;
 			case UMLPackage.ACCEPT_EVENT_ACTION__RESULT :
 				return results != null && !results.isEmpty();
 			case UMLPackage.ACCEPT_EVENT_ACTION__TRIGGER :
@@ -812,7 +813,8 @@
 			case UMLPackage.ACCEPT_EVENT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ACCEPT_EVENT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACCEPT_EVENT_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ACCEPT_EVENT_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -820,7 +822,8 @@
 			case UMLPackage.ACCEPT_EVENT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ACCEPT_EVENT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACCEPT_EVENT_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -897,8 +900,8 @@
 			case UMLPackage.ACCEPT_EVENT_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ACCEPT_EVENT_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ACCEPT_EVENT_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.ACCEPT_EVENT_ACTION___GET_CONTEXT :
@@ -955,7 +958,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.ACCEPT_EVENT_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.ACCEPT_EVENT_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -968,8 +972,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionExecutionSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionExecutionSpecificationImpl.java
index b48a766..bd5de3b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionExecutionSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionExecutionSpecificationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -140,8 +140,8 @@
 	 */
 	public boolean validateActionReferenced(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ActionExecutionSpecificationOperations.validateActionReferenced(
-			this, diagnostics, context);
+		return ActionExecutionSpecificationOperations
+			.validateActionReferenced(this, diagnostics, context);
 	}
 
 	/**
@@ -217,13 +217,13 @@
 		switch (featureID) {
 			case UMLPackage.ACTION_EXECUTION_SPECIFICATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ACTION_EXECUTION_SPECIFICATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ACTION_EXECUTION_SPECIFICATION__NAME :
 				setName((String) newValue);
@@ -246,8 +246,8 @@
 				return;
 			case UMLPackage.ACTION_EXECUTION_SPECIFICATION__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.ACTION_EXECUTION_SPECIFICATION__FINISH :
 				setFinish((OccurrenceSpecification) newValue);
@@ -415,7 +415,8 @@
 			case UMLPackage.ACTION_EXECUTION_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ACTION_EXECUTION_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTION_EXECUTION_SPECIFICATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ACTION_EXECUTION_SPECIFICATION___GET_STEREOTYPE_APPLICATIONS :
@@ -423,7 +424,8 @@
 			case UMLPackage.ACTION_EXECUTION_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ACTION_EXECUTION_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTION_EXECUTION_SPECIFICATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionImpl.java
index d4ebce2..07ed4e2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -154,11 +154,10 @@
 			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.ACTION__OUTPUT,
-							null));
+				cache.put(eResource, this, UMLPackage.Literals.ACTION__OUTPUT,
+					outputs = new DerivedUnionEObjectEList<OutputPin>(
+						OutputPin.class, this, UMLPackage.ACTION__OUTPUT,
+						null));
 			}
 			return outputs;
 		}
@@ -218,8 +217,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -246,9 +245,11 @@
 			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.ACTION__INPUT, null));
+				cache
+					.put(eResource, this, UMLPackage.Literals.ACTION__INPUT,
+						inputs = new DerivedUnionEObjectEList<InputPin>(
+							InputPin.class, this, UMLPackage.ACTION__INPUT,
+							null));
 			}
 			return inputs;
 		}
@@ -322,7 +323,8 @@
 	 * @generated
 	 */
 	public void setIsLocallyReentrant(boolean newIsLocallyReentrant) {
-		boolean oldIsLocallyReentrant = (eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0;
+		boolean oldIsLocallyReentrant = (eFlags
+			& IS_LOCALLY_REENTRANT_EFLAG) != 0;
 		if (newIsLocallyReentrant)
 			eFlags |= IS_LOCALLY_REENTRANT_EFLAG;
 		else
@@ -522,11 +524,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ACTION__IN_INTERRUPTIBLE_REGION :
@@ -535,14 +537,14 @@
 			case UMLPackage.ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -647,13 +649,13 @@
 		switch (featureID) {
 			case UMLPackage.ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ACTION__NAME :
 				setName((String) newValue);
@@ -672,50 +674,49 @@
 				return;
 			case UMLPackage.ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -844,7 +845,8 @@
 			case UMLPackage.ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -914,7 +916,8 @@
 			case UMLPackage.ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -922,7 +925,8 @@
 			case UMLPackage.ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -999,8 +1003,8 @@
 			case UMLPackage.ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.ACTION___GET_CONTEXT :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionInputPinImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionInputPinImpl.java
index 8e63374..680805a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionInputPinImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActionInputPinImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -122,8 +122,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -149,21 +149,23 @@
 			fromAction = (Action) eResolveProxy(oldFromAction);
 			if (fromAction != oldFromAction) {
 				InternalEObject newFromAction = (InternalEObject) fromAction;
-				NotificationChain msgs = oldFromAction.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.ACTION_INPUT_PIN__FROM_ACTION, null, null);
+				NotificationChain msgs = oldFromAction
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.ACTION_INPUT_PIN__FROM_ACTION,
+						null, null);
 				if (newFromAction.eInternalContainer() == null) {
 					msgs = newFromAction.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.ACTION_INPUT_PIN__FROM_ACTION, null,
-						msgs);
+							- UMLPackage.ACTION_INPUT_PIN__FROM_ACTION,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.ACTION_INPUT_PIN__FROM_ACTION,
-						oldFromAction, fromAction));
+						UMLPackage.ACTION_INPUT_PIN__FROM_ACTION, oldFromAction,
+						fromAction));
 			}
 		}
 		return fromAction;
@@ -208,13 +210,17 @@
 		if (newFromAction != fromAction) {
 			NotificationChain msgs = null;
 			if (fromAction != null)
-				msgs = ((InternalEObject) fromAction).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.ACTION_INPUT_PIN__FROM_ACTION, null, msgs);
+				msgs = ((InternalEObject) fromAction)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.ACTION_INPUT_PIN__FROM_ACTION,
+						null, msgs);
 			if (newFromAction != null)
-				msgs = ((InternalEObject) newFromAction).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.ACTION_INPUT_PIN__FROM_ACTION, null, msgs);
+				msgs = ((InternalEObject) newFromAction)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.ACTION_INPUT_PIN__FROM_ACTION,
+						null, msgs);
 			msgs = basicSetFromAction(newFromAction, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -280,11 +286,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ACTION_INPUT_PIN__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTION_INPUT_PIN__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTION_INPUT_PIN__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ACTION_INPUT_PIN__IN_INTERRUPTIBLE_REGION :
@@ -293,14 +299,14 @@
 			case UMLPackage.ACTION_INPUT_PIN__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.ACTION_INPUT_PIN__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ACTION_INPUT_PIN__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ACTION_INPUT_PIN__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTION_INPUT_PIN__UPPER_BOUND :
 				return basicSetUpperBound(null, msgs);
 			case UMLPackage.ACTION_INPUT_PIN__LOWER_VALUE :
@@ -428,13 +434,13 @@
 		switch (featureID) {
 			case UMLPackage.ACTION_INPUT_PIN__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ACTION_INPUT_PIN__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ACTION_INPUT_PIN__NAME :
 				setName((String) newValue);
@@ -453,32 +459,31 @@
 				return;
 			case UMLPackage.ACTION_INPUT_PIN__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.ACTION_INPUT_PIN__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.ACTION_INPUT_PIN__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ACTION_INPUT_PIN__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ACTION_INPUT_PIN__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.ACTION_INPUT_PIN__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.ACTION_INPUT_PIN__TYPE :
 				setType((Type) newValue);
@@ -678,7 +683,8 @@
 			case UMLPackage.ACTION_INPUT_PIN__IN_STATE :
 				return inStates != null && !inStates.isEmpty();
 			case UMLPackage.ACTION_INPUT_PIN__IS_CONTROL_TYPE :
-				return ((eFlags & IS_CONTROL_TYPE_EFLAG) != 0) != IS_CONTROL_TYPE_EDEFAULT;
+				return ((eFlags
+					& IS_CONTROL_TYPE_EFLAG) != 0) != IS_CONTROL_TYPE_EDEFAULT;
 			case UMLPackage.ACTION_INPUT_PIN__ORDERING :
 				return (eFlags & ORDERING_EFLAG) != ORDERING_EFLAG_DEFAULT;
 			case UMLPackage.ACTION_INPUT_PIN__SELECTION :
@@ -686,7 +692,8 @@
 			case UMLPackage.ACTION_INPUT_PIN__UPPER_BOUND :
 				return upperBound != null;
 			case UMLPackage.ACTION_INPUT_PIN__IS_ORDERED :
-				return ((eFlags & IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
+				return ((eFlags
+					& IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
 			case UMLPackage.ACTION_INPUT_PIN__IS_UNIQUE :
 				return ((eFlags & IS_UNIQUE_EFLAG) != 0) != IS_UNIQUE_EDEFAULT;
 			case UMLPackage.ACTION_INPUT_PIN__LOWER :
@@ -698,7 +705,8 @@
 			case UMLPackage.ACTION_INPUT_PIN__UPPER_VALUE :
 				return upperValue != null;
 			case UMLPackage.ACTION_INPUT_PIN__IS_CONTROL :
-				return ((eFlags & IS_CONTROL_EFLAG) != 0) != IS_CONTROL_EDEFAULT;
+				return ((eFlags
+					& IS_CONTROL_EFLAG) != 0) != IS_CONTROL_EDEFAULT;
 			case UMLPackage.ACTION_INPUT_PIN__FROM_ACTION :
 				return fromAction != null;
 		}
@@ -762,7 +770,8 @@
 			case UMLPackage.ACTION_INPUT_PIN___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ACTION_INPUT_PIN___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTION_INPUT_PIN___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ACTION_INPUT_PIN___GET_STEREOTYPE_APPLICATIONS :
@@ -770,7 +779,8 @@
 			case UMLPackage.ACTION_INPUT_PIN___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ACTION_INPUT_PIN___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTION_INPUT_PIN___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -847,8 +857,8 @@
 			case UMLPackage.ACTION_INPUT_PIN___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTION_INPUT_PIN___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTION_INPUT_PIN___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.ACTION_INPUT_PIN___VALIDATE_INPUT_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP :
@@ -894,8 +904,8 @@
 			case UMLPackage.ACTION_INPUT_PIN___COMPATIBLE_WITH__MULTIPLICITYELEMENT :
 				return compatibleWith((MultiplicityElement) arguments.get(0));
 			case UMLPackage.ACTION_INPUT_PIN___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT :
-				return includesMultiplicity((MultiplicityElement) arguments
-					.get(0));
+				return includesMultiplicity(
+					(MultiplicityElement) arguments.get(0));
 			case UMLPackage.ACTION_INPUT_PIN___IS__INT_INT :
 				return is((Integer) arguments.get(0),
 					(Integer) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityEdgeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityEdgeImpl.java
index 043f526..f487e80 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityEdgeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityEdgeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -219,15 +219,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT);
 			if (redefinedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
-						redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
-							RedefinableElement.class, this,
-							UMLPackage.ACTIVITY_EDGE__REDEFINED_ELEMENT,
-							REDEFINED_ELEMENT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
+					redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
+						RedefinableElement.class, this,
+						UMLPackage.ACTIVITY_EDGE__REDEFINED_ELEMENT,
+						REDEFINED_ELEMENT_ESUBSETS));
 			}
 			return redefinedElements;
 		}
@@ -248,8 +245,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -305,7 +302,8 @@
 	 */
 	public void setActivity(Activity newActivity) {
 		if (newActivity != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.ACTIVITY_EDGE__ACTIVITY && newActivity != null)) {
+			|| (eContainerFeatureID() != UMLPackage.ACTIVITY_EDGE__ACTIVITY
+				&& newActivity != null)) {
 			if (EcoreUtil.isAncestor(this, newActivity))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -391,7 +389,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetInStructuredNode(
-			StructuredActivityNode newInStructuredNode, NotificationChain msgs) {
+			StructuredActivityNode newInStructuredNode,
+			NotificationChain msgs) {
 		msgs = eBasicSetContainer((InternalEObject) newInStructuredNode,
 			UMLPackage.ACTIVITY_EDGE__IN_STRUCTURED_NODE, msgs);
 		return msgs;
@@ -402,9 +401,11 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setInStructuredNode(StructuredActivityNode newInStructuredNode) {
+	public void setInStructuredNode(
+			StructuredActivityNode newInStructuredNode) {
 		if (newInStructuredNode != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.ACTIVITY_EDGE__IN_STRUCTURED_NODE && newInStructuredNode != null)) {
+			|| (eContainerFeatureID() != UMLPackage.ACTIVITY_EDGE__IN_STRUCTURED_NODE
+				&& newInStructuredNode != null)) {
 			if (EcoreUtil.isAncestor(this, newInStructuredNode))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -412,8 +413,8 @@
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newInStructuredNode != null)
-				msgs = ((InternalEObject) newInStructuredNode).eInverseAdd(
-					this, UMLPackage.STRUCTURED_ACTIVITY_NODE__EDGE,
+				msgs = ((InternalEObject) newInStructuredNode).eInverseAdd(this,
+					UMLPackage.STRUCTURED_ACTIVITY_NODE__EDGE,
 					StructuredActivityNode.class, msgs);
 			msgs = basicSetInStructuredNode(newInStructuredNode, msgs);
 			if (msgs != null)
@@ -625,7 +626,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ValueSpecification createGuard(String name, Type type, EClass eClass) {
+	public ValueSpecification createGuard(String name, Type type,
+			EClass eClass) {
 		ValueSpecification newGuard = (ValueSpecification) create(eClass);
 		setGuard(newGuard);
 		if (name != null)
@@ -722,7 +724,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ValueSpecification createWeight(String name, Type type, EClass eClass) {
+	public ValueSpecification createWeight(String name, Type type,
+			EClass eClass) {
 		ValueSpecification newWeight = (ValueSpecification) create(eClass);
 		setWeight(newWeight);
 		if (name != null)
@@ -740,7 +743,8 @@
 	public InterruptibleActivityRegion getInterrupts() {
 		if (interrupts != null && interrupts.eIsProxy()) {
 			InternalEObject oldInterrupts = (InternalEObject) interrupts;
-			interrupts = (InterruptibleActivityRegion) eResolveProxy(oldInterrupts);
+			interrupts = (InterruptibleActivityRegion) eResolveProxy(
+				oldInterrupts);
 			if (interrupts != oldInterrupts) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -790,17 +794,13 @@
 		if (newInterrupts != interrupts) {
 			NotificationChain msgs = null;
 			if (interrupts != null)
-				msgs = ((InternalEObject) interrupts)
-					.eInverseRemove(
-						this,
-						UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE,
-						InterruptibleActivityRegion.class, msgs);
+				msgs = ((InternalEObject) interrupts).eInverseRemove(this,
+					UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE,
+					InterruptibleActivityRegion.class, msgs);
 			if (newInterrupts != null)
-				msgs = ((InternalEObject) newInterrupts)
-					.eInverseAdd(
-						this,
-						UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE,
-						InterruptibleActivityRegion.class, msgs);
+				msgs = ((InternalEObject) newInterrupts).eInverseAdd(this,
+					UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE,
+					InterruptibleActivityRegion.class, msgs);
 			msgs = basicSetInterrupts(newInterrupts, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -889,8 +889,8 @@
 	 */
 	public boolean validateSourceAndTarget(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ActivityEdgeOperations.validateSourceAndTarget(this,
-			diagnostics, context);
+		return ActivityEdgeOperations.validateSourceAndTarget(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -925,11 +925,9 @@
 					.basicAdd(otherEnd, msgs);
 			case UMLPackage.ACTIVITY_EDGE__INTERRUPTS :
 				if (interrupts != null)
-					msgs = ((InternalEObject) interrupts)
-						.eInverseRemove(
-							this,
-							UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE,
-							InterruptibleActivityRegion.class, msgs);
+					msgs = ((InternalEObject) interrupts).eInverseRemove(this,
+						UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE,
+						InterruptibleActivityRegion.class, msgs);
 				return basicSetInterrupts(
 					(InterruptibleActivityRegion) otherEnd, msgs);
 			case UMLPackage.ACTIVITY_EDGE__IN_STRUCTURED_NODE :
@@ -963,11 +961,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ACTIVITY_EDGE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY_EDGE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY_EDGE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ACTIVITY_EDGE__ACTIVITY :
@@ -975,8 +973,8 @@
 			case UMLPackage.ACTIVITY_EDGE__GUARD :
 				return basicSetGuard(null, msgs);
 			case UMLPackage.ACTIVITY_EDGE__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY_EDGE__INTERRUPTS :
 				return basicSetInterrupts(null, msgs);
 			case UMLPackage.ACTIVITY_EDGE__IN_STRUCTURED_NODE :
@@ -1100,13 +1098,13 @@
 		switch (featureID) {
 			case UMLPackage.ACTIVITY_EDGE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_EDGE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_EDGE__NAME :
 				setName((String) newValue);
@@ -1128,8 +1126,8 @@
 				return;
 			case UMLPackage.ACTIVITY_EDGE__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_EDGE__INTERRUPTS :
 				setInterrupts((InterruptibleActivityRegion) newValue);
@@ -1145,8 +1143,8 @@
 				return;
 			case UMLPackage.ACTIVITY_EDGE__REDEFINED_EDGE :
 				getRedefinedEdges().clear();
-				getRedefinedEdges().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getRedefinedEdges()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_EDGE__WEIGHT :
 				setWeight((ValueSpecification) newValue);
@@ -1329,7 +1327,8 @@
 			case UMLPackage.ACTIVITY_EDGE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ACTIVITY_EDGE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTIVITY_EDGE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ACTIVITY_EDGE___GET_STEREOTYPE_APPLICATIONS :
@@ -1337,7 +1336,8 @@
 			case UMLPackage.ACTIVITY_EDGE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ACTIVITY_EDGE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTIVITY_EDGE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1414,8 +1414,8 @@
 			case UMLPackage.ACTIVITY_EDGE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTIVITY_EDGE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTIVITY_EDGE___VALIDATE_SOURCE_AND_TARGET__DIAGNOSTICCHAIN_MAP :
 				return validateSourceAndTarget(
 					(DiagnosticChain) arguments.get(0),
@@ -1535,7 +1535,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{UMLPackage.ACTIVITY_EDGE__REDEFINED_EDGE};
+	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{
+		UMLPackage.ACTIVITY_EDGE__REDEFINED_EDGE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityGroupImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityGroupImpl.java
index c410d32..d514808 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityGroupImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityGroupImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 465214
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 465214, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -160,8 +160,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -190,14 +190,11 @@
 				.get(eResource, this,
 					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_NODE);
 			if (containedNodes == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_NODE,
-						containedNodes = new DerivedUnionEObjectEList<ActivityNode>(
-							ActivityNode.class, this,
-							UMLPackage.ACTIVITY_GROUP__CONTAINED_NODE, null));
+				cache.put(eResource, this,
+					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_NODE,
+					containedNodes = new DerivedUnionEObjectEList<ActivityNode>(
+						ActivityNode.class, this,
+						UMLPackage.ACTIVITY_GROUP__CONTAINED_NODE, null));
 			}
 			return containedNodes;
 		}
@@ -247,14 +244,11 @@
 				.get(eResource, this,
 					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_EDGE);
 			if (containedEdges == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_EDGE,
-						containedEdges = new DerivedUnionEObjectEList<ActivityEdge>(
-							ActivityEdge.class, this,
-							UMLPackage.ACTIVITY_GROUP__CONTAINED_EDGE, null));
+				cache.put(eResource, this,
+					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_EDGE,
+					containedEdges = new DerivedUnionEObjectEList<ActivityEdge>(
+						ActivityEdge.class, this,
+						UMLPackage.ACTIVITY_GROUP__CONTAINED_EDGE, null));
 			}
 			return containedEdges;
 		}
@@ -353,7 +347,8 @@
 					.getOwnedGroups()).basicAdd(this, msgs);
 			msgs = eBasicSetContainer((InternalEObject) newInActivity,
 				InternalEObject.EOPPOSITE_FEATURE_BASE
-					- UMLPackage.ACTIVITY__OWNED_GROUP, msgs);
+					- UMLPackage.ACTIVITY__OWNED_GROUP,
+				msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
@@ -456,13 +451,13 @@
 		switch (featureID) {
 			case UMLPackage.ACTIVITY_GROUP__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_GROUP__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_GROUP__NAME :
 				setName((String) newValue);
@@ -629,7 +624,8 @@
 			case UMLPackage.ACTIVITY_GROUP___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ACTIVITY_GROUP___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTIVITY_GROUP___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ACTIVITY_GROUP___GET_STEREOTYPE_APPLICATIONS :
@@ -637,7 +633,8 @@
 			case UMLPackage.ACTIVITY_GROUP___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ACTIVITY_GROUP___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTIVITY_GROUP___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -702,8 +699,7 @@
 			case UMLPackage.ACTIVITY_GROUP___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.ACTIVITY_GROUP___VALIDATE_NODES_AND_EDGES__DIAGNOSTICCHAIN_MAP :
-				return validateNodesAndEdges(
-					(DiagnosticChain) arguments.get(0),
+				return validateNodesAndEdges((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.ACTIVITY_GROUP___VALIDATE_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP :
 				return validateNotContained((DiagnosticChain) arguments.get(0),
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityImpl.java
index 020705b..be322b1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -264,14 +264,13 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
 					ownedElements = new DerivedUnionEObjectEList<Element>(
-						Element.class, this,
-						UMLPackage.ACTIVITY__OWNED_ELEMENT,
+						Element.class, this, UMLPackage.ACTIVITY__OWNED_ELEMENT,
 						OWNED_ELEMENT_ESUBSETS));
 			}
 			return ownedElements;
@@ -349,7 +348,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
-	public ActivityNode getNode(String name, boolean ignoreCase, EClass eClass) {
+	public ActivityNode getNode(String name, boolean ignoreCase,
+			EClass eClass) {
 		nodeLoop : for (ActivityNode node : getNodes()) {
 			if (eClass != null && !eClass.isInstance(node))
 				continue nodeLoop;
@@ -384,7 +384,8 @@
 			eFlags &= ~IS_READ_ONLY_EFLAG;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.ACTIVITY__IS_READ_ONLY, oldIsReadOnly, newIsReadOnly));
+				UMLPackage.ACTIVITY__IS_READ_ONLY, oldIsReadOnly,
+				newIsReadOnly));
 	}
 
 	/**
@@ -402,7 +403,8 @@
 	 * @generated
 	 */
 	public void setIsSingleExecution(boolean newIsSingleExecution) {
-		boolean oldIsSingleExecution = (eFlags & IS_SINGLE_EXECUTION_EFLAG) != 0;
+		boolean oldIsSingleExecution = (eFlags
+			& IS_SINGLE_EXECUTION_EFLAG) != 0;
 		if (newIsSingleExecution)
 			eFlags |= IS_SINGLE_EXECUTION_EFLAG;
 		else
@@ -435,7 +437,8 @@
 	 */
 	public StructuredActivityNode createStructuredNode(String name,
 			EClass eClass) {
-		StructuredActivityNode newStructuredNode = (StructuredActivityNode) create(eClass);
+		StructuredActivityNode newStructuredNode = (StructuredActivityNode) create(
+			eClass);
 		getStructuredNodes().add(newStructuredNode);
 		if (name != null)
 			newStructuredNode.setName(name);
@@ -611,10 +614,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.ACTIVITY__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.ACTIVITY__TEMPLATE_BINDING :
@@ -623,8 +626,9 @@
 			case UMLPackage.ACTIVITY__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.ACTIVITY__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.ACTIVITY__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -651,7 +655,8 @@
 					msgs = ((InternalEObject) specification).eInverseRemove(
 						this, UMLPackage.BEHAVIORAL_FEATURE__METHOD,
 						BehavioralFeature.class, msgs);
-				return basicSetSpecification((BehavioralFeature) otherEnd, msgs);
+				return basicSetSpecification((BehavioralFeature) otherEnd,
+					msgs);
 			case UMLPackage.ACTIVITY__EDGE :
 				return ((InternalEList<InternalEObject>) (InternalEList<?>) getEdges())
 					.basicAdd(otherEnd, msgs);
@@ -672,93 +677,93 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ACTIVITY__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ACTIVITY__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.ACTIVITY__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.ACTIVITY__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.ACTIVITY__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.ACTIVITY__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__OWNED_CONNECTOR :
-				return ((InternalEList<?>) getOwnedConnectors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedConnectors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__INTERFACE_REALIZATION :
 				return ((InternalEList<?>) getInterfaceRealizations())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__OWNED_BEHAVIOR :
-				return ((InternalEList<?>) getOwnedBehaviors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedBehaviors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__NESTED_CLASSIFIER :
-				return ((InternalEList<?>) getNestedClassifiers()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedClassifiers())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__OWNED_RECEPTION :
-				return ((InternalEList<?>) getOwnedReceptions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedReceptions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__SPECIFICATION :
 				return basicSetSpecification(null, msgs);
 			case UMLPackage.ACTIVITY__OWNED_PARAMETER :
-				return ((InternalEList<?>) getOwnedParameters()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedParameters())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__OWNED_PARAMETER_SET :
 				return ((InternalEList<?>) getOwnedParameterSets())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__OWNED_GROUP :
-				return ((InternalEList<?>) getOwnedGroups()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedGroups())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__EDGE :
 				return ((InternalEList<?>) getEdges()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.ACTIVITY__VARIABLE :
-				return ((InternalEList<?>) getVariables()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getVariables()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ACTIVITY__OWNED_NODE :
-				return ((InternalEList<?>) getOwnedNodes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedNodes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY__STRUCTURED_NODE :
-				return ((InternalEList<?>) getStructuredNodes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getStructuredNodes())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -948,13 +953,13 @@
 		switch (featureID) {
 			case UMLPackage.ACTIVITY__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__NAME :
 				setName((String) newValue);
@@ -967,18 +972,18 @@
 				return;
 			case UMLPackage.ACTIVITY__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -994,31 +999,31 @@
 				return;
 			case UMLPackage.ACTIVITY__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.ACTIVITY__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -1028,8 +1033,8 @@
 				return;
 			case UMLPackage.ACTIVITY__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__USE_CASE :
 				getUseCases().clear();
@@ -1037,26 +1042,26 @@
 				return;
 			case UMLPackage.ACTIVITY__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.ACTIVITY__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -1068,32 +1073,31 @@
 				return;
 			case UMLPackage.ACTIVITY__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__IS_ACTIVE :
 				setIsActive((Boolean) newValue);
 				return;
 			case UMLPackage.ACTIVITY__NESTED_CLASSIFIER :
 				getNestedClassifiers().clear();
-				getNestedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getNestedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__OWNED_RECEPTION :
 				getOwnedReceptions().clear();
-				getOwnedReceptions().addAll(
-					(Collection<? extends Reception>) newValue);
+				getOwnedReceptions()
+					.addAll((Collection<? extends Reception>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__SUPER_CLASS :
 				getSuperClasses().clear();
-				getSuperClasses()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
+				getSuperClasses().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__SPECIFICATION :
 				setSpecification((BehavioralFeature) newValue);
@@ -1103,33 +1107,33 @@
 				return;
 			case UMLPackage.ACTIVITY__OWNED_PARAMETER :
 				getOwnedParameters().clear();
-				getOwnedParameters().addAll(
-					(Collection<? extends Parameter>) newValue);
+				getOwnedParameters()
+					.addAll((Collection<? extends Parameter>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__OWNED_PARAMETER_SET :
 				getOwnedParameterSets().clear();
-				getOwnedParameterSets().addAll(
-					(Collection<? extends ParameterSet>) newValue);
+				getOwnedParameterSets()
+					.addAll((Collection<? extends ParameterSet>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__POSTCONDITION :
 				getPostconditions().clear();
-				getPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__PRECONDITION :
 				getPreconditions().clear();
-				getPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__REDEFINED_BEHAVIOR :
 				getRedefinedBehaviors().clear();
-				getRedefinedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getRedefinedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__OWNED_GROUP :
 				getOwnedGroups().clear();
-				getOwnedGroups().addAll(
-					(Collection<? extends ActivityGroup>) newValue);
+				getOwnedGroups()
+					.addAll((Collection<? extends ActivityGroup>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__EDGE :
 				getEdges().clear();
@@ -1148,13 +1152,13 @@
 				return;
 			case UMLPackage.ACTIVITY__GROUP :
 				getGroups().clear();
-				getGroups().addAll(
-					(Collection<? extends ActivityGroup>) newValue);
+				getGroups()
+					.addAll((Collection<? extends ActivityGroup>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__OWNED_NODE :
 				getOwnedNodes().clear();
-				getOwnedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getOwnedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__IS_READ_ONLY :
 				setIsReadOnly((Boolean) newValue);
@@ -1164,8 +1168,8 @@
 				return;
 			case UMLPackage.ACTIVITY__PARTITION :
 				getPartitions().clear();
-				getPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.ACTIVITY__STRUCTURED_NODE :
 				getStructuredNodes().clear();
@@ -1420,7 +1424,8 @@
 			case UMLPackage.ACTIVITY__IS_ABSTRACT :
 				return isSetIsAbstract();
 			case UMLPackage.ACTIVITY__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.ACTIVITY__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.ACTIVITY__USE_CASE :
@@ -1493,9 +1498,11 @@
 			case UMLPackage.ACTIVITY__OWNED_NODE :
 				return ownedNodes != null && !ownedNodes.isEmpty();
 			case UMLPackage.ACTIVITY__IS_READ_ONLY :
-				return ((eFlags & IS_READ_ONLY_EFLAG) != 0) != IS_READ_ONLY_EDEFAULT;
+				return ((eFlags
+					& IS_READ_ONLY_EFLAG) != 0) != IS_READ_ONLY_EDEFAULT;
 			case UMLPackage.ACTIVITY__IS_SINGLE_EXECUTION :
-				return ((eFlags & IS_SINGLE_EXECUTION_EFLAG) != 0) != IS_SINGLE_EXECUTION_EDEFAULT;
+				return ((eFlags
+					& IS_SINGLE_EXECUTION_EFLAG) != 0) != IS_SINGLE_EXECUTION_EDEFAULT;
 			case UMLPackage.ACTIVITY__PARTITION :
 				return partitions != null && !partitions.isEmpty();
 			case UMLPackage.ACTIVITY__STRUCTURED_NODE :
@@ -1561,7 +1568,8 @@
 			case UMLPackage.ACTIVITY___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ACTIVITY___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTIVITY___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ACTIVITY___GET_STEREOTYPE_APPLICATIONS :
@@ -1569,7 +1577,8 @@
 			case UMLPackage.ACTIVITY___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ACTIVITY___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTIVITY___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1658,13 +1667,13 @@
 			case UMLPackage.ACTIVITY___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.ACTIVITY___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.ACTIVITY___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.ACTIVITY___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.ACTIVITY___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.ACTIVITY___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1684,10 +1693,11 @@
 			case UMLPackage.ACTIVITY___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTIVITY___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTIVITY___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.ACTIVITY___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.ACTIVITY___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1788,8 +1798,7 @@
 			case UMLPackage.ACTIVITY___GET_OWNED_PORTS :
 				return getOwnedPorts();
 			case UMLPackage.ACTIVITY___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.ACTIVITY___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
@@ -1919,7 +1928,8 @@
 		UMLPackage.ACTIVITY__NESTED_CLASSIFIER,
 		UMLPackage.ACTIVITY__OWNED_RECEPTION,
 		UMLPackage.ACTIVITY__OWNED_PARAMETER,
-		UMLPackage.ACTIVITY__OWNED_PARAMETER_SET, UMLPackage.ACTIVITY__VARIABLE};
+		UMLPackage.ACTIVITY__OWNED_PARAMETER_SET,
+		UMLPackage.ACTIVITY__VARIABLE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1943,9 +1953,11 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_GROUP_ESUBSETS = new int[]{UMLPackage.ACTIVITY__PARTITION};
+	protected static final int[] OWNED_GROUP_ESUBSETS = new int[]{
+		UMLPackage.ACTIVITY__PARTITION};
 
-	protected static final int[] OWNED_GROUP_ESUPERSETS = new int[]{UMLPackage.ACTIVITY__GROUP};
+	protected static final int[] OWNED_GROUP_ESUPERSETS = new int[]{
+		UMLPackage.ACTIVITY__GROUP};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2004,7 +2016,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
-	public ActivityGroup getGroup(String name, boolean ignoreCase, EClass eClass) {
+	public ActivityGroup getGroup(String name, boolean ignoreCase,
+			EClass eClass) {
 		groupLoop : for (ActivityGroup group : getGroups()) {
 			if (eClass != null && !eClass.isInstance(group))
 				continue groupLoop;
@@ -2042,7 +2055,8 @@
 		return ownedNodes;
 	}
 
-	protected static final int[] OWNED_NODE_ESUPERSETS = new int[]{UMLPackage.ACTIVITY__NODE};
+	protected static final int[] OWNED_NODE_ESUPERSETS = new int[]{
+		UMLPackage.ACTIVITY__NODE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2143,8 +2157,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateMaximumTwoParameterNodes(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateMaximumTwoParameterNodes(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return ActivityOperations.validateMaximumTwoParameterNodes(this,
 			diagnostics, context);
 	}
@@ -2179,7 +2193,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] PARTITION_ESUPERSETS = new int[]{UMLPackage.ACTIVITY__OWNED_GROUP};
+	protected static final int[] PARTITION_ESUPERSETS = new int[]{
+		UMLPackage.ACTIVITY__OWNED_GROUP};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2187,7 +2202,8 @@
 	 * @generated
 	 */
 	public ActivityPartition createPartition(String name) {
-		ActivityPartition newPartition = (ActivityPartition) create(UMLPackage.Literals.ACTIVITY_PARTITION);
+		ActivityPartition newPartition = (ActivityPartition) create(
+			UMLPackage.Literals.ACTIVITY_PARTITION);
 		getPartitions().add(newPartition);
 		if (name != null)
 			newPartition.setName(name);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityNodeImpl.java
index a877b2c..668bc42 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 465214
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 465214, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -195,15 +195,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT);
 			if (redefinedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
-						redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
-							RedefinableElement.class, this,
-							UMLPackage.ACTIVITY_NODE__REDEFINED_ELEMENT,
-							REDEFINED_ELEMENT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
+					redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
+						RedefinableElement.class, this,
+						UMLPackage.ACTIVITY_NODE__REDEFINED_ELEMENT,
+						REDEFINED_ELEMENT_ESUBSETS));
 			}
 			return redefinedElements;
 		}
@@ -342,7 +339,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetInStructuredNode(
-			StructuredActivityNode newInStructuredNode, NotificationChain msgs) {
+			StructuredActivityNode newInStructuredNode,
+			NotificationChain msgs) {
 		msgs = eBasicSetContainer((InternalEObject) newInStructuredNode,
 			UMLPackage.ACTIVITY_NODE__IN_STRUCTURED_NODE, msgs);
 		return msgs;
@@ -353,9 +351,11 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setInStructuredNode(StructuredActivityNode newInStructuredNode) {
+	public void setInStructuredNode(
+			StructuredActivityNode newInStructuredNode) {
 		if (newInStructuredNode != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.ACTIVITY_NODE__IN_STRUCTURED_NODE && newInStructuredNode != null)) {
+			|| (eContainerFeatureID() != UMLPackage.ACTIVITY_NODE__IN_STRUCTURED_NODE
+				&& newInStructuredNode != null)) {
 			if (EcoreUtil.isAncestor(this, newInStructuredNode))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -363,8 +363,8 @@
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newInStructuredNode != null)
-				msgs = ((InternalEObject) newInStructuredNode).eInverseAdd(
-					this, UMLPackage.STRUCTURED_ACTIVITY_NODE__NODE,
+				msgs = ((InternalEObject) newInStructuredNode).eInverseAdd(this,
+					UMLPackage.STRUCTURED_ACTIVITY_NODE__NODE,
 					StructuredActivityNode.class, msgs);
 			msgs = basicSetInStructuredNode(newInStructuredNode, msgs);
 			if (msgs != null)
@@ -438,7 +438,8 @@
 					.getOwnedNodes()).basicAdd(this, msgs);
 			msgs = eBasicSetContainer((InternalEObject) newActivity,
 				InternalEObject.EOPPOSITE_FEATURE_BASE
-					- UMLPackage.ACTIVITY__OWNED_NODE, msgs);
+					- UMLPackage.ACTIVITY__OWNED_NODE,
+				msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
@@ -615,11 +616,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ACTIVITY_NODE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY_NODE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY_NODE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION :
@@ -628,14 +629,14 @@
 			case UMLPackage.ACTIVITY_NODE__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.ACTIVITY_NODE__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ACTIVITY_NODE__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ACTIVITY_NODE__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -732,13 +733,13 @@
 		switch (featureID) {
 			case UMLPackage.ACTIVITY_NODE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_NODE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_NODE__NAME :
 				setName((String) newValue);
@@ -757,32 +758,31 @@
 				return;
 			case UMLPackage.ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_NODE__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.ACTIVITY_NODE__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_NODE__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_NODE__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_NODE__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -971,7 +971,8 @@
 			case UMLPackage.ACTIVITY_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ACTIVITY_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTIVITY_NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ACTIVITY_NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -979,7 +980,8 @@
 			case UMLPackage.ACTIVITY_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ACTIVITY_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTIVITY_NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1056,8 +1058,8 @@
 			case UMLPackage.ACTIVITY_NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTIVITY_NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTIVITY_NODE___CONTAINING_ACTIVITY :
 				return containingActivity();
 		}
@@ -1166,7 +1168,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{UMLPackage.ACTIVITY_NODE__REDEFINED_NODE};
+	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{
+		UMLPackage.ACTIVITY_NODE__REDEFINED_NODE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityParameterNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityParameterNodeImpl.java
index 220a3ec..97ee665 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityParameterNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityParameterNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -293,13 +293,13 @@
 		switch (featureID) {
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__NAME :
 				setName((String) newValue);
@@ -318,32 +318,31 @@
 				return;
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__TYPE :
 				setType((Type) newValue);
@@ -501,7 +500,8 @@
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__IN_STATE :
 				return inStates != null && !inStates.isEmpty();
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__IS_CONTROL_TYPE :
-				return ((eFlags & IS_CONTROL_TYPE_EFLAG) != 0) != IS_CONTROL_TYPE_EDEFAULT;
+				return ((eFlags
+					& IS_CONTROL_TYPE_EFLAG) != 0) != IS_CONTROL_TYPE_EDEFAULT;
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__ORDERING :
 				return (eFlags & ORDERING_EFLAG) != ORDERING_EFLAG_DEFAULT;
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__SELECTION :
@@ -571,7 +571,8 @@
 			case UMLPackage.ACTIVITY_PARAMETER_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ACTIVITY_PARAMETER_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTIVITY_PARAMETER_NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ACTIVITY_PARAMETER_NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -579,7 +580,8 @@
 			case UMLPackage.ACTIVITY_PARAMETER_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ACTIVITY_PARAMETER_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTIVITY_PARAMETER_NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -656,8 +658,8 @@
 			case UMLPackage.ACTIVITY_PARAMETER_NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTIVITY_PARAMETER_NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTIVITY_PARAMETER_NODE___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.ACTIVITY_PARAMETER_NODE___VALIDATE_INPUT_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP :
@@ -677,8 +679,7 @@
 					(DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.ACTIVITY_PARAMETER_NODE___VALIDATE_HAS_PARAMETERS__DIAGNOSTICCHAIN_MAP :
-				return validateHasParameters(
-					(DiagnosticChain) arguments.get(0),
+				return validateHasParameters((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.ACTIVITY_PARAMETER_NODE___VALIDATE_SAME_TYPE__DIAGNOSTICCHAIN_MAP :
 				return validateSameType((DiagnosticChain) arguments.get(0),
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityPartitionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityPartitionImpl.java
index d023ea3..5158565 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityPartitionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityPartitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -225,15 +225,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_NODE);
 			if (containedNodes == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_NODE,
-						containedNodes = new DerivedUnionEObjectEList<ActivityNode>(
-							ActivityNode.class, this,
-							UMLPackage.ACTIVITY_PARTITION__CONTAINED_NODE,
-							CONTAINED_NODE_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_NODE,
+					containedNodes = new DerivedUnionEObjectEList<ActivityNode>(
+						ActivityNode.class, this,
+						UMLPackage.ACTIVITY_PARTITION__CONTAINED_NODE,
+						CONTAINED_NODE_ESUBSETS));
 			}
 			return containedNodes;
 		}
@@ -257,15 +254,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_EDGE);
 			if (containedEdges == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_EDGE,
-						containedEdges = new DerivedUnionEObjectEList<ActivityEdge>(
-							ActivityEdge.class, this,
-							UMLPackage.ACTIVITY_PARTITION__CONTAINED_EDGE,
-							CONTAINED_EDGE_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_EDGE,
+					containedEdges = new DerivedUnionEObjectEList<ActivityEdge>(
+						ActivityEdge.class, this,
+						UMLPackage.ACTIVITY_PARTITION__CONTAINED_EDGE,
+						CONTAINED_EDGE_ESUBSETS));
 			}
 			return containedEdges;
 		}
@@ -354,7 +348,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ActivityEdge getEdge(String name, boolean ignoreCase, EClass eClass) {
+	public ActivityEdge getEdge(String name, boolean ignoreCase,
+			EClass eClass) {
 		edgeLoop : for (ActivityEdge edge : getEdges()) {
 			if (eClass != null && !eClass.isInstance(edge))
 				continue edgeLoop;
@@ -395,7 +390,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ActivityNode getNode(String name, boolean ignoreCase, EClass eClass) {
+	public ActivityNode getNode(String name, boolean ignoreCase,
+			EClass eClass) {
 		nodeLoop : for (ActivityNode node : getNodes()) {
 			if (eClass != null && !eClass.isInstance(node))
 				continue nodeLoop;
@@ -429,7 +425,8 @@
 	 * @generated
 	 */
 	public ActivityPartition createSubpartition(String name) {
-		ActivityPartition newSubpartition = (ActivityPartition) create(UMLPackage.Literals.ACTIVITY_PARTITION);
+		ActivityPartition newSubpartition = (ActivityPartition) create(
+			UMLPackage.Literals.ACTIVITY_PARTITION);
 		getSubpartitions().add(newSubpartition);
 		if (name != null)
 			newSubpartition.setName(name);
@@ -505,7 +502,8 @@
 	 */
 	public void setSuperPartition(ActivityPartition newSuperPartition) {
 		if (newSuperPartition != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.ACTIVITY_PARTITION__SUPER_PARTITION && newSuperPartition != null)) {
+			|| (eContainerFeatureID() != UMLPackage.ACTIVITY_PARTITION__SUPER_PARTITION
+				&& newSuperPartition != null)) {
 			if (EcoreUtil.isAncestor(this, newSuperPartition))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -653,19 +651,19 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ACTIVITY_PARTITION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY_PARTITION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY_PARTITION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ACTIVITY_PARTITION__NODE :
 				return ((InternalEList<?>) getNodes()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.ACTIVITY_PARTITION__SUBPARTITION :
-				return ((InternalEList<?>) getSubpartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubpartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ACTIVITY_PARTITION__SUPER_PARTITION :
 				return basicSetSuperPartition(null, msgs);
 			case UMLPackage.ACTIVITY_PARTITION__EDGE :
@@ -773,13 +771,13 @@
 		switch (featureID) {
 			case UMLPackage.ACTIVITY_PARTITION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_PARTITION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_PARTITION__NAME :
 				setName((String) newValue);
@@ -809,8 +807,8 @@
 				return;
 			case UMLPackage.ACTIVITY_PARTITION__SUBPARTITION :
 				getSubpartitions().clear();
-				getSubpartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getSubpartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.ACTIVITY_PARTITION__SUPER_PARTITION :
 				setSuperPartition((ActivityPartition) newValue);
@@ -916,9 +914,11 @@
 			case UMLPackage.ACTIVITY_PARTITION__SUPER_GROUP :
 				return isSetSuperGroup();
 			case UMLPackage.ACTIVITY_PARTITION__IS_DIMENSION :
-				return ((eFlags & IS_DIMENSION_EFLAG) != 0) != IS_DIMENSION_EDEFAULT;
+				return ((eFlags
+					& IS_DIMENSION_EFLAG) != 0) != IS_DIMENSION_EDEFAULT;
 			case UMLPackage.ACTIVITY_PARTITION__IS_EXTERNAL :
-				return ((eFlags & IS_EXTERNAL_EFLAG) != 0) != IS_EXTERNAL_EDEFAULT;
+				return ((eFlags
+					& IS_EXTERNAL_EFLAG) != 0) != IS_EXTERNAL_EDEFAULT;
 			case UMLPackage.ACTIVITY_PARTITION__NODE :
 				return nodes != null && !nodes.isEmpty();
 			case UMLPackage.ACTIVITY_PARTITION__REPRESENTS :
@@ -990,7 +990,8 @@
 			case UMLPackage.ACTIVITY_PARTITION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ACTIVITY_PARTITION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTIVITY_PARTITION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ACTIVITY_PARTITION___GET_STEREOTYPE_APPLICATIONS :
@@ -998,7 +999,8 @@
 			case UMLPackage.ACTIVITY_PARTITION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ACTIVITY_PARTITION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTIVITY_PARTITION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1063,8 +1065,7 @@
 			case UMLPackage.ACTIVITY_PARTITION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.ACTIVITY_PARTITION___VALIDATE_NODES_AND_EDGES__DIAGNOSTICCHAIN_MAP :
-				return validateNodesAndEdges(
-					(DiagnosticChain) arguments.get(0),
+				return validateNodesAndEdges((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.ACTIVITY_PARTITION___VALIDATE_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP :
 				return validateNotContained((DiagnosticChain) arguments.get(0),
@@ -1165,7 +1166,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] CONTAINED_NODE_ESUBSETS = new int[]{UMLPackage.ACTIVITY_PARTITION__NODE};
+	protected static final int[] CONTAINED_NODE_ESUBSETS = new int[]{
+		UMLPackage.ACTIVITY_PARTITION__NODE};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getSubgroups() <em>Subgroup</em>}' reference list.
@@ -1175,7 +1177,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SUBGROUP_ESUBSETS = new int[]{UMLPackage.ACTIVITY_PARTITION__SUBPARTITION};
+	protected static final int[] SUBGROUP_ESUBSETS = new int[]{
+		UMLPackage.ACTIVITY_PARTITION__SUBPARTITION};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getContainedEdges() <em>Contained Edge</em>}' reference list.
@@ -1185,7 +1188,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] CONTAINED_EDGE_ESUBSETS = new int[]{UMLPackage.ACTIVITY_PARTITION__EDGE};
+	protected static final int[] CONTAINED_EDGE_ESUBSETS = new int[]{
+		UMLPackage.ACTIVITY_PARTITION__EDGE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActorImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActorImpl.java
index ec33c72..680a0ba 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActorImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -143,7 +143,8 @@
 			case UMLPackage.ACTOR___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ACTOR___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTOR___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ACTOR___GET_STEREOTYPE_APPLICATIONS :
@@ -151,7 +152,8 @@
 			case UMLPackage.ACTOR___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ACTOR___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ACTOR___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -240,13 +242,13 @@
 			case UMLPackage.ACTOR___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.ACTOR___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.ACTOR___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.ACTOR___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.ACTOR___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.ACTOR___MEMBERS_ARE_DISTINGUISHABLE :
@@ -266,10 +268,11 @@
 			case UMLPackage.ACTOR___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTOR___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ACTOR___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.ACTOR___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.ACTOR___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -360,8 +363,7 @@
 			case UMLPackage.ACTOR___ALL_SLOTTABLE_FEATURES :
 				return allSlottableFeatures();
 			case UMLPackage.ACTOR___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.ACTOR___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddStructuralFeatureValueActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddStructuralFeatureValueActionImpl.java
index d07d9c3..de44a45 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddStructuralFeatureValueActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddStructuralFeatureValueActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -190,8 +190,8 @@
 	 */
 	public boolean validateRequiredValue(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return AddStructuralFeatureValueActionOperations.validateRequiredValue(
-			this, diagnostics, context);
+		return AddStructuralFeatureValueActionOperations
+			.validateRequiredValue(this, diagnostics, context);
 	}
 
 	/**
@@ -201,8 +201,8 @@
 	 */
 	public boolean validateInsertAtPin(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return AddStructuralFeatureValueActionOperations.validateInsertAtPin(
-			this, diagnostics, context);
+		return AddStructuralFeatureValueActionOperations
+			.validateInsertAtPin(this, diagnostics, context);
 	}
 
 	/**
@@ -216,26 +216,20 @@
 			insertAt = (InputPin) eResolveProxy(oldInsertAt);
 			if (insertAt != oldInsertAt) {
 				InternalEObject newInsertAt = (InternalEObject) insertAt;
-				NotificationChain msgs = oldInsertAt
-					.eInverseRemove(
-						this,
+				NotificationChain msgs = oldInsertAt.eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT,
+					null, null);
+				if (newInsertAt.eInternalContainer() == null) {
+					msgs = newInsertAt.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
 							- UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT,
-						null, null);
-				if (newInsertAt.eInternalContainer() == null) {
-					msgs = newInsertAt
-						.eInverseAdd(
-							this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT,
-							null, msgs);
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT,
 						oldInsertAt, insertAt));
 			}
@@ -283,19 +277,15 @@
 		if (newInsertAt != insertAt) {
 			NotificationChain msgs = null;
 			if (insertAt != null)
-				msgs = ((InternalEObject) insertAt)
-					.eInverseRemove(
-						this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT,
-						null, msgs);
+				msgs = ((InternalEObject) insertAt).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT,
+					null, msgs);
 			if (newInsertAt != null)
-				msgs = ((InternalEObject) newInsertAt)
-					.eInverseAdd(
-						this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT,
-						null, msgs);
+				msgs = ((InternalEObject) newInsertAt).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT,
+					null, msgs);
 			msgs = basicSetInsertAt(newInsertAt, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -339,11 +329,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -352,14 +342,14 @@
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -494,13 +484,13 @@
 		switch (featureID) {
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__NAME :
 				setName((String) newValue);
@@ -519,50 +509,49 @@
 				return;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__OBJECT :
 				setObject((InputPin) newValue);
@@ -727,7 +716,8 @@
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -747,7 +737,8 @@
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT :
 				return insertAt != null;
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REPLACE_ALL :
-				return ((eFlags & IS_REPLACE_ALL_EFLAG) != 0) != IS_REPLACE_ALL_EDEFAULT;
+				return ((eFlags
+					& IS_REPLACE_ALL_EFLAG) != 0) != IS_REPLACE_ALL_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
@@ -809,7 +800,8 @@
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -817,7 +809,8 @@
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -894,8 +887,8 @@
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION___GET_CONTEXT :
@@ -937,8 +930,7 @@
 				return validateTypeOfResult((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION___VALIDATE_REQUIRED_VALUE__DIAGNOSTICCHAIN_MAP :
-				return validateRequiredValue(
-					(DiagnosticChain) arguments.get(0),
+				return validateRequiredValue((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION___VALIDATE_INSERT_AT_PIN__DIAGNOSTICCHAIN_MAP :
 				return validateInsertAtPin((DiagnosticChain) arguments.get(0),
@@ -984,8 +976,8 @@
 	 */
 	@Override
 	public boolean isSetInputs() {
-		return super.isSetInputs()
-			|| eIsSet(UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT);
+		return super.isSetInputs() || eIsSet(
+			UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT);
 	}
 
 } //AddStructuralFeatureValueActionImpl
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddVariableValueActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddVariableValueActionImpl.java
index 73e5491..c9543c1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddVariableValueActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AddVariableValueActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -219,8 +219,9 @@
 						- UMLPackage.ADD_VARIABLE_VALUE_ACTION__INSERT_AT,
 					null, null);
 				if (newInsertAt.eInternalContainer() == null) {
-					msgs = newInsertAt.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.ADD_VARIABLE_VALUE_ACTION__INSERT_AT,
+					msgs = newInsertAt.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.ADD_VARIABLE_VALUE_ACTION__INSERT_AT,
 						null, msgs);
 				}
 				if (msgs != null)
@@ -326,11 +327,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -339,14 +340,14 @@
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -469,13 +470,13 @@
 		switch (featureID) {
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__NAME :
 				setName((String) newValue);
@@ -494,50 +495,49 @@
 				return;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__VARIABLE :
 				setVariable((Variable) newValue);
@@ -690,7 +690,8 @@
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -706,7 +707,8 @@
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__INSERT_AT :
 				return insertAt != null;
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION__IS_REPLACE_ALL :
-				return ((eFlags & IS_REPLACE_ALL_EFLAG) != 0) != IS_REPLACE_ALL_EDEFAULT;
+				return ((eFlags
+					& IS_REPLACE_ALL_EFLAG) != 0) != IS_REPLACE_ALL_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
@@ -768,7 +770,8 @@
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -776,7 +779,8 @@
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -853,8 +857,8 @@
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION___GET_CONTEXT :
@@ -876,8 +880,7 @@
 				return validateMultiplicity((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION___VALIDATE_REQUIRED_VALUE__DIAGNOSTICCHAIN_MAP :
-				return validateRequiredValue(
-					(DiagnosticChain) arguments.get(0),
+				return validateRequiredValue((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.ADD_VARIABLE_VALUE_ACTION___VALIDATE_INSERT_AT_PIN__DIAGNOSTICCHAIN_MAP :
 				return validateInsertAtPin((DiagnosticChain) arguments.get(0),
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ArtifactImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ArtifactImpl.java
index 9eb1ed2..aa946ed 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ArtifactImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ArtifactImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -222,14 +222,13 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
 					ownedElements = new DerivedUnionEObjectEList<Element>(
-						Element.class, this,
-						UMLPackage.ARTIFACT__OWNED_ELEMENT,
+						Element.class, this, UMLPackage.ARTIFACT__OWNED_ELEMENT,
 						OWNED_ELEMENT_ESUBSETS));
 			}
 			return ownedElements;
@@ -327,8 +326,8 @@
 		eFlags &= ~FILE_NAME_ESETFLAG;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET,
-				UMLPackage.ARTIFACT__FILE_NAME, oldFileName,
-				FILE_NAME_EDEFAULT, oldFileNameESet));
+				UMLPackage.ARTIFACT__FILE_NAME, oldFileName, FILE_NAME_EDEFAULT,
+				oldFileNameESet));
 	}
 
 	/**
@@ -437,8 +436,10 @@
 	 * @generated
 	 */
 	public Operation createOwnedOperation(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
-		Operation newOwnedOperation = (Operation) create(UMLPackage.Literals.OPERATION);
+			EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
+		Operation newOwnedOperation = (Operation) create(
+			UMLPackage.Literals.OPERATION);
 		getOwnedOperations().add(newOwnedOperation);
 		if (name != null)
 			newOwnedOperation.setName(name);
@@ -456,9 +457,10 @@
 		for (int i = 0; i < ownedParameterListSize; i++) {
 			newOwnedOperation.createOwnedParameter(i < ownedParameterNamesSize
 				? (String) ownedParameterNames.get(i)
-				: null, i < ownedParameterTypesSize
-				? (Type) ownedParameterTypes.get(i)
-				: null);
+				: null,
+				i < ownedParameterTypesSize
+					? (Type) ownedParameterTypes.get(i)
+					: null);
 		}
 		return newOwnedOperation;
 	}
@@ -469,9 +471,10 @@
 	 * @generated
 	 */
 	public Operation getOwnedOperation(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
-		return getOwnedOperation(name, ownedParameterNames,
-			ownedParameterTypes, false, false);
+			EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
+		return getOwnedOperation(name, ownedParameterNames, ownedParameterTypes,
+			false, false);
 	}
 
 	/**
@@ -492,20 +495,19 @@
 			int ownedParameterListSize = ownedParameterList.size();
 			if (ownedParameterNames != null
 				&& ownedParameterNames.size() != ownedParameterListSize
-				|| (ownedParameterTypes != null && ownedParameterTypes.size() != ownedParameterListSize))
+				|| (ownedParameterTypes != null
+					&& ownedParameterTypes.size() != ownedParameterListSize))
 				continue ownedOperationLoop;
 			for (int j = 0; j < ownedParameterListSize; j++) {
 				Parameter ownedParameter = ownedParameterList.get(j);
-				if (ownedParameterNames != null
-					&& !(ignoreCase
-						? (ownedParameterNames.get(j))
-							.equalsIgnoreCase(ownedParameter.getName())
-						: ownedParameterNames.get(j).equals(
-							ownedParameter.getName())))
+				if (ownedParameterNames != null && !(ignoreCase
+					? (ownedParameterNames.get(j))
+						.equalsIgnoreCase(ownedParameter.getName())
+					: ownedParameterNames.get(j)
+						.equals(ownedParameter.getName())))
 					continue ownedOperationLoop;
-				if (ownedParameterTypes != null
-					&& !ownedParameterTypes.get(j).equals(
-						ownedParameter.getType()))
+				if (ownedParameterTypes != null && !ownedParameterTypes.get(j)
+					.equals(ownedParameter.getType()))
 					continue ownedOperationLoop;
 			}
 			return ownedOperation;
@@ -534,7 +536,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Property createOwnedAttribute(String name, Type type, EClass eClass) {
+	public Property createOwnedAttribute(String name, Type type,
+			EClass eClass) {
 		Property newOwnedAttribute = (Property) create(eClass);
 		getOwnedAttributes().add(newOwnedAttribute);
 		if (name != null)
@@ -618,61 +621,61 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ARTIFACT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ARTIFACT__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.ARTIFACT__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.ARTIFACT__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.ARTIFACT__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.ARTIFACT__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__MANIFESTATION :
-				return ((InternalEList<?>) getManifestations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getManifestations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__NESTED_ARTIFACT :
-				return ((InternalEList<?>) getNestedArtifacts()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedArtifacts())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ARTIFACT__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -802,13 +805,13 @@
 		switch (featureID) {
 			case UMLPackage.ARTIFACT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__NAME :
 				setName((String) newValue);
@@ -821,18 +824,18 @@
 				return;
 			case UMLPackage.ARTIFACT__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -848,31 +851,31 @@
 				return;
 			case UMLPackage.ARTIFACT__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.ARTIFACT__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -882,8 +885,8 @@
 				return;
 			case UMLPackage.ARTIFACT__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__USE_CASE :
 				getUseCases().clear();
@@ -891,39 +894,39 @@
 				return;
 			case UMLPackage.ARTIFACT__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.ARTIFACT__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__FILE_NAME :
 				setFileName((String) newValue);
 				return;
 			case UMLPackage.ARTIFACT__MANIFESTATION :
 				getManifestations().clear();
-				getManifestations().addAll(
-					(Collection<? extends Manifestation>) newValue);
+				getManifestations()
+					.addAll((Collection<? extends Manifestation>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__NESTED_ARTIFACT :
 				getNestedArtifacts().clear();
-				getNestedArtifacts().addAll(
-					(Collection<? extends Artifact>) newValue);
+				getNestedArtifacts()
+					.addAll((Collection<? extends Artifact>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.ARTIFACT__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -1105,9 +1108,11 @@
 			case UMLPackage.ARTIFACT__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.ARTIFACT__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.ARTIFACT__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.ARTIFACT__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.ARTIFACT__USE_CASE :
@@ -1190,7 +1195,8 @@
 			case UMLPackage.ARTIFACT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ARTIFACT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ARTIFACT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ARTIFACT___GET_STEREOTYPE_APPLICATIONS :
@@ -1198,7 +1204,8 @@
 			case UMLPackage.ARTIFACT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ARTIFACT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ARTIFACT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1287,13 +1294,13 @@
 			case UMLPackage.ARTIFACT___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.ARTIFACT___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.ARTIFACT___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.ARTIFACT___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.ARTIFACT___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.ARTIFACT___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1313,10 +1320,11 @@
 			case UMLPackage.ARTIFACT___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ARTIFACT___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ARTIFACT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.ARTIFACT___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.ARTIFACT___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1514,7 +1522,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] ATTRIBUTE_ESUBSETS = new int[]{UMLPackage.ARTIFACT__OWNED_ATTRIBUTE};
+	protected static final int[] ATTRIBUTE_ESUBSETS = new int[]{
+		UMLPackage.ARTIFACT__OWNED_ATTRIBUTE};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getFeatures() <em>Feature</em>}' reference list.
@@ -1534,7 +1543,8 @@
 	 */
 	public Manifestation createManifestation(String name,
 			PackageableElement utilizedElement) {
-		Manifestation newManifestation = (Manifestation) create(UMLPackage.Literals.MANIFESTATION);
+		Manifestation newManifestation = (Manifestation) create(
+			UMLPackage.Literals.MANIFESTATION);
 		getManifestations().add(newManifestation);
 		if (name != null)
 			newManifestation.setName(name);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationClassImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationClassImpl.java
index f57d7e5..64a20ee 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationClassImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationClassImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -213,8 +213,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<NamedElement> members = (EList<NamedElement>) cache.get(
-				eResource, this, UMLPackage.Literals.NAMESPACE__MEMBER);
+			EList<NamedElement> members = (EList<NamedElement>) cache
+				.get(eResource, this, UMLPackage.Literals.NAMESPACE__MEMBER);
 			if (members == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.NAMESPACE__MEMBER,
@@ -242,13 +242,12 @@
 			EList<Feature> features = (EList<Feature>) cache.get(eResource,
 				this, UMLPackage.Literals.CLASSIFIER__FEATURE);
 			if (features == null) {
-				cache
-					.put(eResource, this,
-						UMLPackage.Literals.CLASSIFIER__FEATURE,
-						features = new DerivedUnionEObjectEList<Feature>(
-							Feature.class, this,
-							UMLPackage.ASSOCIATION_CLASS__FEATURE,
-							FEATURE_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.CLASSIFIER__FEATURE,
+					features = new DerivedUnionEObjectEList<Feature>(
+						Feature.class, this,
+						UMLPackage.ASSOCIATION_CLASS__FEATURE,
+						FEATURE_ESUBSETS));
 			}
 			return features;
 		}
@@ -516,10 +515,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.ASSOCIATION_CLASS__TEMPLATE_BINDING :
@@ -528,8 +527,7 @@
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							EOPPOSITE_FEATURE_BASE
 								- UMLPackage.ASSOCIATION_CLASS__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
@@ -573,76 +571,76 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ASSOCIATION_CLASS__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.ASSOCIATION_CLASS__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_CONNECTOR :
-				return ((InternalEList<?>) getOwnedConnectors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedConnectors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__INTERFACE_REALIZATION :
 				return ((InternalEList<?>) getInterfaceRealizations())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_BEHAVIOR :
-				return ((InternalEList<?>) getOwnedBehaviors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedBehaviors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__NESTED_CLASSIFIER :
-				return ((InternalEList<?>) getNestedClassifiers()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedClassifiers())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_RECEPTION :
-				return ((InternalEList<?>) getOwnedReceptions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedReceptions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__MEMBER_END :
-				return ((InternalEList<?>) getMemberEnds()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getMemberEnds())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_END :
-				return ((InternalEList<?>) getOwnedEnds()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedEnds()).basicRemove(otherEnd,
+					msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -804,13 +802,13 @@
 		switch (featureID) {
 			case UMLPackage.ASSOCIATION_CLASS__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__NAME :
 				setName((String) newValue);
@@ -823,18 +821,18 @@
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -850,31 +848,31 @@
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -884,8 +882,8 @@
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__USE_CASE :
 				getUseCases().clear();
@@ -893,26 +891,26 @@
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -924,40 +922,39 @@
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__IS_ACTIVE :
 				setIsActive((Boolean) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__NESTED_CLASSIFIER :
 				getNestedClassifiers().clear();
-				getNestedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getNestedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_RECEPTION :
 				getOwnedReceptions().clear();
-				getOwnedReceptions().addAll(
-					(Collection<? extends Reception>) newValue);
+				getOwnedReceptions()
+					.addAll((Collection<? extends Reception>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__SUPER_CLASS :
 				getSuperClasses().clear();
-				getSuperClasses()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
+				getSuperClasses().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__IS_DERIVED :
 				setIsDerived((Boolean) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__MEMBER_END :
 				getMemberEnds().clear();
-				getMemberEnds().addAll(
-					(Collection<? extends Property>) newValue);
+				getMemberEnds()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_END :
 				getOwnedEnds().clear();
@@ -966,8 +963,8 @@
 				return;
 			case UMLPackage.ASSOCIATION_CLASS__NAVIGABLE_OWNED_END :
 				getNavigableOwnedEnds().clear();
-				getNavigableOwnedEnds().addAll(
-					(Collection<? extends Property>) newValue);
+				getNavigableOwnedEnds()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -1178,7 +1175,8 @@
 			case UMLPackage.ASSOCIATION_CLASS__IS_ABSTRACT :
 				return isSetIsAbstract();
 			case UMLPackage.ASSOCIATION_CLASS__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.ASSOCIATION_CLASS__USE_CASE :
@@ -1225,7 +1223,8 @@
 			case UMLPackage.ASSOCIATION_CLASS__END_TYPE :
 				return !getEndTypes().isEmpty();
 			case UMLPackage.ASSOCIATION_CLASS__IS_DERIVED :
-				return ((eFlags & IS_DERIVED_EFLAG) != 0) != IS_DERIVED_EDEFAULT;
+				return ((eFlags
+					& IS_DERIVED_EFLAG) != 0) != IS_DERIVED_EDEFAULT;
 			case UMLPackage.ASSOCIATION_CLASS__MEMBER_END :
 				return memberEnds != null && !memberEnds.isEmpty();
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_END :
@@ -1243,7 +1242,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Relationship.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.ASSOCIATION_CLASS__RELATED_ELEMENT :
@@ -1277,7 +1277,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Relationship.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.RELATIONSHIP__RELATED_ELEMENT :
@@ -1398,7 +1399,8 @@
 			case UMLPackage.ASSOCIATION_CLASS___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ASSOCIATION_CLASS___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ASSOCIATION_CLASS___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ASSOCIATION_CLASS___GET_STEREOTYPE_APPLICATIONS :
@@ -1406,7 +1408,8 @@
 			case UMLPackage.ASSOCIATION_CLASS___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ASSOCIATION_CLASS___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ASSOCIATION_CLASS___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1495,13 +1498,13 @@
 			case UMLPackage.ASSOCIATION_CLASS___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.ASSOCIATION_CLASS___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.ASSOCIATION_CLASS___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.ASSOCIATION_CLASS___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.ASSOCIATION_CLASS___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.ASSOCIATION_CLASS___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1521,10 +1524,11 @@
 			case UMLPackage.ASSOCIATION_CLASS___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ASSOCIATION_CLASS___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ASSOCIATION_CLASS___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.ASSOCIATION_CLASS___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.ASSOCIATION_CLASS___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1625,8 +1629,7 @@
 			case UMLPackage.ASSOCIATION_CLASS___GET_OWNED_PORTS :
 				return getOwnedPorts();
 			case UMLPackage.ASSOCIATION_CLASS___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.ASSOCIATION_CLASS___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
@@ -1706,7 +1709,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] RELATED_ELEMENT_ESUBSETS = new int[]{UMLPackage.ASSOCIATION_CLASS__END_TYPE};
+	protected static final int[] RELATED_ELEMENT_ESUBSETS = new int[]{
+		UMLPackage.ASSOCIATION_CLASS__END_TYPE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1808,7 +1812,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] MEMBER_END_ESUBSETS = new int[]{UMLPackage.ASSOCIATION_CLASS__OWNED_END};
+	protected static final int[] MEMBER_END_ESUBSETS = new int[]{
+		UMLPackage.ASSOCIATION_CLASS__OWNED_END};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1848,7 +1853,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_END_ESUBSETS = new int[]{UMLPackage.ASSOCIATION_CLASS__NAVIGABLE_OWNED_END};
+	protected static final int[] OWNED_END_ESUBSETS = new int[]{
+		UMLPackage.ASSOCIATION_CLASS__NAVIGABLE_OWNED_END};
 
 	/**
 	 * The array of superset feature identifiers for the '{@link #getOwnedEnds() <em>Owned End</em>}' containment reference list.
@@ -1858,7 +1864,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_END_ESUPERSETS = new int[]{UMLPackage.ASSOCIATION_CLASS__MEMBER_END};
+	protected static final int[] OWNED_END_ESUPERSETS = new int[]{
+		UMLPackage.ASSOCIATION_CLASS__MEMBER_END};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1924,7 +1931,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] NAVIGABLE_OWNED_END_ESUPERSETS = new int[]{UMLPackage.ASSOCIATION_CLASS__OWNED_END};
+	protected static final int[] NAVIGABLE_OWNED_END_ESUPERSETS = new int[]{
+		UMLPackage.ASSOCIATION_CLASS__OWNED_END};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1948,7 +1956,8 @@
 	 * @generated
 	 */
 	public Property createNavigableOwnedEnd(String name, Type type) {
-		return createNavigableOwnedEnd(name, type, UMLPackage.Literals.PROPERTY);
+		return createNavigableOwnedEnd(name, type,
+			UMLPackage.Literals.PROPERTY);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationImpl.java
index 938ed20..7f783ed 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/AssociationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -205,8 +205,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<NamedElement> members = (EList<NamedElement>) cache.get(
-				eResource, this, UMLPackage.Literals.NAMESPACE__MEMBER);
+			EList<NamedElement> members = (EList<NamedElement>) cache
+				.get(eResource, this, UMLPackage.Literals.NAMESPACE__MEMBER);
 			if (members == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.NAMESPACE__MEMBER,
@@ -324,7 +324,8 @@
 			eFlags &= ~IS_DERIVED_EFLAG;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.ASSOCIATION__IS_DERIVED, oldIsDerived, newIsDerived));
+				UMLPackage.ASSOCIATION__IS_DERIVED, oldIsDerived,
+				newIsDerived));
 	}
 
 	/**
@@ -482,10 +483,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.ASSOCIATION__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.ASSOCIATION__TEMPLATE_BINDING :
@@ -494,8 +495,9 @@
 			case UMLPackage.ASSOCIATION__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.ASSOCIATION__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.ASSOCIATION__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -531,55 +533,55 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ASSOCIATION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ASSOCIATION__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.ASSOCIATION__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.ASSOCIATION__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.ASSOCIATION__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.ASSOCIATION__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION__MEMBER_END :
-				return ((InternalEList<?>) getMemberEnds()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getMemberEnds())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ASSOCIATION__OWNED_END :
-				return ((InternalEList<?>) getOwnedEnds()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedEnds()).basicRemove(otherEnd,
+					msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -711,13 +713,13 @@
 		switch (featureID) {
 			case UMLPackage.ASSOCIATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__NAME :
 				setName((String) newValue);
@@ -730,18 +732,18 @@
 				return;
 			case UMLPackage.ASSOCIATION__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -757,31 +759,31 @@
 				return;
 			case UMLPackage.ASSOCIATION__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -791,8 +793,8 @@
 				return;
 			case UMLPackage.ASSOCIATION__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__USE_CASE :
 				getUseCases().clear();
@@ -800,24 +802,24 @@
 				return;
 			case UMLPackage.ASSOCIATION__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__IS_DERIVED :
 				setIsDerived((Boolean) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__MEMBER_END :
 				getMemberEnds().clear();
-				getMemberEnds().addAll(
-					(Collection<? extends Property>) newValue);
+				getMemberEnds()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.ASSOCIATION__OWNED_END :
 				getOwnedEnds().clear();
@@ -826,8 +828,8 @@
 				return;
 			case UMLPackage.ASSOCIATION__NAVIGABLE_OWNED_END :
 				getNavigableOwnedEnds().clear();
-				getNavigableOwnedEnds().addAll(
-					(Collection<? extends Property>) newValue);
+				getNavigableOwnedEnds()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -1006,9 +1008,11 @@
 			case UMLPackage.ASSOCIATION__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.ASSOCIATION__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.ASSOCIATION__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.ASSOCIATION__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.ASSOCIATION__USE_CASE :
@@ -1025,7 +1029,8 @@
 			case UMLPackage.ASSOCIATION__END_TYPE :
 				return !getEndTypes().isEmpty();
 			case UMLPackage.ASSOCIATION__IS_DERIVED :
-				return ((eFlags & IS_DERIVED_EFLAG) != 0) != IS_DERIVED_EDEFAULT;
+				return ((eFlags
+					& IS_DERIVED_EFLAG) != 0) != IS_DERIVED_EDEFAULT;
 			case UMLPackage.ASSOCIATION__MEMBER_END :
 				return memberEnds != null && !memberEnds.isEmpty();
 			case UMLPackage.ASSOCIATION__OWNED_END :
@@ -1043,7 +1048,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Relationship.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.ASSOCIATION__RELATED_ELEMENT :
@@ -1061,7 +1067,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Relationship.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.RELATIONSHIP__RELATED_ELEMENT :
@@ -1130,7 +1137,8 @@
 			case UMLPackage.ASSOCIATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ASSOCIATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ASSOCIATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ASSOCIATION___GET_STEREOTYPE_APPLICATIONS :
@@ -1138,7 +1146,8 @@
 			case UMLPackage.ASSOCIATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ASSOCIATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ASSOCIATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1227,13 +1236,13 @@
 			case UMLPackage.ASSOCIATION___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.ASSOCIATION___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.ASSOCIATION___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.ASSOCIATION___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.ASSOCIATION___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.ASSOCIATION___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1253,10 +1262,11 @@
 			case UMLPackage.ASSOCIATION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ASSOCIATION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ASSOCIATION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.ASSOCIATION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.ASSOCIATION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1399,7 +1409,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] RELATED_ELEMENT_ESUBSETS = new int[]{UMLPackage.ASSOCIATION__END_TYPE};
+	protected static final int[] RELATED_ELEMENT_ESUBSETS = new int[]{
+		UMLPackage.ASSOCIATION__END_TYPE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1490,7 +1501,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] MEMBER_END_ESUBSETS = new int[]{UMLPackage.ASSOCIATION__OWNED_END};
+	protected static final int[] MEMBER_END_ESUBSETS = new int[]{
+		UMLPackage.ASSOCIATION__OWNED_END};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1530,7 +1542,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_END_ESUBSETS = new int[]{UMLPackage.ASSOCIATION__NAVIGABLE_OWNED_END};
+	protected static final int[] OWNED_END_ESUBSETS = new int[]{
+		UMLPackage.ASSOCIATION__NAVIGABLE_OWNED_END};
 
 	/**
 	 * The array of superset feature identifiers for the '{@link #getOwnedEnds() <em>Owned End</em>}' containment reference list.
@@ -1540,7 +1553,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_END_ESUPERSETS = new int[]{UMLPackage.ASSOCIATION__MEMBER_END};
+	protected static final int[] OWNED_END_ESUPERSETS = new int[]{
+		UMLPackage.ASSOCIATION__MEMBER_END};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1606,7 +1620,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] NAVIGABLE_OWNED_END_ESUPERSETS = new int[]{UMLPackage.ASSOCIATION__OWNED_END};
+	protected static final int[] NAVIGABLE_OWNED_END_ESUPERSETS = new int[]{
+		UMLPackage.ASSOCIATION__OWNED_END};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1630,7 +1645,8 @@
 	 * @generated
 	 */
 	public Property createNavigableOwnedEnd(String name, Type type) {
-		return createNavigableOwnedEnd(name, type, UMLPackage.Literals.PROPERTY);
+		return createNavigableOwnedEnd(name, type,
+			UMLPackage.Literals.PROPERTY);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorExecutionSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorExecutionSpecificationImpl.java
index 367262e..1433c9c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorExecutionSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorExecutionSpecificationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -194,13 +194,13 @@
 		switch (featureID) {
 			case UMLPackage.BEHAVIOR_EXECUTION_SPECIFICATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR_EXECUTION_SPECIFICATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR_EXECUTION_SPECIFICATION__NAME :
 				setName((String) newValue);
@@ -223,8 +223,8 @@
 				return;
 			case UMLPackage.BEHAVIOR_EXECUTION_SPECIFICATION__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR_EXECUTION_SPECIFICATION__FINISH :
 				setFinish((OccurrenceSpecification) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorImpl.java
index 8a82d34..97b888d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -255,20 +255,15 @@
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
 			EList<Classifier> redefinitionContexts = (EList<Classifier>) cache
-				.get(
-					eResource,
-					this,
+				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 			if (redefinitionContexts == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-						redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class, this,
-							UMLPackage.BEHAVIOR__REDEFINITION_CONTEXT,
-							REDEFINITION_CONTEXT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+					redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.BEHAVIOR__REDEFINITION_CONTEXT,
+						REDEFINITION_CONTEXT_ESUBSETS));
 			}
 			return redefinitionContexts;
 		}
@@ -366,7 +361,8 @@
 	 * @generated
 	 */
 	public Parameter createOwnedParameter(String name, Type type) {
-		Parameter newOwnedParameter = (Parameter) create(UMLPackage.Literals.PARAMETER);
+		Parameter newOwnedParameter = (Parameter) create(
+			UMLPackage.Literals.PARAMETER);
 		getOwnedParameters().add(newOwnedParameter);
 		if (name != null)
 			newOwnedParameter.setName(name);
@@ -502,7 +498,8 @@
 	 * @generated
 	 */
 	public ParameterSet createOwnedParameterSet(String name) {
-		ParameterSet newOwnedParameterSet = (ParameterSet) create(UMLPackage.Literals.PARAMETER_SET);
+		ParameterSet newOwnedParameterSet = (ParameterSet) create(
+			UMLPackage.Literals.PARAMETER_SET);
 		getOwnedParameterSets().add(newOwnedParameterSet);
 		if (name != null)
 			newOwnedParameterSet.setName(name);
@@ -654,8 +651,7 @@
 			EList<Parameter> result = (EList<Parameter>) cache.get(this,
 				UMLPackage.Literals.BEHAVIOR___INPUT_PARAMETERS);
 			if (result == null) {
-				cache.put(this,
-					UMLPackage.Literals.BEHAVIOR___INPUT_PARAMETERS,
+				cache.put(this, UMLPackage.Literals.BEHAVIOR___INPUT_PARAMETERS,
 					result = BehaviorOperations.inputParameters(this));
 			}
 			return result;
@@ -713,10 +709,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.BEHAVIOR__TEMPLATE_BINDING :
@@ -725,8 +721,9 @@
 			case UMLPackage.BEHAVIOR__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.BEHAVIOR__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.BEHAVIOR__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -753,7 +750,8 @@
 					msgs = ((InternalEObject) specification).eInverseRemove(
 						this, UMLPackage.BEHAVIORAL_FEATURE__METHOD,
 						BehavioralFeature.class, msgs);
-				return basicSetSpecification((BehavioralFeature) otherEnd, msgs);
+				return basicSetSpecification((BehavioralFeature) otherEnd,
+					msgs);
 		}
 		return eDynamicInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -768,75 +766,75 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.BEHAVIOR__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.BEHAVIOR__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.BEHAVIOR__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.BEHAVIOR__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.BEHAVIOR__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.BEHAVIOR__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__OWNED_CONNECTOR :
-				return ((InternalEList<?>) getOwnedConnectors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedConnectors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__INTERFACE_REALIZATION :
 				return ((InternalEList<?>) getInterfaceRealizations())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__OWNED_BEHAVIOR :
-				return ((InternalEList<?>) getOwnedBehaviors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedBehaviors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__NESTED_CLASSIFIER :
-				return ((InternalEList<?>) getNestedClassifiers()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedClassifiers())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__OWNED_RECEPTION :
-				return ((InternalEList<?>) getOwnedReceptions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedReceptions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__SPECIFICATION :
 				return basicSetSpecification(null, msgs);
 			case UMLPackage.BEHAVIOR__OWNED_PARAMETER :
-				return ((InternalEList<?>) getOwnedParameters()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedParameters())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIOR__OWNED_PARAMETER_SET :
 				return ((InternalEList<?>) getOwnedParameterSets())
 					.basicRemove(otherEnd, msgs);
@@ -1009,13 +1007,13 @@
 		switch (featureID) {
 			case UMLPackage.BEHAVIOR__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__NAME :
 				setName((String) newValue);
@@ -1028,18 +1026,18 @@
 				return;
 			case UMLPackage.BEHAVIOR__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -1055,31 +1053,31 @@
 				return;
 			case UMLPackage.BEHAVIOR__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -1089,8 +1087,8 @@
 				return;
 			case UMLPackage.BEHAVIOR__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__USE_CASE :
 				getUseCases().clear();
@@ -1098,26 +1096,26 @@
 				return;
 			case UMLPackage.BEHAVIOR__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -1129,32 +1127,31 @@
 				return;
 			case UMLPackage.BEHAVIOR__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__IS_ACTIVE :
 				setIsActive((Boolean) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__NESTED_CLASSIFIER :
 				getNestedClassifiers().clear();
-				getNestedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getNestedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__OWNED_RECEPTION :
 				getOwnedReceptions().clear();
-				getOwnedReceptions().addAll(
-					(Collection<? extends Reception>) newValue);
+				getOwnedReceptions()
+					.addAll((Collection<? extends Reception>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__SUPER_CLASS :
 				getSuperClasses().clear();
-				getSuperClasses()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
+				getSuperClasses().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__SPECIFICATION :
 				setSpecification((BehavioralFeature) newValue);
@@ -1164,28 +1161,28 @@
 				return;
 			case UMLPackage.BEHAVIOR__OWNED_PARAMETER :
 				getOwnedParameters().clear();
-				getOwnedParameters().addAll(
-					(Collection<? extends Parameter>) newValue);
+				getOwnedParameters()
+					.addAll((Collection<? extends Parameter>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__OWNED_PARAMETER_SET :
 				getOwnedParameterSets().clear();
-				getOwnedParameterSets().addAll(
-					(Collection<? extends ParameterSet>) newValue);
+				getOwnedParameterSets()
+					.addAll((Collection<? extends ParameterSet>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__POSTCONDITION :
 				getPostconditions().clear();
-				getPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__PRECONDITION :
 				getPreconditions().clear();
-				getPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.BEHAVIOR__REDEFINED_BEHAVIOR :
 				getRedefinedBehaviors().clear();
-				getRedefinedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getRedefinedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -1405,7 +1402,8 @@
 			case UMLPackage.BEHAVIOR__IS_ABSTRACT :
 				return isSetIsAbstract();
 			case UMLPackage.BEHAVIOR__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.BEHAVIOR__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.BEHAVIOR__USE_CASE :
@@ -1526,7 +1524,8 @@
 			case UMLPackage.BEHAVIOR___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.BEHAVIOR___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.BEHAVIOR___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.BEHAVIOR___GET_STEREOTYPE_APPLICATIONS :
@@ -1534,7 +1533,8 @@
 			case UMLPackage.BEHAVIOR___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.BEHAVIOR___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.BEHAVIOR___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1623,13 +1623,13 @@
 			case UMLPackage.BEHAVIOR___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.BEHAVIOR___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.BEHAVIOR___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.BEHAVIOR___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.BEHAVIOR___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.BEHAVIOR___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1649,10 +1649,11 @@
 			case UMLPackage.BEHAVIOR___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.BEHAVIOR___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.BEHAVIOR___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.BEHAVIOR___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.BEHAVIOR___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1753,8 +1754,7 @@
 			case UMLPackage.BEHAVIOR___GET_OWNED_PORTS :
 				return getOwnedPorts();
 			case UMLPackage.BEHAVIOR___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.BEHAVIOR___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
@@ -1837,7 +1837,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINITION_CONTEXT_ESUBSETS = new int[]{UMLPackage.BEHAVIOR__CONTEXT};
+	protected static final int[] REDEFINITION_CONTEXT_ESUBSETS = new int[]{
+		UMLPackage.BEHAVIOR__CONTEXT};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getOwnedMembers() <em>Owned Member</em>}' reference list.
@@ -1909,7 +1910,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_CLASSIFIER_ESUBSETS = new int[]{UMLPackage.BEHAVIOR__REDEFINED_BEHAVIOR};
+	protected static final int[] REDEFINED_CLASSIFIER_ESUBSETS = new int[]{
+		UMLPackage.BEHAVIOR__REDEFINED_BEHAVIOR};
 
 	/**
 	 * The array of superset feature identifiers for the '{@link #getPostconditions() <em>Postcondition</em>}' reference list.
@@ -1919,7 +1921,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] POSTCONDITION_ESUPERSETS = new int[]{UMLPackage.BEHAVIOR__OWNED_RULE};
+	protected static final int[] POSTCONDITION_ESUPERSETS = new int[]{
+		UMLPackage.BEHAVIOR__OWNED_RULE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1981,7 +1984,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] PRECONDITION_ESUPERSETS = new int[]{UMLPackage.BEHAVIOR__OWNED_RULE};
+	protected static final int[] PRECONDITION_ESUPERSETS = new int[]{
+		UMLPackage.BEHAVIOR__OWNED_RULE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2043,7 +2047,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_BEHAVIOR_ESUPERSETS = new int[]{UMLPackage.BEHAVIOR__REDEFINED_CLASSIFIER};
+	protected static final int[] REDEFINED_BEHAVIOR_ESUPERSETS = new int[]{
+		UMLPackage.BEHAVIOR__REDEFINED_CLASSIFIER};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioralFeatureImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioralFeatureImpl.java
index f6ffa54..9720053 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioralFeatureImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioralFeatureImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -275,15 +275,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT);
 			if (redefinedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
-						redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
-							RedefinableElement.class, this,
-							UMLPackage.BEHAVIORAL_FEATURE__REDEFINED_ELEMENT,
-							null));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
+					redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
+						RedefinableElement.class, this,
+						UMLPackage.BEHAVIORAL_FEATURE__REDEFINED_ELEMENT,
+						null));
 			}
 			return redefinedElements;
 		}
@@ -331,21 +328,15 @@
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
 			EList<Classifier> redefinitionContexts = (EList<Classifier>) cache
-				.get(
-					eResource,
-					this,
+				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 			if (redefinitionContexts == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-						redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class,
-							this,
-							UMLPackage.BEHAVIORAL_FEATURE__REDEFINITION_CONTEXT,
-							null));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+					redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.BEHAVIORAL_FEATURE__REDEFINITION_CONTEXT,
+						null));
 			}
 			return redefinitionContexts;
 		}
@@ -357,7 +348,8 @@
 	 * The array of subset feature identifiers for the '{@link #getRedefinitionContexts() <em>Redefinition Context</em>}' reference list.
 	 * @see #getRedefinitionContexts()
 	 */
-	protected static final int[] REDEFINITION_CONTEXT_ESUBSETS = new int[]{UMLPackage.BEHAVIORAL_FEATURE__NAMESPACE};
+	protected static final int[] REDEFINITION_CONTEXT_ESUBSETS = new int[]{
+		UMLPackage.BEHAVIORAL_FEATURE__NAMESPACE};
 
 	public EList<Classifier> getRedefinitionContexts() {
 		CacheAdapter cache = getCacheAdapter();
@@ -365,21 +357,15 @@
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
 			EList<Classifier> redefinitionContext = (EList<Classifier>) cache
-				.get(
-					eResource,
-					this,
+				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 			if (redefinitionContext == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-						redefinitionContext = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class,
-							this,
-							UMLPackage.BEHAVIORAL_FEATURE__REDEFINITION_CONTEXT,
-							REDEFINITION_CONTEXT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+					redefinitionContext = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.BEHAVIORAL_FEATURE__REDEFINITION_CONTEXT,
+						REDEFINITION_CONTEXT_ESUBSETS));
 			}
 			return redefinitionContext;
 		}
@@ -455,16 +441,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
 			if (featuringClassifiers == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER,
-						featuringClassifiers = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class,
-							this,
-							UMLPackage.BEHAVIORAL_FEATURE__FEATURING_CLASSIFIER,
-							null));
+				cache.put(eResource, this,
+					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER,
+					featuringClassifiers = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.BEHAVIORAL_FEATURE__FEATURING_CLASSIFIER,
+						null));
 			}
 			return featuringClassifiers;
 		}
@@ -476,7 +458,8 @@
 	 * The array of subset feature identifiers for the '{@link #getFeaturingClassifiers() <em>Featuring Classifier</em>}' reference list.
 	 * @see #getFeaturingClassifiers()
 	 */
-	protected static final int[] FEATURING_CLASSIFIER_ESUBSETS = new int[]{UMLPackage.BEHAVIORAL_FEATURE__NAMESPACE};
+	protected static final int[] FEATURING_CLASSIFIER_ESUBSETS = new int[]{
+		UMLPackage.BEHAVIORAL_FEATURE__NAMESPACE};
 
 	public EList<Classifier> getFeaturingClassifiers() {
 		CacheAdapter cache = getCacheAdapter();
@@ -487,16 +470,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
 			if (featuringClassifiers == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER,
-						featuringClassifiers = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class,
-							this,
-							UMLPackage.BEHAVIORAL_FEATURE__FEATURING_CLASSIFIER,
-							FEATURING_CLASSIFIER_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER,
+					featuringClassifiers = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.BEHAVIORAL_FEATURE__FEATURING_CLASSIFIER,
+						FEATURING_CLASSIFIER_ESUBSETS));
 			}
 			return featuringClassifiers;
 		}
@@ -620,7 +599,8 @@
 	 * @generated
 	 */
 	public Parameter createOwnedParameter(String name, Type type) {
-		Parameter newOwnedParameter = (Parameter) create(UMLPackage.Literals.PARAMETER);
+		Parameter newOwnedParameter = (Parameter) create(
+			UMLPackage.Literals.PARAMETER);
 		getOwnedParameters().add(newOwnedParameter);
 		if (name != null)
 			newOwnedParameter.setName(name);
@@ -732,7 +712,8 @@
 	 * @generated
 	 */
 	public CallConcurrencyKind getConcurrency() {
-		return CONCURRENCY_EFLAG_VALUES[(eFlags & CONCURRENCY_EFLAG) >>> CONCURRENCY_EFLAG_OFFSET];
+		return CONCURRENCY_EFLAG_VALUES[(eFlags
+			& CONCURRENCY_EFLAG) >>> CONCURRENCY_EFLAG_OFFSET];
 	}
 
 	/**
@@ -741,7 +722,8 @@
 	 * @generated
 	 */
 	public void setConcurrency(CallConcurrencyKind newConcurrency) {
-		CallConcurrencyKind oldConcurrency = CONCURRENCY_EFLAG_VALUES[(eFlags & CONCURRENCY_EFLAG) >>> CONCURRENCY_EFLAG_OFFSET];
+		CallConcurrencyKind oldConcurrency = CONCURRENCY_EFLAG_VALUES[(eFlags
+			& CONCURRENCY_EFLAG) >>> CONCURRENCY_EFLAG_OFFSET];
 		if (newConcurrency == null)
 			newConcurrency = CONCURRENCY_EDEFAULT;
 		eFlags = eFlags & ~CONCURRENCY_EFLAG
@@ -759,8 +741,8 @@
 	 */
 	public EList<Type> getRaisedExceptions() {
 		if (raisedExceptions == null) {
-			raisedExceptions = new EObjectResolvingEList<Type>(Type.class,
-				this, UMLPackage.BEHAVIORAL_FEATURE__RAISED_EXCEPTION);
+			raisedExceptions = new EObjectResolvingEList<Type>(Type.class, this,
+				UMLPackage.BEHAVIORAL_FEATURE__RAISED_EXCEPTION);
 		}
 		return raisedExceptions;
 	}
@@ -813,7 +795,8 @@
 	 * @generated
 	 */
 	public ParameterSet createOwnedParameterSet(String name) {
-		ParameterSet newOwnedParameterSet = (ParameterSet) create(UMLPackage.Literals.PARAMETER_SET);
+		ParameterSet newOwnedParameterSet = (ParameterSet) create(
+			UMLPackage.Literals.PARAMETER_SET);
 		getOwnedParameterSets().add(newOwnedParameterSet);
 		if (name != null)
 			newOwnedParameterSet.setName(name);
@@ -853,10 +836,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateRedefinitionContextValid(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return RedefinableElementOperations.validateRedefinitionContextValid(
-			this, diagnostics, context);
+	public boolean validateRedefinitionContextValid(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return RedefinableElementOperations
+			.validateRedefinitionContextValid(this, diagnostics, context);
 	}
 
 	/**
@@ -866,8 +849,8 @@
 	 */
 	public boolean validateRedefinitionConsistent(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return RedefinableElementOperations.validateRedefinitionConsistent(
-			this, diagnostics, context);
+		return RedefinableElementOperations.validateRedefinitionConsistent(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -945,12 +928,10 @@
 			EList<Parameter> result = (EList<Parameter>) cache.get(this,
 				UMLPackage.Literals.BEHAVIORAL_FEATURE___OUTPUT_PARAMETERS);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.BEHAVIORAL_FEATURE___OUTPUT_PARAMETERS,
-						result = BehavioralFeatureOperations
-							.outputParameters(this));
+				cache.put(this,
+					UMLPackage.Literals.BEHAVIORAL_FEATURE___OUTPUT_PARAMETERS,
+					result = BehavioralFeatureOperations
+						.outputParameters(this));
 			}
 			return result;
 		}
@@ -1016,28 +997,28 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.BEHAVIORAL_FEATURE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORAL_FEATURE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORAL_FEATURE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.BEHAVIORAL_FEATURE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORAL_FEATURE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORAL_FEATURE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORAL_FEATURE__METHOD :
 				return ((InternalEList<?>) getMethods()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.BEHAVIORAL_FEATURE__OWNED_PARAMETER :
-				return ((InternalEList<?>) getOwnedParameters()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedParameters())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORAL_FEATURE__OWNED_PARAMETER_SET :
 				return ((InternalEList<?>) getOwnedParameterSets())
 					.basicRemove(otherEnd, msgs);
@@ -1128,13 +1109,13 @@
 		switch (featureID) {
 			case UMLPackage.BEHAVIORAL_FEATURE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.BEHAVIORAL_FEATURE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.BEHAVIORAL_FEATURE__NAME :
 				setName((String) newValue);
@@ -1147,18 +1128,18 @@
 				return;
 			case UMLPackage.BEHAVIORAL_FEATURE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.BEHAVIORAL_FEATURE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.BEHAVIORAL_FEATURE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.BEHAVIORAL_FEATURE__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -1178,18 +1159,18 @@
 				return;
 			case UMLPackage.BEHAVIORAL_FEATURE__OWNED_PARAMETER :
 				getOwnedParameters().clear();
-				getOwnedParameters().addAll(
-					(Collection<? extends Parameter>) newValue);
+				getOwnedParameters()
+					.addAll((Collection<? extends Parameter>) newValue);
 				return;
 			case UMLPackage.BEHAVIORAL_FEATURE__OWNED_PARAMETER_SET :
 				getOwnedParameterSets().clear();
-				getOwnedParameterSets().addAll(
-					(Collection<? extends ParameterSet>) newValue);
+				getOwnedParameterSets()
+					.addAll((Collection<? extends ParameterSet>) newValue);
 				return;
 			case UMLPackage.BEHAVIORAL_FEATURE__RAISED_EXCEPTION :
 				getRaisedExceptions().clear();
-				getRaisedExceptions().addAll(
-					(Collection<? extends Type>) newValue);
+				getRaisedExceptions()
+					.addAll((Collection<? extends Type>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -1308,9 +1289,11 @@
 			case UMLPackage.BEHAVIORAL_FEATURE__IS_STATIC :
 				return ((eFlags & IS_STATIC_EFLAG) != 0) != IS_STATIC_EDEFAULT;
 			case UMLPackage.BEHAVIORAL_FEATURE__CONCURRENCY :
-				return (eFlags & CONCURRENCY_EFLAG) != CONCURRENCY_EFLAG_DEFAULT;
+				return (eFlags
+					& CONCURRENCY_EFLAG) != CONCURRENCY_EFLAG_DEFAULT;
 			case UMLPackage.BEHAVIORAL_FEATURE__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.BEHAVIORAL_FEATURE__METHOD :
 				return methods != null && !methods.isEmpty();
 			case UMLPackage.BEHAVIORAL_FEATURE__OWNED_PARAMETER :
@@ -1330,7 +1313,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == RedefinableElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.BEHAVIORAL_FEATURE__IS_LEAF :
@@ -1362,7 +1346,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == RedefinableElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.REDEFINABLE_ELEMENT__IS_LEAF :
@@ -1477,7 +1462,8 @@
 			case UMLPackage.BEHAVIORAL_FEATURE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.BEHAVIORAL_FEATURE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.BEHAVIORAL_FEATURE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.BEHAVIORAL_FEATURE___GET_STEREOTYPE_APPLICATIONS :
@@ -1485,7 +1471,8 @@
 			case UMLPackage.BEHAVIORAL_FEATURE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.BEHAVIORAL_FEATURE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.BEHAVIORAL_FEATURE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1574,13 +1561,13 @@
 			case UMLPackage.BEHAVIORAL_FEATURE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.BEHAVIORAL_FEATURE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.BEHAVIORAL_FEATURE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.BEHAVIORAL_FEATURE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.BEHAVIORAL_FEATURE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.BEHAVIORAL_FEATURE___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1600,8 +1587,8 @@
 			case UMLPackage.BEHAVIORAL_FEATURE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.BEHAVIORAL_FEATURE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.BEHAVIORAL_FEATURE___VALIDATE_ABSTRACT_NO_METHOD__DIAGNOSTICCHAIN_MAP :
 				return validateAbstractNoMethod(
 					(DiagnosticChain) arguments.get(0),
@@ -1633,8 +1620,8 @@
 		result.append(", isStatic: "); //$NON-NLS-1$
 		result.append((eFlags & IS_STATIC_EFLAG) != 0);
 		result.append(", concurrency: "); //$NON-NLS-1$
-		result
-			.append(CONCURRENCY_EFLAG_VALUES[(eFlags & CONCURRENCY_EFLAG) >>> CONCURRENCY_EFLAG_OFFSET]);
+		result.append(CONCURRENCY_EFLAG_VALUES[(eFlags
+			& CONCURRENCY_EFLAG) >>> CONCURRENCY_EFLAG_OFFSET]);
 		result.append(", isAbstract: "); //$NON-NLS-1$
 		result.append((eFlags & IS_ABSTRACT_EFLAG) != 0);
 		result.append(')');
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioredClassifierImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioredClassifierImpl.java
index 059acbd..ca67221 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioredClassifierImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehavioredClassifierImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -180,8 +180,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -220,7 +220,8 @@
 	public Behavior getClassifierBehavior() {
 		if (classifierBehavior != null && classifierBehavior.eIsProxy()) {
 			InternalEObject oldClassifierBehavior = (InternalEObject) classifierBehavior;
-			classifierBehavior = (Behavior) eResolveProxy(oldClassifierBehavior);
+			classifierBehavior = (Behavior) eResolveProxy(
+				oldClassifierBehavior);
 			if (classifierBehavior != oldClassifierBehavior) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -311,17 +312,13 @@
 		CacheAdapter cache = getCacheAdapter();
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
-			EList<Interface> result = (EList<Interface>) cache
-				.get(
-					this,
-					UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES);
+			EList<Interface> result = (EList<Interface>) cache.get(this,
+				UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES,
-						result = BehavioredClassifierOperations
-							.getImplementedInterfaces(this));
+				cache.put(this,
+					UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES,
+					result = BehavioredClassifierOperations
+						.getImplementedInterfaces(this));
 			}
 			return result;
 		}
@@ -337,17 +334,13 @@
 		CacheAdapter cache = getCacheAdapter();
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
-			EList<Interface> result = (EList<Interface>) cache
-				.get(
-					this,
-					UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES);
+			EList<Interface> result = (EList<Interface>) cache.get(this,
+				UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES,
-						result = BehavioredClassifierOperations
-							.getAllImplementedInterfaces(this));
+				cache.put(this,
+					UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES,
+					result = BehavioredClassifierOperations
+						.getAllImplementedInterfaces(this));
 			}
 			return result;
 		}
@@ -383,10 +376,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__TEMPLATE_BINDING :
@@ -395,8 +388,7 @@
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							EOPPOSITE_FEATURE_BASE
 								- UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
@@ -431,55 +423,55 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.BEHAVIORED_CLASSIFIER__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__INTERFACE_REALIZATION :
 				return ((InternalEList<?>) getInterfaceRealizations())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_BEHAVIOR :
-				return ((InternalEList<?>) getOwnedBehaviors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedBehaviors())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -607,13 +599,13 @@
 		switch (featureID) {
 			case UMLPackage.BEHAVIORED_CLASSIFIER__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__NAME :
 				setName((String) newValue);
@@ -626,18 +618,18 @@
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -653,31 +645,31 @@
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -687,8 +679,8 @@
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__USE_CASE :
 				getUseCases().clear();
@@ -696,16 +688,16 @@
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -717,8 +709,8 @@
 				return;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -894,9 +886,11 @@
 			case UMLPackage.BEHAVIORED_CLASSIFIER__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.BEHAVIORED_CLASSIFIER__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.BEHAVIORED_CLASSIFIER__USE_CASE :
@@ -976,7 +970,8 @@
 			case UMLPackage.BEHAVIORED_CLASSIFIER___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.BEHAVIORED_CLASSIFIER___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.BEHAVIORED_CLASSIFIER___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.BEHAVIORED_CLASSIFIER___GET_STEREOTYPE_APPLICATIONS :
@@ -984,7 +979,8 @@
 			case UMLPackage.BEHAVIORED_CLASSIFIER___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.BEHAVIORED_CLASSIFIER___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.BEHAVIORED_CLASSIFIER___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1073,13 +1069,13 @@
 			case UMLPackage.BEHAVIORED_CLASSIFIER___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.BEHAVIORED_CLASSIFIER___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.BEHAVIORED_CLASSIFIER___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.BEHAVIORED_CLASSIFIER___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.BEHAVIORED_CLASSIFIER___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.BEHAVIORED_CLASSIFIER___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1099,10 +1095,11 @@
 			case UMLPackage.BEHAVIORED_CLASSIFIER___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.BEHAVIORED_CLASSIFIER___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.BEHAVIORED_CLASSIFIER___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.BEHAVIORED_CLASSIFIER___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.BEHAVIORED_CLASSIFIER___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1193,8 +1190,7 @@
 			case UMLPackage.BEHAVIORED_CLASSIFIER___ALL_SLOTTABLE_FEATURES :
 				return allSlottableFeatures();
 			case UMLPackage.BEHAVIORED_CLASSIFIER___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
@@ -1257,7 +1253,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_BEHAVIOR_ESUBSETS = new int[]{UMLPackage.BEHAVIORED_CLASSIFIER__CLASSIFIER_BEHAVIOR};
+	protected static final int[] OWNED_BEHAVIOR_ESUBSETS = new int[]{
+		UMLPackage.BEHAVIORED_CLASSIFIER__CLASSIFIER_BEHAVIOR};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1309,7 +1306,8 @@
 	 */
 	public InterfaceRealization createInterfaceRealization(String name,
 			Interface contract) {
-		InterfaceRealization newInterfaceRealization = (InterfaceRealization) create(UMLPackage.Literals.INTERFACE_REALIZATION);
+		InterfaceRealization newInterfaceRealization = (InterfaceRealization) create(
+			UMLPackage.Literals.INTERFACE_REALIZATION);
 		getInterfaceRealizations().add(newInterfaceRealization);
 		if (name != null)
 			newInterfaceRealization.setName(name);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BroadcastSignalActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BroadcastSignalActionImpl.java
index a352bef..b34f093 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BroadcastSignalActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BroadcastSignalActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -154,8 +154,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateTypeOrderingMultiplicity(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateTypeOrderingMultiplicity(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return BroadcastSignalActionOperations
 			.validateTypeOrderingMultiplicity(this, diagnostics, context);
 	}
@@ -272,13 +272,13 @@
 		switch (featureID) {
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__NAME :
 				setName((String) newValue);
@@ -297,50 +297,49 @@
 				return;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__ARGUMENT :
 				getArguments().clear();
@@ -489,7 +488,8 @@
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -565,7 +565,8 @@
 			case UMLPackage.BROADCAST_SIGNAL_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.BROADCAST_SIGNAL_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.BROADCAST_SIGNAL_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.BROADCAST_SIGNAL_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -573,7 +574,8 @@
 			case UMLPackage.BROADCAST_SIGNAL_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.BROADCAST_SIGNAL_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.BROADCAST_SIGNAL_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -650,8 +652,8 @@
 			case UMLPackage.BROADCAST_SIGNAL_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.BROADCAST_SIGNAL_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.BROADCAST_SIGNAL_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.BROADCAST_SIGNAL_ACTION___GET_CONTEXT :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallActionImpl.java
index f0ede12..75e58a9 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -203,7 +203,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		getResults().add(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -327,11 +328,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CALL_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CALL_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CALL_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CALL_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -340,14 +341,14 @@
 			case UMLPackage.CALL_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.CALL_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CALL_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CALL_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CALL_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -358,8 +359,8 @@
 				return ((InternalEList<?>) getLocalPreconditions())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CALL_ACTION__ARGUMENT :
-				return ((InternalEList<?>) getArguments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getArguments()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CALL_ACTION__RESULT :
 				return ((InternalEList<?>) getResults()).basicRemove(otherEnd,
 					msgs);
@@ -468,13 +469,13 @@
 		switch (featureID) {
 			case UMLPackage.CALL_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CALL_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CALL_ACTION__NAME :
 				setName((String) newValue);
@@ -493,50 +494,49 @@
 				return;
 			case UMLPackage.CALL_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.CALL_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.CALL_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CALL_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CALL_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.CALL_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.CALL_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.CALL_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.CALL_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CALL_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CALL_ACTION__ARGUMENT :
 				getArguments().clear();
@@ -692,7 +692,8 @@
 			case UMLPackage.CALL_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.CALL_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.CALL_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -706,7 +707,8 @@
 			case UMLPackage.CALL_ACTION__ON_PORT :
 				return onPort != null;
 			case UMLPackage.CALL_ACTION__IS_SYNCHRONOUS :
-				return ((eFlags & IS_SYNCHRONOUS_EFLAG) != 0) != IS_SYNCHRONOUS_EDEFAULT;
+				return ((eFlags
+					& IS_SYNCHRONOUS_EFLAG) != 0) != IS_SYNCHRONOUS_EDEFAULT;
 			case UMLPackage.CALL_ACTION__RESULT :
 				return results != null && !results.isEmpty();
 		}
@@ -770,7 +772,8 @@
 			case UMLPackage.CALL_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CALL_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CALL_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CALL_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -778,7 +781,8 @@
 			case UMLPackage.CALL_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CALL_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CALL_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -855,8 +859,8 @@
 			case UMLPackage.CALL_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.CALL_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.CALL_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.CALL_ACTION___GET_CONTEXT :
@@ -910,7 +914,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.CALL_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.CALL_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallBehaviorActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallBehaviorActionImpl.java
index b693d70..3b8903f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallBehaviorActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallBehaviorActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -166,8 +166,7 @@
 			EList<Parameter> result = (EList<Parameter>) cache.get(this,
 				UMLPackage.Literals.CALL_ACTION___OUTPUT_PARAMETERS);
 			if (result == null) {
-				cache.put(
-					this,
+				cache.put(this,
 					UMLPackage.Literals.CALL_ACTION___OUTPUT_PARAMETERS,
 					result = CallBehaviorActionOperations
 						.outputParameters(this));
@@ -190,12 +189,10 @@
 			EList<Parameter> result = (EList<Parameter>) cache.get(this,
 				UMLPackage.Literals.CALL_ACTION___INPUT_PARAMETERS);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.CALL_ACTION___INPUT_PARAMETERS,
-						result = CallBehaviorActionOperations
-							.inputParameters(this));
+				cache.put(this,
+					UMLPackage.Literals.CALL_ACTION___INPUT_PARAMETERS,
+					result = CallBehaviorActionOperations
+						.inputParameters(this));
 			}
 			return result;
 		}
@@ -307,13 +304,13 @@
 		switch (featureID) {
 			case UMLPackage.CALL_BEHAVIOR_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__NAME :
 				setName((String) newValue);
@@ -332,50 +329,49 @@
 				return;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__ARGUMENT :
 				getArguments().clear();
@@ -537,7 +533,8 @@
 			case UMLPackage.CALL_BEHAVIOR_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.CALL_BEHAVIOR_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -551,7 +548,8 @@
 			case UMLPackage.CALL_BEHAVIOR_ACTION__ON_PORT :
 				return onPort != null;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__IS_SYNCHRONOUS :
-				return ((eFlags & IS_SYNCHRONOUS_EFLAG) != 0) != IS_SYNCHRONOUS_EDEFAULT;
+				return ((eFlags
+					& IS_SYNCHRONOUS_EFLAG) != 0) != IS_SYNCHRONOUS_EDEFAULT;
 			case UMLPackage.CALL_BEHAVIOR_ACTION__RESULT :
 				return results != null && !results.isEmpty();
 			case UMLPackage.CALL_BEHAVIOR_ACTION__BEHAVIOR :
@@ -617,7 +615,8 @@
 			case UMLPackage.CALL_BEHAVIOR_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CALL_BEHAVIOR_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CALL_BEHAVIOR_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CALL_BEHAVIOR_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -625,7 +624,8 @@
 			case UMLPackage.CALL_BEHAVIOR_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CALL_BEHAVIOR_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CALL_BEHAVIOR_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -702,8 +702,8 @@
 			case UMLPackage.CALL_BEHAVIOR_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.CALL_BEHAVIOR_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.CALL_BEHAVIOR_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.CALL_BEHAVIOR_ACTION___GET_CONTEXT :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallEventImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallEventImpl.java
index 47f2ba2..4cc050c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallEventImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallEventImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -177,13 +177,13 @@
 		switch (featureID) {
 			case UMLPackage.CALL_EVENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CALL_EVENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CALL_EVENT__NAME :
 				setName((String) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallOperationActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallOperationActionImpl.java
index e5b32ea..d3bb806 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallOperationActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CallOperationActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -135,12 +135,11 @@
 			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.CALL_OPERATION_ACTION__INPUT,
-							INPUT_ESUBSETS));
+				cache.put(eResource, this, UMLPackage.Literals.ACTION__INPUT,
+					inputs = new DerivedUnionEObjectEList<InputPin>(
+						InputPin.class, this,
+						UMLPackage.CALL_OPERATION_ACTION__INPUT,
+						INPUT_ESUBSETS));
 			}
 			return inputs;
 		}
@@ -201,12 +200,16 @@
 			target = (InputPin) eResolveProxy(oldTarget);
 			if (target != oldTarget) {
 				InternalEObject newTarget = (InternalEObject) target;
-				NotificationChain msgs = oldTarget.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CALL_OPERATION_ACTION__TARGET, null, null);
+				NotificationChain msgs = oldTarget
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.CALL_OPERATION_ACTION__TARGET,
+						null, null);
 				if (newTarget.eInternalContainer() == null) {
-					msgs = newTarget.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CALL_OPERATION_ACTION__TARGET, null, msgs);
+					msgs = newTarget.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.CALL_OPERATION_ACTION__TARGET,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -258,19 +261,24 @@
 		if (newTarget != target) {
 			NotificationChain msgs = null;
 			if (target != null)
-				msgs = ((InternalEObject) target).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CALL_OPERATION_ACTION__TARGET, null, msgs);
+				msgs = ((InternalEObject) target)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.CALL_OPERATION_ACTION__TARGET,
+						null, msgs);
 			if (newTarget != null)
-				msgs = ((InternalEObject) newTarget).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CALL_OPERATION_ACTION__TARGET, null, msgs);
+				msgs = ((InternalEObject) newTarget)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.CALL_OPERATION_ACTION__TARGET,
+						null, msgs);
 			msgs = basicSetTarget(newTarget, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.CALL_OPERATION_ACTION__TARGET, newTarget, newTarget));
+				UMLPackage.CALL_OPERATION_ACTION__TARGET, newTarget,
+				newTarget));
 	}
 
 	/**
@@ -321,8 +329,7 @@
 			EList<Parameter> result = (EList<Parameter>) cache.get(this,
 				UMLPackage.Literals.CALL_ACTION___OUTPUT_PARAMETERS);
 			if (result == null) {
-				cache.put(
-					this,
+				cache.put(this,
 					UMLPackage.Literals.CALL_ACTION___OUTPUT_PARAMETERS,
 					result = CallOperationActionOperations
 						.outputParameters(this));
@@ -345,8 +352,7 @@
 			EList<Parameter> result = (EList<Parameter>) cache.get(this,
 				UMLPackage.Literals.CALL_ACTION___INPUT_PARAMETERS);
 			if (result == null) {
-				cache.put(
-					this,
+				cache.put(this,
 					UMLPackage.Literals.CALL_ACTION___INPUT_PARAMETERS,
 					result = CallOperationActionOperations
 						.inputParameters(this));
@@ -366,11 +372,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CALL_OPERATION_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CALL_OPERATION_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CALL_OPERATION_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CALL_OPERATION_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -379,14 +385,14 @@
 			case UMLPackage.CALL_OPERATION_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.CALL_OPERATION_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CALL_OPERATION_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CALL_OPERATION_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CALL_OPERATION_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -397,8 +403,8 @@
 				return ((InternalEList<?>) getLocalPreconditions())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CALL_OPERATION_ACTION__ARGUMENT :
-				return ((InternalEList<?>) getArguments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getArguments()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CALL_OPERATION_ACTION__RESULT :
 				return ((InternalEList<?>) getResults()).basicRemove(otherEnd,
 					msgs);
@@ -517,13 +523,13 @@
 		switch (featureID) {
 			case UMLPackage.CALL_OPERATION_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CALL_OPERATION_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CALL_OPERATION_ACTION__NAME :
 				setName((String) newValue);
@@ -542,50 +548,49 @@
 				return;
 			case UMLPackage.CALL_OPERATION_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.CALL_OPERATION_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.CALL_OPERATION_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CALL_OPERATION_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CALL_OPERATION_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.CALL_OPERATION_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.CALL_OPERATION_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.CALL_OPERATION_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.CALL_OPERATION_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CALL_OPERATION_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CALL_OPERATION_ACTION__ARGUMENT :
 				getArguments().clear();
@@ -753,7 +758,8 @@
 			case UMLPackage.CALL_OPERATION_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.CALL_OPERATION_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.CALL_OPERATION_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -767,7 +773,8 @@
 			case UMLPackage.CALL_OPERATION_ACTION__ON_PORT :
 				return onPort != null;
 			case UMLPackage.CALL_OPERATION_ACTION__IS_SYNCHRONOUS :
-				return ((eFlags & IS_SYNCHRONOUS_EFLAG) != 0) != IS_SYNCHRONOUS_EDEFAULT;
+				return ((eFlags
+					& IS_SYNCHRONOUS_EFLAG) != 0) != IS_SYNCHRONOUS_EDEFAULT;
 			case UMLPackage.CALL_OPERATION_ACTION__RESULT :
 				return results != null && !results.isEmpty();
 			case UMLPackage.CALL_OPERATION_ACTION__OPERATION :
@@ -835,7 +842,8 @@
 			case UMLPackage.CALL_OPERATION_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CALL_OPERATION_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CALL_OPERATION_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CALL_OPERATION_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -843,7 +851,8 @@
 			case UMLPackage.CALL_OPERATION_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CALL_OPERATION_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CALL_OPERATION_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -920,8 +929,8 @@
 			case UMLPackage.CALL_OPERATION_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.CALL_OPERATION_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.CALL_OPERATION_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.CALL_OPERATION_ACTION___GET_CONTEXT :
@@ -947,8 +956,7 @@
 			case UMLPackage.CALL_OPERATION_ACTION___OUTPUT_PARAMETERS :
 				return outputParameters();
 			case UMLPackage.CALL_OPERATION_ACTION___VALIDATE_TYPE_TARGET_PIN__DIAGNOSTICCHAIN_MAP :
-				return validateTypeTargetPin(
-					(DiagnosticChain) arguments.get(0),
+				return validateTypeTargetPin((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 		}
 		return eDynamicInvoke(operationID, arguments);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ChangeEventImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ChangeEventImpl.java
index 99c59da..7dec320 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ChangeEventImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ChangeEventImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -99,8 +99,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -123,18 +123,20 @@
 	public ValueSpecification getChangeExpression() {
 		if (changeExpression != null && changeExpression.eIsProxy()) {
 			InternalEObject oldChangeExpression = (InternalEObject) changeExpression;
-			changeExpression = (ValueSpecification) eResolveProxy(oldChangeExpression);
+			changeExpression = (ValueSpecification) eResolveProxy(
+				oldChangeExpression);
 			if (changeExpression != oldChangeExpression) {
 				InternalEObject newChangeExpression = (InternalEObject) changeExpression;
 				NotificationChain msgs = oldChangeExpression.eInverseRemove(
-					this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CHANGE_EVENT__CHANGE_EXPRESSION, null,
-					null);
+					this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.CHANGE_EVENT__CHANGE_EXPRESSION,
+					null, null);
 				if (newChangeExpression.eInternalContainer() == null) {
 					msgs = newChangeExpression.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.CHANGE_EVENT__CHANGE_EXPRESSION, null,
-						msgs);
+							- UMLPackage.CHANGE_EVENT__CHANGE_EXPRESSION,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -186,22 +188,22 @@
 		if (newChangeExpression != changeExpression) {
 			NotificationChain msgs = null;
 			if (changeExpression != null)
-				msgs = ((InternalEObject) changeExpression).eInverseRemove(
-					this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CHANGE_EVENT__CHANGE_EXPRESSION, null,
-					msgs);
+				msgs = ((InternalEObject) changeExpression).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.CHANGE_EVENT__CHANGE_EXPRESSION,
+					null, msgs);
 			if (newChangeExpression != null)
-				msgs = ((InternalEObject) newChangeExpression).eInverseAdd(
-					this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CHANGE_EVENT__CHANGE_EXPRESSION, null,
-					msgs);
+				msgs = ((InternalEObject) newChangeExpression).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.CHANGE_EVENT__CHANGE_EXPRESSION,
+					null, msgs);
 			msgs = basicSetChangeExpression(newChangeExpression, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.CHANGE_EVENT__CHANGE_EXPRESSION,
-				newChangeExpression, newChangeExpression));
+				UMLPackage.CHANGE_EVENT__CHANGE_EXPRESSION, newChangeExpression,
+				newChangeExpression));
 	}
 
 	/**
@@ -211,7 +213,8 @@
 	 */
 	public ValueSpecification createChangeExpression(String name, Type type,
 			EClass eClass) {
-		ValueSpecification newChangeExpression = (ValueSpecification) create(eClass);
+		ValueSpecification newChangeExpression = (ValueSpecification) create(
+			eClass);
 		setChangeExpression(newChangeExpression);
 		if (name != null)
 			newChangeExpression.setName(name);
@@ -230,11 +233,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CHANGE_EVENT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CHANGE_EVENT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CHANGE_EVENT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CHANGE_EVENT__OWNING_TEMPLATE_PARAMETER :
@@ -308,13 +311,13 @@
 		switch (featureID) {
 			case UMLPackage.CHANGE_EVENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CHANGE_EVENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CHANGE_EVENT__NAME :
 				setName((String) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassImpl.java
index edb04e4..e455708 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -253,8 +253,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -290,7 +290,8 @@
 	public Behavior getClassifierBehavior() {
 		if (classifierBehavior != null && classifierBehavior.eIsProxy()) {
 			InternalEObject oldClassifierBehavior = (InternalEObject) classifierBehavior;
-			classifierBehavior = (Behavior) eResolveProxy(oldClassifierBehavior);
+			classifierBehavior = (Behavior) eResolveProxy(
+				oldClassifierBehavior);
 			if (classifierBehavior != oldClassifierBehavior) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -433,8 +434,10 @@
 	 * @generated
 	 */
 	public Operation createOwnedOperation(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
-		Operation newOwnedOperation = (Operation) create(UMLPackage.Literals.OPERATION);
+			EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
+		Operation newOwnedOperation = (Operation) create(
+			UMLPackage.Literals.OPERATION);
 		getOwnedOperations().add(newOwnedOperation);
 		if (name != null)
 			newOwnedOperation.setName(name);
@@ -452,9 +455,10 @@
 		for (int i = 0; i < ownedParameterListSize; i++) {
 			newOwnedOperation.createOwnedParameter(i < ownedParameterNamesSize
 				? (String) ownedParameterNames.get(i)
-				: null, i < ownedParameterTypesSize
-				? (Type) ownedParameterTypes.get(i)
-				: null);
+				: null,
+				i < ownedParameterTypesSize
+					? (Type) ownedParameterTypes.get(i)
+					: null);
 		}
 		return newOwnedOperation;
 	}
@@ -465,9 +469,10 @@
 	 * @generated
 	 */
 	public Operation getOwnedOperation(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
-		return getOwnedOperation(name, ownedParameterNames,
-			ownedParameterTypes, false, false);
+			EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
+		return getOwnedOperation(name, ownedParameterNames, ownedParameterTypes,
+			false, false);
 	}
 
 	/**
@@ -488,20 +493,19 @@
 			int ownedParameterListSize = ownedParameterList.size();
 			if (ownedParameterNames != null
 				&& ownedParameterNames.size() != ownedParameterListSize
-				|| (ownedParameterTypes != null && ownedParameterTypes.size() != ownedParameterListSize))
+				|| (ownedParameterTypes != null
+					&& ownedParameterTypes.size() != ownedParameterListSize))
 				continue ownedOperationLoop;
 			for (int j = 0; j < ownedParameterListSize; j++) {
 				Parameter ownedParameter = ownedParameterList.get(j);
-				if (ownedParameterNames != null
-					&& !(ignoreCase
-						? (ownedParameterNames.get(j))
-							.equalsIgnoreCase(ownedParameter.getName())
-						: ownedParameterNames.get(j).equals(
-							ownedParameter.getName())))
+				if (ownedParameterNames != null && !(ignoreCase
+					? (ownedParameterNames.get(j))
+						.equalsIgnoreCase(ownedParameter.getName())
+					: ownedParameterNames.get(j)
+						.equals(ownedParameter.getName())))
 					continue ownedOperationLoop;
-				if (ownedParameterTypes != null
-					&& !ownedParameterTypes.get(j).equals(
-						ownedParameter.getType()))
+				if (ownedParameterTypes != null && !ownedParameterTypes.get(j)
+					.equals(ownedParameter.getType()))
 					continue ownedOperationLoop;
 			}
 			return ownedOperation;
@@ -602,8 +606,8 @@
 		protected Generalization validate(int index, Object object) {
 			Generalization generalization = UMLFactory.eINSTANCE
 				.createGeneralization();
-			generalization.setGeneral((Classifier) super
-				.validate(index, object));
+			generalization
+				.setGeneral((Classifier) super.validate(index, object));
 			return generalization;
 		}
 
@@ -613,7 +617,8 @@
 	 * The array of superset feature identifiers for the '{@link #getSuperClasses() <em>Super Class</em>}' reference list.
 	 * @see #getSuperClasses()
 	 */
-	protected static final int[] SUPER_CLASS_ESUPERSETS = new int[]{UMLPackage.CLASS__GENERALIZATION};
+	protected static final int[] SUPER_CLASS_ESUPERSETS = new int[]{
+		UMLPackage.CLASS__GENERALIZATION};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -628,15 +633,12 @@
 			EList<org.eclipse.uml2.uml.Class> superClasses = (EList<org.eclipse.uml2.uml.Class>) cache
 				.get(eResource, this, UMLPackage.Literals.CLASS__SUPER_CLASS);
 			if (superClasses == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.CLASS__SUPER_CLASS,
-						superClasses = (EList<org.eclipse.uml2.uml.Class>) ((EList<?>) new SuperClassEList(
-							org.eclipse.uml2.uml.Class.class, this,
-							UMLPackage.CLASS__SUPER_CLASS,
-							SUPER_CLASS_ESUPERSETS)));
+				cache.put(eResource, this,
+					UMLPackage.Literals.CLASS__SUPER_CLASS,
+					superClasses = (EList<org.eclipse.uml2.uml.Class>) ((EList<?>) new SuperClassEList(
+						org.eclipse.uml2.uml.Class.class, this,
+						UMLPackage.CLASS__SUPER_CLASS,
+						SUPER_CLASS_ESUPERSETS)));
 			}
 			return superClasses;
 		}
@@ -726,8 +728,10 @@
 	 * @generated
 	 */
 	public Reception createOwnedReception(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
-		Reception newOwnedReception = (Reception) create(UMLPackage.Literals.RECEPTION);
+			EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
+		Reception newOwnedReception = (Reception) create(
+			UMLPackage.Literals.RECEPTION);
 		getOwnedReceptions().add(newOwnedReception);
 		if (name != null)
 			newOwnedReception.setName(name);
@@ -745,9 +749,10 @@
 		for (int i = 0; i < ownedParameterListSize; i++) {
 			newOwnedReception.createOwnedParameter(i < ownedParameterNamesSize
 				? (String) ownedParameterNames.get(i)
-				: null, i < ownedParameterTypesSize
-				? (Type) ownedParameterTypes.get(i)
-				: null);
+				: null,
+				i < ownedParameterTypesSize
+					? (Type) ownedParameterTypes.get(i)
+					: null);
 		}
 		return newOwnedReception;
 	}
@@ -758,9 +763,10 @@
 	 * @generated
 	 */
 	public Reception getOwnedReception(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
-		return getOwnedReception(name, ownedParameterNames,
-			ownedParameterTypes, false, false);
+			EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
+		return getOwnedReception(name, ownedParameterNames, ownedParameterTypes,
+			false, false);
 	}
 
 	/**
@@ -781,20 +787,19 @@
 			int ownedParameterListSize = ownedParameterList.size();
 			if (ownedParameterNames != null
 				&& ownedParameterNames.size() != ownedParameterListSize
-				|| (ownedParameterTypes != null && ownedParameterTypes.size() != ownedParameterListSize))
+				|| (ownedParameterTypes != null
+					&& ownedParameterTypes.size() != ownedParameterListSize))
 				continue ownedReceptionLoop;
 			for (int j = 0; j < ownedParameterListSize; j++) {
 				Parameter ownedParameter = ownedParameterList.get(j);
-				if (ownedParameterNames != null
-					&& !(ignoreCase
-						? (ownedParameterNames.get(j))
-							.equalsIgnoreCase(ownedParameter.getName())
-						: ownedParameterNames.get(j).equals(
-							ownedParameter.getName())))
+				if (ownedParameterNames != null && !(ignoreCase
+					? (ownedParameterNames.get(j))
+						.equalsIgnoreCase(ownedParameter.getName())
+					: ownedParameterNames.get(j)
+						.equals(ownedParameter.getName())))
 					continue ownedReceptionLoop;
-				if (ownedParameterTypes != null
-					&& !ownedParameterTypes.get(j).equals(
-						ownedParameter.getType()))
+				if (ownedParameterTypes != null && !ownedParameterTypes.get(j)
+					.equals(ownedParameter.getType()))
 					continue ownedReceptionLoop;
 			}
 			return ownedReception;
@@ -869,7 +874,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Property createOwnedAttribute(String name, Type type, EClass eClass) {
+	public Property createOwnedAttribute(String name, Type type,
+			EClass eClass) {
 		Property newOwnedAttribute = (Property) create(eClass);
 		getOwnedAttributes().add(newOwnedAttribute);
 		if (name != null)
@@ -985,17 +991,13 @@
 		CacheAdapter cache = getCacheAdapter();
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
-			EList<Interface> result = (EList<Interface>) cache
-				.get(
-					this,
-					UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES);
+			EList<Interface> result = (EList<Interface>) cache.get(this,
+				UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES,
-						result = BehavioredClassifierOperations
-							.getImplementedInterfaces(this));
+				cache.put(this,
+					UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES,
+					result = BehavioredClassifierOperations
+						.getImplementedInterfaces(this));
 			}
 			return result;
 		}
@@ -1011,17 +1013,13 @@
 		CacheAdapter cache = getCacheAdapter();
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
-			EList<Interface> result = (EList<Interface>) cache
-				.get(
-					this,
-					UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES);
+			EList<Interface> result = (EList<Interface>) cache.get(this,
+				UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES,
-						result = BehavioredClassifierOperations
-							.getAllImplementedInterfaces(this));
+				cache.put(this,
+					UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES,
+					result = BehavioredClassifierOperations
+						.getAllImplementedInterfaces(this));
 			}
 			return result;
 		}
@@ -1088,10 +1086,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.CLASS__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.CLASS__TEMPLATE_BINDING :
@@ -1100,9 +1098,10 @@
 			case UMLPackage.CLASS__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.CLASS__OWNED_TEMPLATE_SIGNATURE, null,
-							msgs);
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.CLASS__OWNED_TEMPLATE_SIGNATURE,
+							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
 			case UMLPackage.CLASS__GENERALIZATION :
@@ -1137,70 +1136,70 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CLASS__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CLASS__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.CLASS__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.CLASS__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.CLASS__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.CLASS__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__OWNED_CONNECTOR :
-				return ((InternalEList<?>) getOwnedConnectors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedConnectors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__INTERFACE_REALIZATION :
 				return ((InternalEList<?>) getInterfaceRealizations())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__OWNED_BEHAVIOR :
-				return ((InternalEList<?>) getOwnedBehaviors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedBehaviors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__NESTED_CLASSIFIER :
-				return ((InternalEList<?>) getNestedClassifiers()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedClassifiers())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASS__OWNED_RECEPTION :
-				return ((InternalEList<?>) getOwnedReceptions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedReceptions())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -1350,13 +1349,13 @@
 		switch (featureID) {
 			case UMLPackage.CLASS__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CLASS__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CLASS__NAME :
 				setName((String) newValue);
@@ -1369,18 +1368,18 @@
 				return;
 			case UMLPackage.CLASS__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CLASS__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.CLASS__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.CLASS__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -1396,31 +1395,31 @@
 				return;
 			case UMLPackage.CLASS__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.CLASS__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.CLASS__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.CLASS__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.CLASS__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.CLASS__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.CLASS__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -1430,8 +1429,8 @@
 				return;
 			case UMLPackage.CLASS__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.CLASS__USE_CASE :
 				getUseCases().clear();
@@ -1439,26 +1438,26 @@
 				return;
 			case UMLPackage.CLASS__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.CLASS__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.CLASS__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.CLASS__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.CLASS__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.CLASS__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -1470,32 +1469,31 @@
 				return;
 			case UMLPackage.CLASS__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.CLASS__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 			case UMLPackage.CLASS__IS_ACTIVE :
 				setIsActive((Boolean) newValue);
 				return;
 			case UMLPackage.CLASS__NESTED_CLASSIFIER :
 				getNestedClassifiers().clear();
-				getNestedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getNestedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.CLASS__OWNED_RECEPTION :
 				getOwnedReceptions().clear();
-				getOwnedReceptions().addAll(
-					(Collection<? extends Reception>) newValue);
+				getOwnedReceptions()
+					.addAll((Collection<? extends Reception>) newValue);
 				return;
 			case UMLPackage.CLASS__SUPER_CLASS :
 				getSuperClasses().clear();
-				getSuperClasses()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
+				getSuperClasses().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -1694,7 +1692,8 @@
 			case UMLPackage.CLASS__IS_ABSTRACT :
 				return isSetIsAbstract();
 			case UMLPackage.CLASS__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.CLASS__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.CLASS__USE_CASE :
@@ -1746,7 +1745,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == BehavioredClassifier.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.CLASS__CLASSIFIER_BEHAVIOR :
@@ -1768,7 +1768,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == BehavioredClassifier.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.BEHAVIORED_CLASSIFIER__CLASSIFIER_BEHAVIOR :
@@ -1863,7 +1864,8 @@
 			case UMLPackage.CLASS___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CLASS___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CLASS___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CLASS___GET_STEREOTYPE_APPLICATIONS :
@@ -1871,7 +1873,8 @@
 			case UMLPackage.CLASS___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CLASS___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CLASS___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1960,13 +1963,13 @@
 			case UMLPackage.CLASS___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.CLASS___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.CLASS___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.CLASS___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.CLASS___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.CLASS___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1986,10 +1989,11 @@
 			case UMLPackage.CLASS___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.CLASS___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.CLASS___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.CLASS___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.CLASS___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -2090,8 +2094,7 @@
 			case UMLPackage.CLASS___GET_OWNED_PORTS :
 				return getOwnedPorts();
 			case UMLPackage.CLASS___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.CLASS___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
@@ -2159,7 +2162,8 @@
 		UMLPackage.CLASS__OWNED_MEMBER, UMLPackage.CLASS__TEMPLATE_BINDING,
 		UMLPackage.CLASS__OWNED_TEMPLATE_SIGNATURE,
 		UMLPackage.CLASS__COLLABORATION_USE, UMLPackage.CLASS__GENERALIZATION,
-		UMLPackage.CLASS__SUBSTITUTION, UMLPackage.CLASS__INTERFACE_REALIZATION};
+		UMLPackage.CLASS__SUBSTITUTION,
+		UMLPackage.CLASS__INTERFACE_REALIZATION};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getOwnedMembers() <em>Owned Member</em>}' reference list.
@@ -2183,7 +2187,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_BEHAVIOR_ESUBSETS = new int[]{UMLPackage.CLASS__CLASSIFIER_BEHAVIOR};
+	protected static final int[] OWNED_BEHAVIOR_ESUBSETS = new int[]{
+		UMLPackage.CLASS__CLASSIFIER_BEHAVIOR};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2235,7 +2240,8 @@
 	 */
 	public InterfaceRealization createInterfaceRealization(String name,
 			Interface contract) {
-		InterfaceRealization newInterfaceRealization = (InterfaceRealization) create(UMLPackage.Literals.INTERFACE_REALIZATION);
+		InterfaceRealization newInterfaceRealization = (InterfaceRealization) create(
+			UMLPackage.Literals.INTERFACE_REALIZATION);
 		getInterfaceRealizations().add(newInterfaceRealization);
 		if (name != null)
 			newInterfaceRealization.setName(name);
@@ -2319,7 +2325,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] ATTRIBUTE_ESUBSETS = new int[]{UMLPackage.CLASS__OWNED_ATTRIBUTE};
+	protected static final int[] ATTRIBUTE_ESUBSETS = new int[]{
+		UMLPackage.CLASS__OWNED_ATTRIBUTE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierImpl.java
index 8287525..7df0a66 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 454400, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 454400, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -336,15 +336,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT);
 			if (redefinedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
-						redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
-							RedefinableElement.class, this,
-							UMLPackage.CLASSIFIER__REDEFINED_ELEMENT,
-							REDEFINED_ELEMENT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
+					redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
+						RedefinableElement.class, this,
+						UMLPackage.CLASSIFIER__REDEFINED_ELEMENT,
+						REDEFINED_ELEMENT_ESUBSETS));
 			}
 			return redefinedElements;
 		}
@@ -365,19 +362,14 @@
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
 			EList<Classifier> redefinitionContexts = (EList<Classifier>) cache
-				.get(
-					eResource,
-					this,
+				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 			if (redefinitionContexts == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-						redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class, this,
-							UMLPackage.CLASSIFIER__REDEFINITION_CONTEXT, null));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+					redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.CLASSIFIER__REDEFINITION_CONTEXT, null));
 			}
 			return redefinitionContexts;
 		}
@@ -389,7 +381,8 @@
 	 * The array of subset feature identifiers for the '{@link #getRedefinitionContexts() <em>Redefinition Context</em>}' reference list.
 	 * @see #getRedefinitionContexts()
 	 */
-	protected static final int[] REDEFINITION_CONTEXT_ESUBSETS = new int[]{UMLPackage.CLASSIFIER__NAMESPACE};
+	protected static final int[] REDEFINITION_CONTEXT_ESUBSETS = new int[]{
+		UMLPackage.CLASSIFIER__NAMESPACE};
 
 	public EList<Classifier> getRedefinitionContexts() {
 		CacheAdapter cache = getCacheAdapter();
@@ -397,20 +390,15 @@
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
 			EList<Classifier> redefinitionContexts = (EList<Classifier>) cache
-				.get(
-					eResource,
-					this,
+				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 			if (redefinitionContexts == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-						redefinitionContexts = new DerivedEObjectEList<Classifier>(
-							Classifier.class, this,
-							UMLPackage.CLASSIFIER__REDEFINITION_CONTEXT,
-							REDEFINITION_CONTEXT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+					redefinitionContexts = new DerivedEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.CLASSIFIER__REDEFINITION_CONTEXT,
+						REDEFINITION_CONTEXT_ESUBSETS));
 			}
 			return redefinitionContexts;
 		}
@@ -493,7 +481,8 @@
 	public TemplateParameter getTemplateParameter() {
 		if (templateParameter != null && templateParameter.eIsProxy()) {
 			InternalEObject oldTemplateParameter = (InternalEObject) templateParameter;
-			templateParameter = (TemplateParameter) eResolveProxy(oldTemplateParameter);
+			templateParameter = (TemplateParameter) eResolveProxy(
+				oldTemplateParameter);
 			if (templateParameter != oldTemplateParameter) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -584,8 +573,8 @@
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.CLASSIFIER__TEMPLATE_PARAMETER,
-				newTemplateParameter, newTemplateParameter));
+				UMLPackage.CLASSIFIER__TEMPLATE_PARAMETER, newTemplateParameter,
+				newTemplateParameter));
 	}
 
 	/**
@@ -625,7 +614,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetOwningTemplateParameter(
-			TemplateParameter newOwningTemplateParameter, NotificationChain msgs) {
+			TemplateParameter newOwningTemplateParameter,
+			NotificationChain msgs) {
 		msgs = eBasicSetContainer((InternalEObject) newOwningTemplateParameter,
 			UMLPackage.CLASSIFIER__OWNING_TEMPLATE_PARAMETER, msgs);
 		Resource.Internal eInternalResource = eInternalResource();
@@ -647,7 +637,8 @@
 	public void setOwningTemplateParameter(
 			TemplateParameter newOwningTemplateParameter) {
 		if (newOwningTemplateParameter != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.CLASSIFIER__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
+			|| (eContainerFeatureID() != UMLPackage.CLASSIFIER__OWNING_TEMPLATE_PARAMETER
+				&& newOwningTemplateParameter != null)) {
 			if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -656,8 +647,7 @@
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newOwningTemplateParameter != null)
 				msgs = ((InternalEObject) newOwningTemplateParameter)
-					.eInverseAdd(
-						this,
+					.eInverseAdd(this,
 						UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 						TemplateParameter.class, msgs);
 			msgs = basicSetOwningTemplateParameter(newOwningTemplateParameter,
@@ -677,7 +667,8 @@
 	 */
 	@Override
 	public VisibilityKind getVisibility() {
-		return VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		return VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 	}
 
 	/**
@@ -687,7 +678,8 @@
 	 */
 	@Override
 	public void setVisibility(VisibilityKind newVisibility) {
-		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 		if (newVisibility == null)
 			newVisibility = VISIBILITY_EDEFAULT;
 		eFlags = eFlags & ~VISIBILITY_EFLAG
@@ -696,8 +688,8 @@
 		eFlags |= VISIBILITY_ESETFLAG;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.CLASSIFIER__VISIBILITY, oldVisibility,
-				newVisibility, !oldVisibilityESet));
+				UMLPackage.CLASSIFIER__VISIBILITY, oldVisibility, newVisibility,
+				!oldVisibilityESet));
 	}
 
 	/**
@@ -707,7 +699,8 @@
 	 */
 	@Override
 	public void unsetVisibility() {
-		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 		boolean oldVisibilityESet = (eFlags & VISIBILITY_ESETFLAG) != 0;
 		eFlags = eFlags & ~VISIBILITY_EFLAG | VISIBILITY_EFLAG_DEFAULT;
 		eFlags &= ~VISIBILITY_ESETFLAG;
@@ -762,7 +755,8 @@
 	public org.eclipse.uml2.uml.Package getPackage() {
 		org.eclipse.uml2.uml.Package package_ = basicGetPackage();
 		return package_ != null && package_.eIsProxy()
-			? (org.eclipse.uml2.uml.Package) eResolveProxy((InternalEObject) package_)
+			? (org.eclipse.uml2.uml.Package) eResolveProxy(
+				(InternalEObject) package_)
 			: package_;
 	}
 
@@ -796,7 +790,8 @@
 					.basicAdd(this, msgs);
 			msgs = eBasicSetContainer((InternalEObject) newPackage,
 				InternalEObject.EOPPOSITE_FEATURE_BASE
-					- UMLPackage.PACKAGE__PACKAGED_ELEMENT, msgs);
+					- UMLPackage.PACKAGE__PACKAGED_ELEMENT,
+				msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
@@ -815,8 +810,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -852,7 +847,8 @@
 	 * @generated
 	 */
 	public TemplateBinding createTemplateBinding(TemplateSignature signature) {
-		TemplateBinding newTemplateBinding = (TemplateBinding) create(UMLPackage.Literals.TEMPLATE_BINDING);
+		TemplateBinding newTemplateBinding = (TemplateBinding) create(
+			UMLPackage.Literals.TEMPLATE_BINDING);
 		getTemplateBindings().add(newTemplateBinding);
 		if (signature != null)
 			newTemplateBinding.setSignature(signature);
@@ -892,9 +888,11 @@
 	 * @generated
 	 */
 	public TemplateSignature getOwnedTemplateSignature() {
-		if (ownedTemplateSignature != null && ownedTemplateSignature.eIsProxy()) {
+		if (ownedTemplateSignature != null
+			&& ownedTemplateSignature.eIsProxy()) {
 			InternalEObject oldOwnedTemplateSignature = (InternalEObject) ownedTemplateSignature;
-			ownedTemplateSignature = (TemplateSignature) eResolveProxy(oldOwnedTemplateSignature);
+			ownedTemplateSignature = (TemplateSignature) eResolveProxy(
+				oldOwnedTemplateSignature);
 			if (ownedTemplateSignature != oldOwnedTemplateSignature) {
 				InternalEObject newOwnedTemplateSignature = (InternalEObject) ownedTemplateSignature;
 				NotificationChain msgs = oldOwnedTemplateSignature
@@ -932,7 +930,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetOwnedTemplateSignature(
-			TemplateSignature newOwnedTemplateSignature, NotificationChain msgs) {
+			TemplateSignature newOwnedTemplateSignature,
+			NotificationChain msgs) {
 		if (newOwnedTemplateSignature != null
 			&& !(newOwnedTemplateSignature instanceof RedefinableTemplateSignature)) {
 			throw new IllegalArgumentException(
@@ -992,7 +991,8 @@
 	 * @generated
 	 */
 	public TemplateSignature createOwnedTemplateSignature(EClass eClass) {
-		TemplateSignature newOwnedTemplateSignature = (TemplateSignature) create(eClass);
+		TemplateSignature newOwnedTemplateSignature = (TemplateSignature) create(
+			eClass);
 		setOwnedTemplateSignature(newOwnedTemplateSignature);
 		return newOwnedTemplateSignature;
 	}
@@ -1054,14 +1054,14 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<NamedElement> members = (EList<NamedElement>) cache.get(
-				eResource, this, UMLPackage.Literals.NAMESPACE__MEMBER);
+			EList<NamedElement> members = (EList<NamedElement>) cache
+				.get(eResource, this, UMLPackage.Literals.NAMESPACE__MEMBER);
 			if (members == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.NAMESPACE__MEMBER,
 					members = new DerivedUnionEObjectEList<NamedElement>(
-						NamedElement.class, this,
-						UMLPackage.CLASSIFIER__MEMBER, MEMBER_ESUBSETS));
+						NamedElement.class, this, UMLPackage.CLASSIFIER__MEMBER,
+						MEMBER_ESUBSETS));
 			}
 			return members;
 		}
@@ -1207,7 +1207,8 @@
 	 * @generated
 	 */
 	public void setIsFinalSpecialization(boolean newIsFinalSpecialization) {
-		boolean oldIsFinalSpecialization = (eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0;
+		boolean oldIsFinalSpecialization = (eFlags
+			& IS_FINAL_SPECIALIZATION_EFLAG) != 0;
 		if (newIsFinalSpecialization)
 			eFlags |= IS_FINAL_SPECIALIZATION_EFLAG;
 		else
@@ -1262,7 +1263,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public GeneralizationSet getPowertypeExtent(String name, boolean ignoreCase) {
+	public GeneralizationSet getPowertypeExtent(String name,
+			boolean ignoreCase) {
 		powertypeExtentLoop : for (GeneralizationSet powertypeExtent : getPowertypeExtents()) {
 			if (name != null && !(ignoreCase
 				? name.equalsIgnoreCase(powertypeExtent.getName())
@@ -1398,7 +1400,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Classifier getGeneral(String name, boolean ignoreCase, EClass eClass) {
+	public Classifier getGeneral(String name, boolean ignoreCase,
+			EClass eClass) {
 		generalLoop : for (Classifier general : getGenerals()) {
 			if (eClass != null && !eClass.isInstance(general))
 				continue generalLoop;
@@ -1430,7 +1433,8 @@
 	 * @generated
 	 */
 	public UseCase createOwnedUseCase(String name) {
-		UseCase newOwnedUseCase = (UseCase) create(UMLPackage.Literals.USE_CASE);
+		UseCase newOwnedUseCase = (UseCase) create(
+			UMLPackage.Literals.USE_CASE);
 		getOwnedUseCases().add(newOwnedUseCase);
 		if (name != null)
 			newOwnedUseCase.setName(name);
@@ -1526,7 +1530,8 @@
 	public CollaborationUse getRepresentation() {
 		if (representation != null && representation.eIsProxy()) {
 			InternalEObject oldRepresentation = (InternalEObject) representation;
-			representation = (CollaborationUse) eResolveProxy(oldRepresentation);
+			representation = (CollaborationUse) eResolveProxy(
+				oldRepresentation);
 			if (representation != oldRepresentation) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -1575,7 +1580,8 @@
 	 * @generated
 	 */
 	public CollaborationUse createRepresentation(String name) {
-		CollaborationUse newRepresentation = (CollaborationUse) create(UMLPackage.Literals.COLLABORATION_USE);
+		CollaborationUse newRepresentation = (CollaborationUse) create(
+			UMLPackage.Literals.COLLABORATION_USE);
 		setRepresentation(newRepresentation);
 		if (name != null)
 			newRepresentation.setName(name);
@@ -1587,10 +1593,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateRedefinitionContextValid(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return RedefinableElementOperations.validateRedefinitionContextValid(
-			this, diagnostics, context);
+	public boolean validateRedefinitionContextValid(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return RedefinableElementOperations
+			.validateRedefinitionContextValid(this, diagnostics, context);
 	}
 
 	/**
@@ -1600,8 +1606,8 @@
 	 */
 	public boolean validateRedefinitionConsistent(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return RedefinableElementOperations.validateRedefinitionConsistent(
-			this, diagnostics, context);
+		return RedefinableElementOperations.validateRedefinitionConsistent(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -1659,10 +1665,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateNamespaceNeedsVisibility(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return PackageableElementOperations.validateNamespaceNeedsVisibility(
-			this, diagnostics, context);
+	public boolean validateNamespaceNeedsVisibility(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return PackageableElementOperations
+			.validateNamespaceNeedsVisibility(this, diagnostics, context);
 	}
 
 	/**
@@ -1710,16 +1716,13 @@
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
 			EList<ParameterableElement> result = (EList<ParameterableElement>) cache
-				.get(
-					this,
+				.get(this,
 					UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS,
-						result = TemplateableElementOperations
-							.parameterableElements(this));
+				cache.put(this,
+					UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS,
+					result = TemplateableElementOperations
+						.parameterableElements(this));
 			}
 			return result;
 		}
@@ -1740,8 +1743,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateNoCyclesInGeneralization(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateNoCyclesInGeneralization(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return ClassifierOperations.validateNoCyclesInGeneralization(this,
 			diagnostics, context);
 	}
@@ -1785,7 +1788,8 @@
 	 * @generated
 	 */
 	public Generalization createGeneralization(Classifier general) {
-		Generalization newGeneralization = (Generalization) create(UMLPackage.Literals.GENERALIZATION);
+		Generalization newGeneralization = (Generalization) create(
+			UMLPackage.Literals.GENERALIZATION);
 		getGeneralizations().add(newGeneralization);
 		if (general != null)
 			newGeneralization.setGeneral(general);
@@ -1851,8 +1855,7 @@
 			EList<Operation> result = (EList<Operation>) cache.get(this,
 				UMLPackage.Literals.CLASSIFIER___GET_OPERATIONS);
 			if (result == null) {
-				cache.put(this,
-					UMLPackage.Literals.CLASSIFIER___GET_OPERATIONS,
+				cache.put(this, UMLPackage.Literals.CLASSIFIER___GET_OPERATIONS,
 					result = ClassifierOperations.getOperations(this));
 			}
 			return result;
@@ -2006,12 +2009,10 @@
 			EList<Interface> result = (EList<Interface>) cache.get(this,
 				UMLPackage.Literals.CLASSIFIER___DIRECTLY_REALIZED_INTERFACES);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.CLASSIFIER___DIRECTLY_REALIZED_INTERFACES,
-						result = ClassifierOperations
-							.directlyRealizedInterfaces(this));
+				cache.put(this,
+					UMLPackage.Literals.CLASSIFIER___DIRECTLY_REALIZED_INTERFACES,
+					result = ClassifierOperations
+						.directlyRealizedInterfaces(this));
 			}
 			return result;
 		}
@@ -2102,8 +2103,7 @@
 			EList<Property> result = (EList<Property>) cache.get(this,
 				UMLPackage.Literals.CLASSIFIER___ALL_ATTRIBUTES);
 			if (result == null) {
-				cache.put(this,
-					UMLPackage.Literals.CLASSIFIER___ALL_ATTRIBUTES,
+				cache.put(this, UMLPackage.Literals.CLASSIFIER___ALL_ATTRIBUTES,
 					result = ClassifierOperations.allAttributes(this));
 			}
 			return result;
@@ -2209,10 +2209,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.CLASSIFIER__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.CLASSIFIER__TEMPLATE_BINDING :
@@ -2221,8 +2221,9 @@
 			case UMLPackage.CLASSIFIER__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.CLASSIFIER__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.CLASSIFIER__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -2252,49 +2253,49 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CLASSIFIER__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASSIFIER__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASSIFIER__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CLASSIFIER__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASSIFIER__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASSIFIER__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASSIFIER__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.CLASSIFIER__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.CLASSIFIER__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASSIFIER__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.CLASSIFIER__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASSIFIER__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASSIFIER__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASSIFIER__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASSIFIER__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.CLASSIFIER__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -2431,13 +2432,13 @@
 		switch (featureID) {
 			case UMLPackage.CLASSIFIER__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__NAME :
 				setName((String) newValue);
@@ -2450,18 +2451,18 @@
 				return;
 			case UMLPackage.CLASSIFIER__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -2477,31 +2478,31 @@
 				return;
 			case UMLPackage.CLASSIFIER__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -2511,8 +2512,8 @@
 				return;
 			case UMLPackage.CLASSIFIER__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__USE_CASE :
 				getUseCases().clear();
@@ -2520,16 +2521,16 @@
 				return;
 			case UMLPackage.CLASSIFIER__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.CLASSIFIER__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -2696,9 +2697,11 @@
 			case UMLPackage.CLASSIFIER__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.CLASSIFIER__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.CLASSIFIER__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.CLASSIFIER__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.CLASSIFIER__USE_CASE :
@@ -2720,7 +2723,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == RedefinableElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.CLASSIFIER__IS_LEAF :
@@ -2776,7 +2780,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == RedefinableElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.REDEFINABLE_ELEMENT__IS_LEAF :
@@ -2949,7 +2954,8 @@
 			case UMLPackage.CLASSIFIER___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CLASSIFIER___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CLASSIFIER___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CLASSIFIER___GET_STEREOTYPE_APPLICATIONS :
@@ -2957,7 +2963,8 @@
 			case UMLPackage.CLASSIFIER___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CLASSIFIER___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CLASSIFIER___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -3046,13 +3053,13 @@
 			case UMLPackage.CLASSIFIER___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.CLASSIFIER___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.CLASSIFIER___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.CLASSIFIER___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.CLASSIFIER___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.CLASSIFIER___MEMBERS_ARE_DISTINGUISHABLE :
@@ -3072,10 +3079,11 @@
 			case UMLPackage.CLASSIFIER___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.CLASSIFIER___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.CLASSIFIER___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.CLASSIFIER___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.CLASSIFIER___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -3198,7 +3206,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{UMLPackage.CLASSIFIER__REDEFINED_CLASSIFIER};
+	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{
+		UMLPackage.CLASSIFIER__REDEFINED_CLASSIFIER};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3328,7 +3337,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] FEATURE_ESUBSETS = new int[]{UMLPackage.CLASSIFIER__ATTRIBUTE};
+	protected static final int[] FEATURE_ESUBSETS = new int[]{
+		UMLPackage.CLASSIFIER__ATTRIBUTE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3390,7 +3400,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] COLLABORATION_USE_ESUBSETS = new int[]{UMLPackage.CLASSIFIER__REPRESENTATION};
+	protected static final int[] COLLABORATION_USE_ESUBSETS = new int[]{
+		UMLPackage.CLASSIFIER__REPRESENTATION};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3398,7 +3409,8 @@
 	 * @generated
 	 */
 	public CollaborationUse createCollaborationUse(String name) {
-		CollaborationUse newCollaborationUse = (CollaborationUse) create(UMLPackage.Literals.COLLABORATION_USE);
+		CollaborationUse newCollaborationUse = (CollaborationUse) create(
+			UMLPackage.Literals.COLLABORATION_USE);
 		getCollaborationUses().add(newCollaborationUse);
 		if (name != null)
 			newCollaborationUse.setName(name);
@@ -3419,8 +3431,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CollaborationUse getCollaborationUse(String name,
-			boolean ignoreCase, boolean createOnDemand) {
+	public CollaborationUse getCollaborationUse(String name, boolean ignoreCase,
+			boolean createOnDemand) {
 		collaborationUseLoop : for (CollaborationUse collaborationUse : getCollaborationUses()) {
 			if (name != null && !(ignoreCase
 				? name.equalsIgnoreCase(collaborationUse.getName())
@@ -3439,7 +3451,8 @@
 	 * @generated
 	 */
 	public Substitution createSubstitution(String name, Classifier contract) {
-		Substitution newSubstitution = (Substitution) create(UMLPackage.Literals.SUBSTITUTION);
+		Substitution newSubstitution = (Substitution) create(
+			UMLPackage.Literals.SUBSTITUTION);
 		getSubstitutions().add(newSubstitution);
 		if (name != null)
 			newSubstitution.setName(name);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierTemplateParameterImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierTemplateParameterImpl.java
index 0dffffd..511c68c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierTemplateParameterImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassifierTemplateParameterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -126,7 +126,8 @@
 	 * @generated
 	 */
 	public void setAllowSubstitutable(boolean newAllowSubstitutable) {
-		boolean oldAllowSubstitutable = (eFlags & ALLOW_SUBSTITUTABLE_EFLAG) != 0;
+		boolean oldAllowSubstitutable = (eFlags
+			& ALLOW_SUBSTITUTABLE_EFLAG) != 0;
 		if (newAllowSubstitutable)
 			eFlags |= ALLOW_SUBSTITUTABLE_EFLAG;
 		else
@@ -145,8 +146,7 @@
 	public EList<Classifier> getConstrainingClassifiers() {
 		if (constrainingClassifiers == null) {
 			constrainingClassifiers = new EObjectResolvingEList<Classifier>(
-				Classifier.class,
-				this,
+				Classifier.class, this,
 				UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER);
 		}
 		return constrainingClassifiers;
@@ -166,8 +166,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Classifier getConstrainingClassifier(String name,
-			boolean ignoreCase, EClass eClass) {
+	public Classifier getConstrainingClassifier(String name, boolean ignoreCase,
+			EClass eClass) {
 		constrainingClassifierLoop : for (Classifier constrainingClassifier : getConstrainingClassifiers()) {
 			if (eClass != null && !eClass.isInstance(constrainingClassifier))
 				continue constrainingClassifierLoop;
@@ -189,12 +189,11 @@
 	public ParameterableElement getParameteredElement() {
 		if (parameteredElement != null && parameteredElement.eIsProxy()) {
 			InternalEObject oldParameteredElement = (InternalEObject) parameteredElement;
-			parameteredElement = (ParameterableElement) eResolveProxy(oldParameteredElement);
+			parameteredElement = (ParameterableElement) eResolveProxy(
+				oldParameteredElement);
 			if (parameteredElement != oldParameteredElement) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
 						oldParameteredElement, parameteredElement));
 			}
@@ -218,7 +217,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetParameteredElementGen(
-			ParameterableElement newParameteredElement, NotificationChain msgs) {
+			ParameterableElement newParameteredElement,
+			NotificationChain msgs) {
 		if (newParameteredElement != null
 			&& !(newParameteredElement instanceof Classifier)) {
 			throw new IllegalArgumentException(
@@ -241,7 +241,8 @@
 
 	@Override
 	public NotificationChain basicSetParameteredElement(
-			ParameterableElement newParameteredElement, NotificationChain msgs) {
+			ParameterableElement newParameteredElement,
+			NotificationChain msgs) {
 		msgs = basicSetParameteredElementGen(newParameteredElement, msgs);
 
 		Resource.Internal eInternalResource = eInternalResource();
@@ -264,7 +265,8 @@
 	 * @generated
 	 */
 	@Override
-	public void setParameteredElement(ParameterableElement newParameteredElement) {
+	public void setParameteredElement(
+			ParameterableElement newParameteredElement) {
 		if (newParameteredElement != null
 			&& !(newParameteredElement instanceof Classifier)) {
 			throw new IllegalArgumentException(
@@ -327,8 +329,8 @@
 	 */
 	public boolean validateMatchingAbstract(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ClassifierTemplateParameterOperations.validateMatchingAbstract(
-			this, diagnostics, context);
+		return ClassifierTemplateParameterOperations
+			.validateMatchingAbstract(this, diagnostics, context);
 	}
 
 	/**
@@ -382,8 +384,7 @@
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT :
 				if (parameteredElement != null)
 					msgs = ((InternalEObject) parameteredElement)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							UMLPackage.PARAMETERABLE_ELEMENT__TEMPLATE_PARAMETER,
 							ParameterableElement.class, msgs);
 				return basicSetParameteredElement(
@@ -395,8 +396,7 @@
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT :
 				if (ownedParameteredElement != null)
 					msgs = ((InternalEObject) ownedParameteredElement)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							EOPPOSITE_FEATURE_BASE
 								- UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 							null, msgs);
@@ -416,11 +416,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__OWNED_DEFAULT :
 				return basicSetOwnedDefault(null, msgs);
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT :
@@ -490,13 +490,13 @@
 		switch (featureID) {
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__DEFAULT :
 				setDefault((ParameterableElement) newValue);
@@ -518,8 +518,8 @@
 				return;
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER :
 				getConstrainingClassifiers().clear();
-				getConstrainingClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getConstrainingClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -591,7 +591,8 @@
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT :
 				return ownedParameteredElement != null;
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__ALLOW_SUBSTITUTABLE :
-				return ((eFlags & ALLOW_SUBSTITUTABLE_EFLAG) != 0) != ALLOW_SUBSTITUTABLE_EDEFAULT;
+				return ((eFlags
+					& ALLOW_SUBSTITUTABLE_EFLAG) != 0) != ALLOW_SUBSTITUTABLE_EDEFAULT;
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIER :
 				return constrainingClassifiers != null
 					&& !constrainingClassifiers.isEmpty();
@@ -656,7 +657,8 @@
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER___GET_STEREOTYPE_APPLICATIONS :
@@ -664,7 +666,8 @@
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClauseImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClauseImpl.java
index fd6812e..04610a7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClauseImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClauseImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -172,7 +172,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ExecutableNode getTest(String name, boolean ignoreCase, EClass eClass) {
+	public ExecutableNode getTest(String name, boolean ignoreCase,
+			EClass eClass) {
 		testLoop : for (ExecutableNode test : getTests()) {
 			if (eClass != null && !eClass.isInstance(test))
 				continue testLoop;
@@ -212,7 +213,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ExecutableNode getBody(String name, boolean ignoreCase, EClass eClass) {
+	public ExecutableNode getBody(String name, boolean ignoreCase,
+			EClass eClass) {
 		bodyLoop : for (ExecutableNode body : getBodies()) {
 			if (eClass != null && !eClass.isInstance(body))
 				continue bodyLoop;
@@ -398,17 +400,17 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CLAUSE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLAUSE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLAUSE__PREDECESSOR_CLAUSE :
 				return ((InternalEList<?>) getPredecessorClauses())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLAUSE__SUCCESSOR_CLAUSE :
-				return ((InternalEList<?>) getSuccessorClauses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSuccessorClauses())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -460,41 +462,41 @@
 		switch (featureID) {
 			case UMLPackage.CLAUSE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CLAUSE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CLAUSE__BODY :
 				getBodies().clear();
-				getBodies().addAll(
-					(Collection<? extends ExecutableNode>) newValue);
+				getBodies()
+					.addAll((Collection<? extends ExecutableNode>) newValue);
 				return;
 			case UMLPackage.CLAUSE__BODY_OUTPUT :
 				getBodyOutputs().clear();
-				getBodyOutputs().addAll(
-					(Collection<? extends OutputPin>) newValue);
+				getBodyOutputs()
+					.addAll((Collection<? extends OutputPin>) newValue);
 				return;
 			case UMLPackage.CLAUSE__DECIDER :
 				setDecider((OutputPin) newValue);
 				return;
 			case UMLPackage.CLAUSE__PREDECESSOR_CLAUSE :
 				getPredecessorClauses().clear();
-				getPredecessorClauses().addAll(
-					(Collection<? extends Clause>) newValue);
+				getPredecessorClauses()
+					.addAll((Collection<? extends Clause>) newValue);
 				return;
 			case UMLPackage.CLAUSE__SUCCESSOR_CLAUSE :
 				getSuccessorClauses().clear();
-				getSuccessorClauses().addAll(
-					(Collection<? extends Clause>) newValue);
+				getSuccessorClauses()
+					.addAll((Collection<? extends Clause>) newValue);
 				return;
 			case UMLPackage.CLAUSE__TEST :
 				getTests().clear();
-				getTests().addAll(
-					(Collection<? extends ExecutableNode>) newValue);
+				getTests()
+					.addAll((Collection<? extends ExecutableNode>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -626,7 +628,8 @@
 			case UMLPackage.CLAUSE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CLAUSE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CLAUSE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CLAUSE___GET_STEREOTYPE_APPLICATIONS :
@@ -634,7 +637,8 @@
 			case UMLPackage.CLAUSE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CLAUSE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CLAUSE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -666,8 +670,7 @@
 					(DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.CLAUSE___VALIDATE_DECIDER_OUTPUT__DIAGNOSTICCHAIN_MAP :
-				return validateDeciderOutput(
-					(DiagnosticChain) arguments.get(0),
+				return validateDeciderOutput((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.CLAUSE___VALIDATE_TEST_AND_BODY__DIAGNOSTICCHAIN_MAP :
 				return validateTestAndBody((DiagnosticChain) arguments.get(0),
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClearAssociationActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClearAssociationActionImpl.java
index 56877af..8770a89 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClearAssociationActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClearAssociationActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -157,12 +157,13 @@
 				InternalEObject newObject = (InternalEObject) object;
 				NotificationChain msgs = oldObject.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CLEAR_ASSOCIATION_ACTION__OBJECT, null,
-					null);
+						- UMLPackage.CLEAR_ASSOCIATION_ACTION__OBJECT,
+					null, null);
 				if (newObject.eInternalContainer() == null) {
-					msgs = newObject.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CLEAR_ASSOCIATION_ACTION__OBJECT, null,
-						msgs);
+					msgs = newObject.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.CLEAR_ASSOCIATION_ACTION__OBJECT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -216,13 +217,13 @@
 			if (object != null)
 				msgs = ((InternalEObject) object).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CLEAR_ASSOCIATION_ACTION__OBJECT, null,
-					msgs);
+						- UMLPackage.CLEAR_ASSOCIATION_ACTION__OBJECT,
+					null, msgs);
 			if (newObject != null)
 				msgs = ((InternalEObject) newObject).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CLEAR_ASSOCIATION_ACTION__OBJECT, null,
-					msgs);
+						- UMLPackage.CLEAR_ASSOCIATION_ACTION__OBJECT,
+					null, msgs);
 			msgs = basicSetObject(newObject, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -330,11 +331,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -343,14 +344,14 @@
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -465,13 +466,13 @@
 		switch (featureID) {
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__NAME :
 				setName((String) newValue);
@@ -490,50 +491,49 @@
 				return;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__ASSOCIATION :
 				setAssociation((Association) newValue);
@@ -674,7 +674,8 @@
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -748,7 +749,8 @@
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -756,7 +758,8 @@
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -833,8 +836,8 @@
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.CLEAR_ASSOCIATION_ACTION___GET_CONTEXT :
@@ -863,7 +866,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.CLEAR_ASSOCIATION_ACTION__OBJECT};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.CLEAR_ASSOCIATION_ACTION__OBJECT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClearStructuralFeatureActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClearStructuralFeatureActionImpl.java
index 85df126..0f58b24 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClearStructuralFeatureActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClearStructuralFeatureActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -122,7 +122,8 @@
 			return outputs;
 		}
 		return new DerivedUnionEObjectEList<OutputPin>(OutputPin.class, this,
-			UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OUTPUT, OUTPUT_ESUBSETS);
+			UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OUTPUT,
+			OUTPUT_ESUBSETS);
 	}
 
 	/**
@@ -133,7 +134,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -151,8 +153,9 @@
 						- 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,
+					msgs = newResult.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__RESULT,
 						null, msgs);
 				}
 				if (msgs != null)
@@ -230,7 +233,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -246,8 +250,8 @@
 	 */
 	public boolean validateTypeOfResult(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ClearStructuralFeatureActionOperations.validateTypeOfResult(
-			this, diagnostics, context);
+		return ClearStructuralFeatureActionOperations.validateTypeOfResult(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -271,11 +275,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -284,14 +288,14 @@
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -412,13 +416,13 @@
 		switch (featureID) {
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__NAME :
 				setName((String) newValue);
@@ -437,50 +441,49 @@
 				return;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__OBJECT :
 				setObject((InputPin) newValue);
@@ -627,7 +630,8 @@
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -703,7 +707,8 @@
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -711,7 +716,8 @@
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -788,8 +794,8 @@
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION___GET_CONTEXT :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationImpl.java
index 34d984c..a0877d7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -168,8 +168,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -257,14 +257,16 @@
 			return ownedMembers;
 		}
 		return new DerivedUnionEObjectEList<NamedElement>(NamedElement.class,
-			this, UMLPackage.COLLABORATION__OWNED_MEMBER, OWNED_MEMBER_ESUBSETS);
+			this, UMLPackage.COLLABORATION__OWNED_MEMBER,
+			OWNED_MEMBER_ESUBSETS);
 	}
 
 	/**
 	 * The array of superset feature identifiers for the '{@link #getParts() <em>Part</em>}' reference list.
 	 * @see #getParts()
 	 */
-	protected static final int[] PART_ESUPERSETS = new int[]{UMLPackage.COLLABORATION__OWNED_ATTRIBUTE};
+	protected static final int[] PART_ESUPERSETS = new int[]{
+		UMLPackage.COLLABORATION__OWNED_ATTRIBUTE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -276,8 +278,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Property> parts = (EList<Property>) cache.get(eResource,
-				this, UMLPackage.Literals.STRUCTURED_CLASSIFIER__PART);
+			EList<Property> parts = (EList<Property>) cache.get(eResource, this,
+				UMLPackage.Literals.STRUCTURED_CLASSIFIER__PART);
 			if (parts == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.STRUCTURED_CLASSIFIER__PART,
@@ -355,17 +357,13 @@
 		CacheAdapter cache = getCacheAdapter();
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
-			EList<Interface> result = (EList<Interface>) cache
-				.get(
-					this,
-					UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES);
+			EList<Interface> result = (EList<Interface>) cache.get(this,
+				UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES,
-						result = BehavioredClassifierOperations
-							.getAllImplementedInterfaces(this));
+				cache.put(this,
+					UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_ALL_IMPLEMENTED_INTERFACES,
+					result = BehavioredClassifierOperations
+						.getAllImplementedInterfaces(this));
 			}
 			return result;
 		}
@@ -381,17 +379,13 @@
 		CacheAdapter cache = getCacheAdapter();
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
-			EList<Interface> result = (EList<Interface>) cache
-				.get(
-					this,
-					UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES);
+			EList<Interface> result = (EList<Interface>) cache.get(this,
+				UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES,
-						result = BehavioredClassifierOperations
-							.getImplementedInterfaces(this));
+				cache.put(this,
+					UMLPackage.Literals.BEHAVIORED_CLASSIFIER___GET_IMPLEMENTED_INTERFACES,
+					result = BehavioredClassifierOperations
+						.getImplementedInterfaces(this));
 			}
 			return result;
 		}
@@ -427,10 +421,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.COLLABORATION__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.COLLABORATION__TEMPLATE_BINDING :
@@ -439,8 +433,7 @@
 			case UMLPackage.COLLABORATION__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							EOPPOSITE_FEATURE_BASE
 								- UMLPackage.COLLABORATION__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
@@ -475,61 +468,61 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.COLLABORATION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.COLLABORATION__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.COLLABORATION__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.COLLABORATION__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.COLLABORATION__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.COLLABORATION__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__OWNED_CONNECTOR :
-				return ((InternalEList<?>) getOwnedConnectors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedConnectors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__INTERFACE_REALIZATION :
 				return ((InternalEList<?>) getInterfaceRealizations())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION__OWNED_BEHAVIOR :
-				return ((InternalEList<?>) getOwnedBehaviors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedBehaviors())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -667,13 +660,13 @@
 		switch (featureID) {
 			case UMLPackage.COLLABORATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__NAME :
 				setName((String) newValue);
@@ -686,18 +679,18 @@
 				return;
 			case UMLPackage.COLLABORATION__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -713,31 +706,31 @@
 				return;
 			case UMLPackage.COLLABORATION__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.COLLABORATION__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -747,8 +740,8 @@
 				return;
 			case UMLPackage.COLLABORATION__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__USE_CASE :
 				getUseCases().clear();
@@ -756,26 +749,26 @@
 				return;
 			case UMLPackage.COLLABORATION__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.COLLABORATION__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -787,8 +780,8 @@
 				return;
 			case UMLPackage.COLLABORATION__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.COLLABORATION__COLLABORATION_ROLE :
 				getCollaborationRoles().clear();
@@ -978,9 +971,11 @@
 			case UMLPackage.COLLABORATION__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.COLLABORATION__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.COLLABORATION__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.COLLABORATION__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.COLLABORATION__USE_CASE :
@@ -1020,7 +1015,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == BehavioredClassifier.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.COLLABORATION__CLASSIFIER_BEHAVIOR :
@@ -1042,7 +1038,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == BehavioredClassifier.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.BEHAVIORED_CLASSIFIER__CLASSIFIER_BEHAVIOR :
@@ -1137,7 +1134,8 @@
 			case UMLPackage.COLLABORATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.COLLABORATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.COLLABORATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.COLLABORATION___GET_STEREOTYPE_APPLICATIONS :
@@ -1145,7 +1143,8 @@
 			case UMLPackage.COLLABORATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.COLLABORATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.COLLABORATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1234,13 +1233,13 @@
 			case UMLPackage.COLLABORATION___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.COLLABORATION___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.COLLABORATION___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.COLLABORATION___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.COLLABORATION___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.COLLABORATION___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1260,10 +1259,11 @@
 			case UMLPackage.COLLABORATION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.COLLABORATION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.COLLABORATION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.COLLABORATION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.COLLABORATION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1362,8 +1362,7 @@
 			case UMLPackage.COLLABORATION___ALL_ROLES :
 				return allRoles();
 			case UMLPackage.COLLABORATION___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.COLLABORATION___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
@@ -1421,7 +1420,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_BEHAVIOR_ESUBSETS = new int[]{UMLPackage.COLLABORATION__CLASSIFIER_BEHAVIOR};
+	protected static final int[] OWNED_BEHAVIOR_ESUBSETS = new int[]{
+		UMLPackage.COLLABORATION__CLASSIFIER_BEHAVIOR};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1474,7 +1474,8 @@
 	public Behavior getClassifierBehavior() {
 		if (classifierBehavior != null && classifierBehavior.eIsProxy()) {
 			InternalEObject oldClassifierBehavior = (InternalEObject) classifierBehavior;
-			classifierBehavior = (Behavior) eResolveProxy(oldClassifierBehavior);
+			classifierBehavior = (Behavior) eResolveProxy(
+				oldClassifierBehavior);
 			if (classifierBehavior != oldClassifierBehavior) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -1552,7 +1553,8 @@
 	 */
 	public InterfaceRealization createInterfaceRealization(String name,
 			Interface contract) {
-		InterfaceRealization newInterfaceRealization = (InterfaceRealization) create(UMLPackage.Literals.INTERFACE_REALIZATION);
+		InterfaceRealization newInterfaceRealization = (InterfaceRealization) create(
+			UMLPackage.Literals.INTERFACE_REALIZATION);
 		getInterfaceRealizations().add(newInterfaceRealization);
 		if (name != null)
 			newInterfaceRealization.setName(name);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationUseImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationUseImpl.java
index 21dee5e..fa65da1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationUseImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CollaborationUseImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -121,8 +121,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -134,7 +134,8 @@
 			return ownedElements;
 		}
 		return new DerivedUnionEObjectEList<Element>(Element.class, this,
-			UMLPackage.COLLABORATION_USE__OWNED_ELEMENT, OWNED_ELEMENT_ESUBSETS);
+			UMLPackage.COLLABORATION_USE__OWNED_ELEMENT,
+			OWNED_ELEMENT_ESUBSETS);
 	}
 
 	/**
@@ -286,16 +287,16 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.COLLABORATION_USE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION_USE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COLLABORATION_USE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.COLLABORATION_USE__ROLE_BINDING :
-				return ((InternalEList<?>) getRoleBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getRoleBindings())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -355,13 +356,13 @@
 		switch (featureID) {
 			case UMLPackage.COLLABORATION_USE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.COLLABORATION_USE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.COLLABORATION_USE__NAME :
 				setName((String) newValue);
@@ -374,8 +375,8 @@
 				return;
 			case UMLPackage.COLLABORATION_USE__ROLE_BINDING :
 				getRoleBindings().clear();
-				getRoleBindings().addAll(
-					(Collection<? extends Dependency>) newValue);
+				getRoleBindings()
+					.addAll((Collection<? extends Dependency>) newValue);
 				return;
 			case UMLPackage.COLLABORATION_USE__TYPE :
 				setType((Collaboration) newValue);
@@ -512,7 +513,8 @@
 			case UMLPackage.COLLABORATION_USE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.COLLABORATION_USE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.COLLABORATION_USE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.COLLABORATION_USE___GET_STEREOTYPE_APPLICATIONS :
@@ -520,7 +522,8 @@
 			case UMLPackage.COLLABORATION_USE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.COLLABORATION_USE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.COLLABORATION_USE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CombinedFragmentImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CombinedFragmentImpl.java
index 3dfdb51..f76caba 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CombinedFragmentImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CombinedFragmentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -176,8 +176,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -189,7 +189,8 @@
 			return ownedElements;
 		}
 		return new DerivedUnionEObjectEList<Element>(Element.class, this,
-			UMLPackage.COMBINED_FRAGMENT__OWNED_ELEMENT, OWNED_ELEMENT_ESUBSETS);
+			UMLPackage.COMBINED_FRAGMENT__OWNED_ELEMENT,
+			OWNED_ELEMENT_ESUBSETS);
 	}
 
 	/**
@@ -198,7 +199,8 @@
 	 * @generated
 	 */
 	public InteractionOperatorKind getInteractionOperator() {
-		return INTERACTION_OPERATOR_EFLAG_VALUES[(eFlags & INTERACTION_OPERATOR_EFLAG) >>> INTERACTION_OPERATOR_EFLAG_OFFSET];
+		return INTERACTION_OPERATOR_EFLAG_VALUES[(eFlags
+			& INTERACTION_OPERATOR_EFLAG) >>> INTERACTION_OPERATOR_EFLAG_OFFSET];
 	}
 
 	/**
@@ -208,12 +210,12 @@
 	 */
 	public void setInteractionOperator(
 			InteractionOperatorKind newInteractionOperator) {
-		InteractionOperatorKind oldInteractionOperator = INTERACTION_OPERATOR_EFLAG_VALUES[(eFlags & INTERACTION_OPERATOR_EFLAG) >>> INTERACTION_OPERATOR_EFLAG_OFFSET];
+		InteractionOperatorKind oldInteractionOperator = INTERACTION_OPERATOR_EFLAG_VALUES[(eFlags
+			& INTERACTION_OPERATOR_EFLAG) >>> INTERACTION_OPERATOR_EFLAG_OFFSET];
 		if (newInteractionOperator == null)
 			newInteractionOperator = INTERACTION_OPERATOR_EDEFAULT;
-		eFlags = eFlags
-			& ~INTERACTION_OPERATOR_EFLAG
-			| newInteractionOperator.ordinal() << INTERACTION_OPERATOR_EFLAG_OFFSET;
+		eFlags = eFlags & ~INTERACTION_OPERATOR_EFLAG | newInteractionOperator
+			.ordinal() << INTERACTION_OPERATOR_EFLAG_OFFSET;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
 				UMLPackage.COMBINED_FRAGMENT__INTERACTION_OPERATOR,
@@ -240,7 +242,8 @@
 	 * @generated
 	 */
 	public InteractionOperand createOperand(String name) {
-		InteractionOperand newOperand = (InteractionOperand) create(UMLPackage.Literals.INTERACTION_OPERAND);
+		InteractionOperand newOperand = (InteractionOperand) create(
+			UMLPackage.Literals.INTERACTION_OPERAND);
 		getOperands().add(newOperand);
 		if (name != null)
 			newOperand.setName(name);
@@ -372,11 +375,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.COMBINED_FRAGMENT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMBINED_FRAGMENT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMBINED_FRAGMENT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.COMBINED_FRAGMENT__COVERED :
@@ -387,11 +390,11 @@
 			case UMLPackage.COMBINED_FRAGMENT__ENCLOSING_INTERACTION :
 				return basicSetEnclosingInteraction(null, msgs);
 			case UMLPackage.COMBINED_FRAGMENT__GENERAL_ORDERING :
-				return ((InternalEList<?>) getGeneralOrderings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralOrderings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMBINED_FRAGMENT__CFRAGMENT_GATE :
-				return ((InternalEList<?>) getCfragmentGates()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCfragmentGates())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMBINED_FRAGMENT__OPERAND :
 				return ((InternalEList<?>) getOperands()).basicRemove(otherEnd,
 					msgs);
@@ -466,13 +469,13 @@
 		switch (featureID) {
 			case UMLPackage.COMBINED_FRAGMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.COMBINED_FRAGMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.COMBINED_FRAGMENT__NAME :
 				setName((String) newValue);
@@ -495,13 +498,13 @@
 				return;
 			case UMLPackage.COMBINED_FRAGMENT__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.COMBINED_FRAGMENT__CFRAGMENT_GATE :
 				getCfragmentGates().clear();
-				getCfragmentGates().addAll(
-					(Collection<? extends Gate>) newValue);
+				getCfragmentGates()
+					.addAll((Collection<? extends Gate>) newValue);
 				return;
 			case UMLPackage.COMBINED_FRAGMENT__INTERACTION_OPERATOR :
 				setInteractionOperator((InteractionOperatorKind) newValue);
@@ -604,7 +607,8 @@
 			case UMLPackage.COMBINED_FRAGMENT__CFRAGMENT_GATE :
 				return cfragmentGates != null && !cfragmentGates.isEmpty();
 			case UMLPackage.COMBINED_FRAGMENT__INTERACTION_OPERATOR :
-				return (eFlags & INTERACTION_OPERATOR_EFLAG) != INTERACTION_OPERATOR_EFLAG_DEFAULT;
+				return (eFlags
+					& INTERACTION_OPERATOR_EFLAG) != INTERACTION_OPERATOR_EFLAG_DEFAULT;
 			case UMLPackage.COMBINED_FRAGMENT__OPERAND :
 				return operands != null && !operands.isEmpty();
 		}
@@ -668,7 +672,8 @@
 			case UMLPackage.COMBINED_FRAGMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.COMBINED_FRAGMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.COMBINED_FRAGMENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.COMBINED_FRAGMENT___GET_STEREOTYPE_APPLICATIONS :
@@ -676,7 +681,8 @@
 			case UMLPackage.COMBINED_FRAGMENT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.COMBINED_FRAGMENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.COMBINED_FRAGMENT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -765,8 +771,8 @@
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (interactionOperator: "); //$NON-NLS-1$
-		result
-			.append(INTERACTION_OPERATOR_EFLAG_VALUES[(eFlags & INTERACTION_OPERATOR_EFLAG) >>> INTERACTION_OPERATOR_EFLAG_OFFSET]);
+		result.append(INTERACTION_OPERATOR_EFLAG_VALUES[(eFlags
+			& INTERACTION_OPERATOR_EFLAG) >>> INTERACTION_OPERATOR_EFLAG_OFFSET]);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CommentImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CommentImpl.java
index 2e65676..da37124 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CommentImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CommentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 451350
+ *   Kenn Hussey (CEA) - 327039, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -201,18 +201,18 @@
 		switch (featureID) {
 			case UMLPackage.COMMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.COMMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.COMMENT__ANNOTATED_ELEMENT :
 				getAnnotatedElements().clear();
-				getAnnotatedElements().addAll(
-					(Collection<? extends Element>) newValue);
+				getAnnotatedElements()
+					.addAll((Collection<? extends Element>) newValue);
 				return;
 			case UMLPackage.COMMENT__BODY :
 				setBody((String) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CommunicationPathImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CommunicationPathImpl.java
index 91b9866..825d22d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CommunicationPathImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CommunicationPathImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -135,7 +135,8 @@
 			case UMLPackage.COMMUNICATION_PATH___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.COMMUNICATION_PATH___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.COMMUNICATION_PATH___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.COMMUNICATION_PATH___GET_STEREOTYPE_APPLICATIONS :
@@ -143,7 +144,8 @@
 			case UMLPackage.COMMUNICATION_PATH___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.COMMUNICATION_PATH___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.COMMUNICATION_PATH___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -232,13 +234,13 @@
 			case UMLPackage.COMMUNICATION_PATH___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.COMMUNICATION_PATH___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.COMMUNICATION_PATH___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.COMMUNICATION_PATH___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.COMMUNICATION_PATH___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.COMMUNICATION_PATH___MEMBERS_ARE_DISTINGUISHABLE :
@@ -258,10 +260,11 @@
 			case UMLPackage.COMMUNICATION_PATH___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.COMMUNICATION_PATH___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.COMMUNICATION_PATH___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.COMMUNICATION_PATH___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.COMMUNICATION_PATH___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentImpl.java
index aa6a29a..61788c8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -198,8 +198,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -228,8 +228,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setIsIndirectlyInstantiated(boolean newIsIndirectlyInstantiated) {
-		boolean oldIsIndirectlyInstantiated = (eFlags & IS_INDIRECTLY_INSTANTIATED_EFLAG) != 0;
+	public void setIsIndirectlyInstantiated(
+			boolean newIsIndirectlyInstantiated) {
+		boolean oldIsIndirectlyInstantiated = (eFlags
+			& IS_INDIRECTLY_INSTANTIATED_EFLAG) != 0;
 		if (newIsIndirectlyInstantiated)
 			eFlags |= IS_INDIRECTLY_INSTANTIATED_EFLAG;
 		else
@@ -303,8 +305,8 @@
 	 */
 	public boolean validateNoPackagedElements(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ComponentOperations.validateNoPackagedElements(this,
-			diagnostics, context);
+		return ComponentOperations.validateNoPackagedElements(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -371,8 +373,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PackageableElement createPackagedElement(String name, EClass eClass) {
-		PackageableElement newPackagedElement = (PackageableElement) create(eClass);
+	public PackageableElement createPackagedElement(String name,
+			EClass eClass) {
+		PackageableElement newPackagedElement = (PackageableElement) create(
+			eClass);
 		getPackagedElements().add(newPackagedElement);
 		if (name != null)
 			newPackagedElement.setName(name);
@@ -430,7 +434,8 @@
 	 * @generated
 	 */
 	public ComponentRealization createRealization(String name) {
-		ComponentRealization newRealization = (ComponentRealization) create(UMLPackage.Literals.COMPONENT_REALIZATION);
+		ComponentRealization newRealization = (ComponentRealization) create(
+			UMLPackage.Literals.COMPONENT_REALIZATION);
 		getRealizations().add(newRealization);
 		if (name != null)
 			newRealization.setName(name);
@@ -531,10 +536,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.COMPONENT__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.COMPONENT__TEMPLATE_BINDING :
@@ -543,8 +548,9 @@
 			case UMLPackage.COMPONENT__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.COMPONENT__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.COMPONENT__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -583,76 +589,76 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.COMPONENT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.COMPONENT__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.COMPONENT__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.COMPONENT__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.COMPONENT__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.COMPONENT__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__OWNED_CONNECTOR :
-				return ((InternalEList<?>) getOwnedConnectors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedConnectors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__INTERFACE_REALIZATION :
 				return ((InternalEList<?>) getInterfaceRealizations())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__OWNED_BEHAVIOR :
-				return ((InternalEList<?>) getOwnedBehaviors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedBehaviors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__NESTED_CLASSIFIER :
-				return ((InternalEList<?>) getNestedClassifiers()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedClassifiers())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__OWNED_RECEPTION :
-				return ((InternalEList<?>) getOwnedReceptions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedReceptions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__PACKAGED_ELEMENT :
-				return ((InternalEList<?>) getPackagedElements()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackagedElements())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT__REALIZATION :
-				return ((InternalEList<?>) getRealizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getRealizations())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -812,13 +818,13 @@
 		switch (featureID) {
 			case UMLPackage.COMPONENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.COMPONENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.COMPONENT__NAME :
 				setName((String) newValue);
@@ -831,18 +837,18 @@
 				return;
 			case UMLPackage.COMPONENT__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.COMPONENT__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.COMPONENT__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.COMPONENT__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -858,31 +864,31 @@
 				return;
 			case UMLPackage.COMPONENT__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.COMPONENT__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.COMPONENT__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.COMPONENT__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.COMPONENT__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.COMPONENT__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.COMPONENT__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -892,8 +898,8 @@
 				return;
 			case UMLPackage.COMPONENT__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.COMPONENT__USE_CASE :
 				getUseCases().clear();
@@ -901,26 +907,26 @@
 				return;
 			case UMLPackage.COMPONENT__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.COMPONENT__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.COMPONENT__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.COMPONENT__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.COMPONENT__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.COMPONENT__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -932,32 +938,31 @@
 				return;
 			case UMLPackage.COMPONENT__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.COMPONENT__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 			case UMLPackage.COMPONENT__IS_ACTIVE :
 				setIsActive((Boolean) newValue);
 				return;
 			case UMLPackage.COMPONENT__NESTED_CLASSIFIER :
 				getNestedClassifiers().clear();
-				getNestedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getNestedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.COMPONENT__OWNED_RECEPTION :
 				getOwnedReceptions().clear();
-				getOwnedReceptions().addAll(
-					(Collection<? extends Reception>) newValue);
+				getOwnedReceptions()
+					.addAll((Collection<? extends Reception>) newValue);
 				return;
 			case UMLPackage.COMPONENT__SUPER_CLASS :
 				getSuperClasses().clear();
-				getSuperClasses()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
+				getSuperClasses().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
 				return;
 			case UMLPackage.COMPONENT__IS_INDIRECTLY_INSTANTIATED :
 				setIsIndirectlyInstantiated((Boolean) newValue);
@@ -1090,7 +1095,8 @@
 				getSuperClasses().clear();
 				return;
 			case UMLPackage.COMPONENT__IS_INDIRECTLY_INSTANTIATED :
-				setIsIndirectlyInstantiated(IS_INDIRECTLY_INSTANTIATED_EDEFAULT);
+				setIsIndirectlyInstantiated(
+					IS_INDIRECTLY_INSTANTIATED_EDEFAULT);
 				return;
 			case UMLPackage.COMPONENT__PACKAGED_ELEMENT :
 				getPackagedElements().clear();
@@ -1178,7 +1184,8 @@
 			case UMLPackage.COMPONENT__IS_ABSTRACT :
 				return isSetIsAbstract();
 			case UMLPackage.COMPONENT__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.COMPONENT__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.COMPONENT__USE_CASE :
@@ -1221,7 +1228,8 @@
 			case UMLPackage.COMPONENT__SUPER_CLASS :
 				return isSetSuperClasses();
 			case UMLPackage.COMPONENT__IS_INDIRECTLY_INSTANTIATED :
-				return ((eFlags & IS_INDIRECTLY_INSTANTIATED_EFLAG) != 0) != IS_INDIRECTLY_INSTANTIATED_EDEFAULT;
+				return ((eFlags
+					& IS_INDIRECTLY_INSTANTIATED_EFLAG) != 0) != IS_INDIRECTLY_INSTANTIATED_EDEFAULT;
 			case UMLPackage.COMPONENT__PACKAGED_ELEMENT :
 				return packagedElements != null && !packagedElements.isEmpty();
 			case UMLPackage.COMPONENT__PROVIDED :
@@ -1291,7 +1299,8 @@
 			case UMLPackage.COMPONENT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.COMPONENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.COMPONENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.COMPONENT___GET_STEREOTYPE_APPLICATIONS :
@@ -1299,7 +1308,8 @@
 			case UMLPackage.COMPONENT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.COMPONENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.COMPONENT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1388,13 +1398,13 @@
 			case UMLPackage.COMPONENT___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.COMPONENT___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.COMPONENT___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.COMPONENT___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.COMPONENT___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.COMPONENT___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1414,10 +1424,11 @@
 			case UMLPackage.COMPONENT___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.COMPONENT___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.COMPONENT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.COMPONENT___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.COMPONENT___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1518,8 +1529,7 @@
 			case UMLPackage.COMPONENT___GET_OWNED_PORTS :
 				return getOwnedPorts();
 			case UMLPackage.COMPONENT___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.COMPONENT___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java
index 2134d69..79e377d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -116,7 +116,8 @@
 		if (clients == null) {
 			clients = new SubsetSupersetEObjectResolvingEList<NamedElement>(
 				NamedElement.class, this,
-				UMLPackage.COMPONENT_REALIZATION__CLIENT, null, CLIENT_ESUBSETS);
+				UMLPackage.COMPONENT_REALIZATION__CLIENT, null,
+				CLIENT_ESUBSETS);
 		}
 		return clients;
 	}
@@ -129,7 +130,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] CLIENT_ESUBSETS = new int[]{UMLPackage.COMPONENT_REALIZATION__REALIZING_CLASSIFIER};
+	protected static final int[] CLIENT_ESUBSETS = new int[]{
+		UMLPackage.COMPONENT_REALIZATION__REALIZING_CLASSIFIER};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -155,7 +157,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SUPPLIER_ESUBSETS = new int[]{UMLPackage.COMPONENT_REALIZATION__ABSTRACTION};
+	protected static final int[] SUPPLIER_ESUBSETS = new int[]{
+		UMLPackage.COMPONENT_REALIZATION__ABSTRACTION};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -207,7 +210,8 @@
 	 */
 	public void setAbstraction(Component newAbstraction) {
 		if (newAbstraction != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.COMPONENT_REALIZATION__ABSTRACTION && newAbstraction != null)) {
+			|| (eContainerFeatureID() != UMLPackage.COMPONENT_REALIZATION__ABSTRACTION
+				&& newAbstraction != null)) {
 			if (EcoreUtil.isAncestor(this, newAbstraction))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -249,7 +253,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REALIZING_CLASSIFIER_ESUPERSETS = new int[]{UMLPackage.COMPONENT_REALIZATION__CLIENT};
+	protected static final int[] REALIZING_CLASSIFIER_ESUPERSETS = new int[]{
+		UMLPackage.COMPONENT_REALIZATION__CLIENT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -299,10 +304,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.COMPONENT_REALIZATION__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.COMPONENT_REALIZATION__ABSTRACTION :
@@ -323,11 +328,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.COMPONENT_REALIZATION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT_REALIZATION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.COMPONENT_REALIZATION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.COMPONENT_REALIZATION__OWNING_TEMPLATE_PARAMETER :
@@ -439,13 +444,13 @@
 		switch (featureID) {
 			case UMLPackage.COMPONENT_REALIZATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.COMPONENT_REALIZATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.COMPONENT_REALIZATION__NAME :
 				setName((String) newValue);
@@ -464,21 +469,21 @@
 				return;
 			case UMLPackage.COMPONENT_REALIZATION__CLIENT :
 				getClients().clear();
-				getClients().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getClients()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.COMPONENT_REALIZATION__SUPPLIER :
 				getSuppliers().clear();
-				getSuppliers().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getSuppliers()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.COMPONENT_REALIZATION__MAPPING :
 				setMapping((OpaqueExpression) newValue);
 				return;
 			case UMLPackage.COMPONENT_REALIZATION__REALIZING_CLASSIFIER :
 				getRealizingClassifiers().clear();
-				getRealizingClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRealizingClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.COMPONENT_REALIZATION__ABSTRACTION :
 				setAbstraction((Component) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConditionalNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConditionalNodeImpl.java
index 75e72b3..34ea857 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConditionalNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConditionalNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 397139, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 397139, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -180,8 +180,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -291,7 +291,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		getResults().add(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -368,8 +369,8 @@
 	 */
 	public boolean validateOneClauseWithExecutableNode(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return ConditionalNodeOperations.validateOneClauseWithExecutableNode(
-			this, diagnostics, context);
+		return ConditionalNodeOperations
+			.validateOneClauseWithExecutableNode(this, diagnostics, context);
 	}
 
 	/**
@@ -436,11 +437,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CONDITIONAL_NODE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONDITIONAL_NODE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONDITIONAL_NODE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CONDITIONAL_NODE__IN_INTERRUPTIBLE_REGION :
@@ -449,14 +450,14 @@
 			case UMLPackage.CONDITIONAL_NODE__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.CONDITIONAL_NODE__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CONDITIONAL_NODE__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CONDITIONAL_NODE__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONDITIONAL_NODE__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -467,14 +468,14 @@
 				return ((InternalEList<?>) getLocalPreconditions())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONDITIONAL_NODE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONDITIONAL_NODE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONDITIONAL_NODE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONDITIONAL_NODE__EDGE :
 				return ((InternalEList<?>) getEdges()).basicRemove(otherEnd,
 					msgs);
@@ -485,8 +486,8 @@
 				return ((InternalEList<?>) getStructuredNodeOutputs())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONDITIONAL_NODE__VARIABLE :
-				return ((InternalEList<?>) getVariables()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getVariables()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CONDITIONAL_NODE__NODE :
 				return ((InternalEList<?>) getNodes()).basicRemove(otherEnd,
 					msgs);
@@ -637,13 +638,13 @@
 		switch (featureID) {
 			case UMLPackage.CONDITIONAL_NODE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__NAME :
 				setName((String) newValue);
@@ -662,65 +663,64 @@
 				return;
 			case UMLPackage.CONDITIONAL_NODE__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__IN_ACTIVITY :
 				setInActivity((Activity) newValue);
@@ -735,13 +735,13 @@
 				return;
 			case UMLPackage.CONDITIONAL_NODE__STRUCTURED_NODE_INPUT :
 				getStructuredNodeInputs().clear();
-				getStructuredNodeInputs().addAll(
-					(Collection<? extends InputPin>) newValue);
+				getStructuredNodeInputs()
+					.addAll((Collection<? extends InputPin>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__STRUCTURED_NODE_OUTPUT :
 				getStructuredNodeOutputs().clear();
-				getStructuredNodeOutputs().addAll(
-					(Collection<? extends OutputPin>) newValue);
+				getStructuredNodeOutputs()
+					.addAll((Collection<? extends OutputPin>) newValue);
 				return;
 			case UMLPackage.CONDITIONAL_NODE__VARIABLE :
 				getVariables().clear();
@@ -936,7 +936,8 @@
 			case UMLPackage.CONDITIONAL_NODE__INPUT :
 				return isSetInputs();
 			case UMLPackage.CONDITIONAL_NODE__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.CONDITIONAL_NODE__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -970,7 +971,8 @@
 			case UMLPackage.CONDITIONAL_NODE__EDGE :
 				return edges != null && !edges.isEmpty();
 			case UMLPackage.CONDITIONAL_NODE__MUST_ISOLATE :
-				return ((eFlags & MUST_ISOLATE_EFLAG) != 0) != MUST_ISOLATE_EDEFAULT;
+				return ((eFlags
+					& MUST_ISOLATE_EFLAG) != 0) != MUST_ISOLATE_EDEFAULT;
 			case UMLPackage.CONDITIONAL_NODE__STRUCTURED_NODE_INPUT :
 				return structuredNodeInputs != null
 					&& !structuredNodeInputs.isEmpty();
@@ -983,9 +985,11 @@
 			case UMLPackage.CONDITIONAL_NODE__CLAUSE :
 				return clauses != null && !clauses.isEmpty();
 			case UMLPackage.CONDITIONAL_NODE__IS_ASSURED :
-				return ((eFlags & IS_ASSURED_EFLAG) != 0) != IS_ASSURED_EDEFAULT;
+				return ((eFlags
+					& IS_ASSURED_EFLAG) != 0) != IS_ASSURED_EDEFAULT;
 			case UMLPackage.CONDITIONAL_NODE__IS_DETERMINATE :
-				return ((eFlags & IS_DETERMINATE_EFLAG) != 0) != IS_DETERMINATE_EDEFAULT;
+				return ((eFlags
+					& IS_DETERMINATE_EFLAG) != 0) != IS_DETERMINATE_EDEFAULT;
 			case UMLPackage.CONDITIONAL_NODE__RESULT :
 				return isSetResults();
 		}
@@ -1049,7 +1053,8 @@
 			case UMLPackage.CONDITIONAL_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CONDITIONAL_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONDITIONAL_NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CONDITIONAL_NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -1057,7 +1062,8 @@
 			case UMLPackage.CONDITIONAL_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CONDITIONAL_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONDITIONAL_NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1134,8 +1140,8 @@
 			case UMLPackage.CONDITIONAL_NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.CONDITIONAL_NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.CONDITIONAL_NODE___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.CONDITIONAL_NODE___GET_CONTEXT :
@@ -1173,20 +1179,19 @@
 			case UMLPackage.CONDITIONAL_NODE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.CONDITIONAL_NODE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.CONDITIONAL_NODE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.CONDITIONAL_NODE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.CONDITIONAL_NODE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.CONDITIONAL_NODE___MEMBERS_ARE_DISTINGUISHABLE :
 				return membersAreDistinguishable();
 			case UMLPackage.CONDITIONAL_NODE___VALIDATE_NODES_AND_EDGES__DIAGNOSTICCHAIN_MAP :
-				return validateNodesAndEdges(
-					(DiagnosticChain) arguments.get(0),
+				return validateNodesAndEdges((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.CONDITIONAL_NODE___VALIDATE_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP :
 				return validateNotContained((DiagnosticChain) arguments.get(0),
@@ -1199,8 +1204,7 @@
 				return validateEdges((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.CONDITIONAL_NODE___VALIDATE_INPUT_PIN_EDGES__DIAGNOSTICCHAIN_MAP :
-				return validateInputPinEdges(
-					(DiagnosticChain) arguments.get(0),
+				return validateInputPinEdges((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.CONDITIONAL_NODE___SOURCE_NODES :
 				return sourceNodes();
@@ -1305,7 +1309,8 @@
 		return false;
 	}
 
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.CONDITIONAL_NODE__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.CONDITIONAL_NODE__RESULT};
 
 	@Override
 	public EList<OutputPin> getOutputs() {
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementImpl.java
index 2ba003e..181e5e0 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -121,7 +121,8 @@
 	public TemplateParameter getTemplateParameter() {
 		if (templateParameter != null && templateParameter.eIsProxy()) {
 			InternalEObject oldTemplateParameter = (InternalEObject) templateParameter;
-			templateParameter = (TemplateParameter) eResolveProxy(oldTemplateParameter);
+			templateParameter = (TemplateParameter) eResolveProxy(
+				oldTemplateParameter);
 			if (templateParameter != oldTemplateParameter) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -254,7 +255,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetOwningTemplateParameter(
-			TemplateParameter newOwningTemplateParameter, NotificationChain msgs) {
+			TemplateParameter newOwningTemplateParameter,
+			NotificationChain msgs) {
 		msgs = eBasicSetContainer((InternalEObject) newOwningTemplateParameter,
 			UMLPackage.CONNECTABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER, msgs);
 		Resource.Internal eInternalResource = eInternalResource();
@@ -276,7 +278,8 @@
 	public void setOwningTemplateParameter(
 			TemplateParameter newOwningTemplateParameter) {
 		if (newOwningTemplateParameter != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.CONNECTABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
+			|| (eContainerFeatureID() != UMLPackage.CONNECTABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER
+				&& newOwningTemplateParameter != null)) {
 			if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -285,8 +288,7 @@
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newOwningTemplateParameter != null)
 				msgs = ((InternalEObject) newOwningTemplateParameter)
-					.eInverseAdd(
-						this,
+					.eInverseAdd(this,
 						UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 						TemplateParameter.class, msgs);
 			msgs = basicSetOwningTemplateParameter(newOwningTemplateParameter,
@@ -346,10 +348,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.CONNECTABLE_ELEMENT__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 		}
@@ -366,11 +368,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CONNECTABLE_ELEMENT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONNECTABLE_ELEMENT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONNECTABLE_ELEMENT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CONNECTABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER :
@@ -461,13 +463,13 @@
 		switch (featureID) {
 			case UMLPackage.CONNECTABLE_ELEMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CONNECTABLE_ELEMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CONNECTABLE_ELEMENT__NAME :
 				setName((String) newValue);
@@ -575,7 +577,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == ParameterableElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.CONNECTABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER :
@@ -595,7 +598,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == ParameterableElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER :
@@ -686,7 +690,8 @@
 			case UMLPackage.CONNECTABLE_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CONNECTABLE_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONNECTABLE_ELEMENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CONNECTABLE_ELEMENT___GET_STEREOTYPE_APPLICATIONS :
@@ -694,7 +699,8 @@
 			case UMLPackage.CONNECTABLE_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CONNECTABLE_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONNECTABLE_ELEMENT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -757,7 +763,8 @@
 			case UMLPackage.CONNECTABLE_ELEMENT___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.CONNECTABLE_ELEMENT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.CONNECTABLE_ELEMENT___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.CONNECTABLE_ELEMENT___GET_ENDS :
@@ -787,8 +794,8 @@
 	 */
 	@Override
 	public boolean isSetOwner() {
-		return super.isSetOwner()
-			|| eIsSet(UMLPackage.CONNECTABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER);
+		return super.isSetOwner() || eIsSet(
+			UMLPackage.CONNECTABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER);
 	}
 
 } //ConnectableElementImpl
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementTemplateParameterImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementTemplateParameterImpl.java
index 9c2e138..0d8f5e2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementTemplateParameterImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectableElementTemplateParameterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -76,12 +76,11 @@
 	public ParameterableElement getParameteredElement() {
 		if (parameteredElement != null && parameteredElement.eIsProxy()) {
 			InternalEObject oldParameteredElement = (InternalEObject) parameteredElement;
-			parameteredElement = (ParameterableElement) eResolveProxy(oldParameteredElement);
+			parameteredElement = (ParameterableElement) eResolveProxy(
+				oldParameteredElement);
 			if (parameteredElement != oldParameteredElement) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
 						oldParameteredElement, parameteredElement));
 			}
@@ -105,7 +104,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetParameteredElementGen(
-			ParameterableElement newParameteredElement, NotificationChain msgs) {
+			ParameterableElement newParameteredElement,
+			NotificationChain msgs) {
 		if (newParameteredElement != null
 			&& !(newParameteredElement instanceof ConnectableElement)) {
 			throw new IllegalArgumentException(
@@ -114,8 +114,7 @@
 		ParameterableElement oldParameteredElement = parameteredElement;
 		parameteredElement = newParameteredElement;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(
-				this,
+			ENotificationImpl notification = new ENotificationImpl(this,
 				Notification.SET,
 				UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
 				oldParameteredElement, newParameteredElement);
@@ -129,7 +128,8 @@
 
 	@Override
 	public NotificationChain basicSetParameteredElement(
-			ParameterableElement newParameteredElement, NotificationChain msgs) {
+			ParameterableElement newParameteredElement,
+			NotificationChain msgs) {
 		msgs = basicSetParameteredElementGen(newParameteredElement, msgs);
 
 		Resource.Internal eInternalResource = eInternalResource();
@@ -152,7 +152,8 @@
 	 * @generated
 	 */
 	@Override
-	public void setParameteredElement(ParameterableElement newParameteredElement) {
+	public void setParameteredElement(
+			ParameterableElement newParameteredElement) {
 		if (newParameteredElement != null
 			&& !(newParameteredElement instanceof ConnectableElement)) {
 			throw new IllegalArgumentException(
@@ -172,9 +173,7 @@
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(
-				this,
-				Notification.SET,
+			eNotify(new ENotificationImpl(this, Notification.SET,
 				UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
 				newParameteredElement, newParameteredElement));
 	}
@@ -204,8 +203,7 @@
 			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT :
 				if (parameteredElement != null)
 					msgs = ((InternalEObject) parameteredElement)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							UMLPackage.PARAMETERABLE_ELEMENT__TEMPLATE_PARAMETER,
 							ParameterableElement.class, msgs);
 				return basicSetParameteredElement(
@@ -217,8 +215,7 @@
 			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT :
 				if (ownedParameteredElement != null)
 					msgs = ((InternalEObject) ownedParameteredElement)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							EOPPOSITE_FEATURE_BASE
 								- UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 							null, msgs);
@@ -238,11 +235,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_DEFAULT :
 				return basicSetOwnedDefault(null, msgs);
 			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT :
@@ -308,13 +305,13 @@
 		switch (featureID) {
 			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__DEFAULT :
 				setDefault((ParameterableElement) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectionPointReferenceImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectionPointReferenceImpl.java
index 5ae1116..d5e04f4 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectionPointReferenceImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectionPointReferenceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -237,7 +237,8 @@
 	 */
 	public void setState(State newState) {
 		if (newState != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.CONNECTION_POINT_REFERENCE__STATE && newState != null)) {
+			|| (eContainerFeatureID() != UMLPackage.CONNECTION_POINT_REFERENCE__STATE
+				&& newState != null)) {
 			if (EcoreUtil.isAncestor(this, newState))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -263,8 +264,8 @@
 	 */
 	public boolean validateEntryPseudostates(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ConnectionPointReferenceOperations.validateEntryPseudostates(
-			this, diagnostics, context);
+		return ConnectionPointReferenceOperations
+			.validateEntryPseudostates(this, diagnostics, context);
 	}
 
 	/**
@@ -274,8 +275,8 @@
 	 */
 	public boolean validateExitPseudostates(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ConnectionPointReferenceOperations.validateExitPseudostates(
-			this, diagnostics, context);
+		return ConnectionPointReferenceOperations.validateExitPseudostates(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -313,11 +314,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CONNECTION_POINT_REFERENCE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONNECTION_POINT_REFERENCE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONNECTION_POINT_REFERENCE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CONNECTION_POINT_REFERENCE__CONTAINER :
@@ -412,13 +413,13 @@
 		switch (featureID) {
 			case UMLPackage.CONNECTION_POINT_REFERENCE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CONNECTION_POINT_REFERENCE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CONNECTION_POINT_REFERENCE__NAME :
 				setName((String) newValue);
@@ -434,8 +435,8 @@
 				return;
 			case UMLPackage.CONNECTION_POINT_REFERENCE__ENTRY :
 				getEntries().clear();
-				getEntries().addAll(
-					(Collection<? extends Pseudostate>) newValue);
+				getEntries()
+					.addAll((Collection<? extends Pseudostate>) newValue);
 				return;
 			case UMLPackage.CONNECTION_POINT_REFERENCE__EXIT :
 				getExits().clear();
@@ -590,7 +591,8 @@
 			case UMLPackage.CONNECTION_POINT_REFERENCE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CONNECTION_POINT_REFERENCE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONNECTION_POINT_REFERENCE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CONNECTION_POINT_REFERENCE___GET_STEREOTYPE_APPLICATIONS :
@@ -598,7 +600,8 @@
 			case UMLPackage.CONNECTION_POINT_REFERENCE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CONNECTION_POINT_REFERENCE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONNECTION_POINT_REFERENCE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorEndImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorEndImpl.java
index d666c5c..ce67cf5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorEndImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorEndImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -305,13 +305,13 @@
 		switch (featureID) {
 			case UMLPackage.CONNECTOR_END__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CONNECTOR_END__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CONNECTOR_END__IS_ORDERED :
 				setIsOrdered((Boolean) newValue);
@@ -400,7 +400,8 @@
 			case UMLPackage.CONNECTOR_END__OWNER :
 				return isSetOwner();
 			case UMLPackage.CONNECTOR_END__IS_ORDERED :
-				return ((eFlags & IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
+				return ((eFlags
+					& IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
 			case UMLPackage.CONNECTOR_END__IS_UNIQUE :
 				return ((eFlags & IS_UNIQUE_EFLAG) != 0) != IS_UNIQUE_EDEFAULT;
 			case UMLPackage.CONNECTOR_END__LOWER :
@@ -478,7 +479,8 @@
 			case UMLPackage.CONNECTOR_END___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CONNECTOR_END___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONNECTOR_END___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CONNECTOR_END___GET_STEREOTYPE_APPLICATIONS :
@@ -486,7 +488,8 @@
 			case UMLPackage.CONNECTOR_END___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CONNECTOR_END___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONNECTOR_END___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -544,8 +547,8 @@
 			case UMLPackage.CONNECTOR_END___COMPATIBLE_WITH__MULTIPLICITYELEMENT :
 				return compatibleWith((MultiplicityElement) arguments.get(0));
 			case UMLPackage.CONNECTOR_END___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT :
-				return includesMultiplicity((MultiplicityElement) arguments
-					.get(0));
+				return includesMultiplicity(
+					(MultiplicityElement) arguments.get(0));
 			case UMLPackage.CONNECTOR_END___IS__INT_INT :
 				return is((Integer) arguments.get(0),
 					(Integer) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorImpl.java
index 1e1c5b4..9afc095 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConnectorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -164,21 +164,19 @@
 				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT);
 			if (redefinedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
-						redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
-							RedefinableElement.class, this,
-							UMLPackage.CONNECTOR__REDEFINED_ELEMENT,
-							REDEFINED_ELEMENT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
+					redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
+						RedefinableElement.class, this,
+						UMLPackage.CONNECTOR__REDEFINED_ELEMENT,
+						REDEFINED_ELEMENT_ESUBSETS));
 			}
 			return redefinedElements;
 		}
 		return new DerivedUnionEObjectEList<RedefinableElement>(
 			RedefinableElement.class, this,
-			UMLPackage.CONNECTOR__REDEFINED_ELEMENT, REDEFINED_ELEMENT_ESUBSETS);
+			UMLPackage.CONNECTOR__REDEFINED_ELEMENT,
+			REDEFINED_ELEMENT_ESUBSETS);
 	}
 
 	/**
@@ -192,8 +190,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -306,7 +304,8 @@
 	 * @generated
 	 */
 	public ConnectorEnd createEnd() {
-		ConnectorEnd newEnd = (ConnectorEnd) create(UMLPackage.Literals.CONNECTOR_END);
+		ConnectorEnd newEnd = (ConnectorEnd) create(
+			UMLPackage.Literals.CONNECTOR_END);
 		getEnds().add(newEnd);
 		return newEnd;
 	}
@@ -347,7 +346,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Behavior getContract(String name, boolean ignoreCase, EClass eClass) {
+	public Behavior getContract(String name, boolean ignoreCase,
+			EClass eClass) {
 		contractLoop : for (Behavior contract : getContracts()) {
 			if (eClass != null && !eClass.isInstance(contract))
 				continue contractLoop;
@@ -390,11 +390,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CONNECTOR__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONNECTOR__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONNECTOR__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CONNECTOR__END :
@@ -475,13 +475,13 @@
 		switch (featureID) {
 			case UMLPackage.CONNECTOR__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CONNECTOR__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CONNECTOR__NAME :
 				setName((String) newValue);
@@ -509,8 +509,8 @@
 				return;
 			case UMLPackage.CONNECTOR__REDEFINED_CONNECTOR :
 				getRedefinedConnectors().clear();
-				getRedefinedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getRedefinedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.CONNECTOR__TYPE :
 				setType((Association) newValue);
@@ -676,7 +676,8 @@
 			case UMLPackage.CONNECTOR___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CONNECTOR___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONNECTOR___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CONNECTOR___GET_STEREOTYPE_APPLICATIONS :
@@ -684,7 +685,8 @@
 			case UMLPackage.CONNECTOR___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CONNECTOR___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONNECTOR___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -761,8 +763,8 @@
 			case UMLPackage.CONNECTOR___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.CONNECTOR___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.CONNECTOR___VALIDATE_TYPES__DIAGNOSTICCHAIN_MAP :
 				return validateTypes((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
@@ -806,7 +808,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{UMLPackage.CONNECTOR__REDEFINED_CONNECTOR};
+	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{
+		UMLPackage.CONNECTOR__REDEFINED_CONNECTOR};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConsiderIgnoreFragmentImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConsiderIgnoreFragmentImpl.java
index dd71462..211a8d4 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConsiderIgnoreFragmentImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConsiderIgnoreFragmentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -222,13 +222,13 @@
 		switch (featureID) {
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT__NAME :
 				setName((String) newValue);
@@ -251,13 +251,13 @@
 				return;
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT__CFRAGMENT_GATE :
 				getCfragmentGates().clear();
-				getCfragmentGates().addAll(
-					(Collection<? extends Gate>) newValue);
+				getCfragmentGates()
+					.addAll((Collection<? extends Gate>) newValue);
 				return;
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT__INTERACTION_OPERATOR :
 				setInteractionOperator((InteractionOperatorKind) newValue);
@@ -269,8 +269,8 @@
 				return;
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT__MESSAGE :
 				getMessages().clear();
-				getMessages().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getMessages()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -368,7 +368,8 @@
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT__CFRAGMENT_GATE :
 				return cfragmentGates != null && !cfragmentGates.isEmpty();
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT__INTERACTION_OPERATOR :
-				return (eFlags & INTERACTION_OPERATOR_EFLAG) != INTERACTION_OPERATOR_EFLAG_DEFAULT;
+				return (eFlags
+					& INTERACTION_OPERATOR_EFLAG) != INTERACTION_OPERATOR_EFLAG_DEFAULT;
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT__OPERAND :
 				return operands != null && !operands.isEmpty();
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT__MESSAGE :
@@ -434,7 +435,8 @@
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT___GET_STEREOTYPE_APPLICATIONS :
@@ -442,7 +444,8 @@
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONSIDER_IGNORE_FRAGMENT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConstraintImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConstraintImpl.java
index bca2634..8a33f34 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConstraintImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ConstraintImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -126,8 +126,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -150,7 +150,8 @@
 	public EList<Element> getConstrainedElements() {
 		if (constrainedElements == null) {
 			constrainedElements = new EObjectResolvingEList<Element>(
-				Element.class, this, UMLPackage.CONSTRAINT__CONSTRAINED_ELEMENT);
+				Element.class, this,
+				UMLPackage.CONSTRAINT__CONSTRAINED_ELEMENT);
 		}
 		return constrainedElements;
 	}
@@ -163,16 +164,20 @@
 	public ValueSpecification getSpecification() {
 		if (specification != null && specification.eIsProxy()) {
 			InternalEObject oldSpecification = (InternalEObject) specification;
-			specification = (ValueSpecification) eResolveProxy(oldSpecification);
+			specification = (ValueSpecification) eResolveProxy(
+				oldSpecification);
 			if (specification != oldSpecification) {
 				InternalEObject newSpecification = (InternalEObject) specification;
 				NotificationChain msgs = oldSpecification.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CONSTRAINT__SPECIFICATION, null, null);
+						- UMLPackage.CONSTRAINT__SPECIFICATION,
+					null, null);
 				if (newSpecification.eInternalContainer() == null) {
-					msgs = newSpecification.eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.CONSTRAINT__SPECIFICATION, null, msgs);
+					msgs = newSpecification
+						.eInverseAdd(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.CONSTRAINT__SPECIFICATION,
+							null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -226,11 +231,13 @@
 			if (specification != null)
 				msgs = ((InternalEObject) specification).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CONSTRAINT__SPECIFICATION, null, msgs);
+						- UMLPackage.CONSTRAINT__SPECIFICATION,
+					null, msgs);
 			if (newSpecification != null)
 				msgs = ((InternalEObject) newSpecification).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CONSTRAINT__SPECIFICATION, null, msgs);
+						- UMLPackage.CONSTRAINT__SPECIFICATION,
+					null, msgs);
 			msgs = basicSetSpecification(newSpecification, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -247,7 +254,8 @@
 	 */
 	public ValueSpecification createSpecification(String name, Type type,
 			EClass eClass) {
-		ValueSpecification newSpecification = (ValueSpecification) create(eClass);
+		ValueSpecification newSpecification = (ValueSpecification) create(
+			eClass);
 		setSpecification(newSpecification);
 		if (name != null)
 			newSpecification.setName(name);
@@ -297,7 +305,8 @@
 	 */
 	public void setContext(Namespace newContext) {
 		if (newContext != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.CONSTRAINT__CONTEXT && newContext != null)) {
+			|| (eContainerFeatureID() != UMLPackage.CONSTRAINT__CONTEXT
+				&& newContext != null)) {
 			if (EcoreUtil.isAncestor(this, newContext))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -368,10 +377,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.CONSTRAINT__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.CONSTRAINT__CONTEXT :
@@ -392,11 +401,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CONSTRAINT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONSTRAINT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CONSTRAINT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CONSTRAINT__OWNING_TEMPLATE_PARAMETER :
@@ -498,13 +507,13 @@
 		switch (featureID) {
 			case UMLPackage.CONSTRAINT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CONSTRAINT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CONSTRAINT__NAME :
 				setName((String) newValue);
@@ -523,8 +532,8 @@
 				return;
 			case UMLPackage.CONSTRAINT__CONSTRAINED_ELEMENT :
 				getConstrainedElements().clear();
-				getConstrainedElements().addAll(
-					(Collection<? extends Element>) newValue);
+				getConstrainedElements()
+					.addAll((Collection<? extends Element>) newValue);
 				return;
 			case UMLPackage.CONSTRAINT__CONTEXT :
 				setContext((Namespace) newValue);
@@ -680,7 +689,8 @@
 			case UMLPackage.CONSTRAINT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CONSTRAINT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONSTRAINT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CONSTRAINT___GET_STEREOTYPE_APPLICATIONS :
@@ -688,7 +698,8 @@
 			case UMLPackage.CONSTRAINT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CONSTRAINT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONSTRAINT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -751,7 +762,8 @@
 			case UMLPackage.CONSTRAINT___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.CONSTRAINT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.CONSTRAINT___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.CONSTRAINT___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -762,8 +774,7 @@
 				return validateBooleanValue((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.CONSTRAINT___VALIDATE_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP :
-				return validateNoSideEffects(
-					(DiagnosticChain) arguments.get(0),
+				return validateNoSideEffects((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.CONSTRAINT___VALIDATE_NOT_APPLY_TO_SELF__DIAGNOSTICCHAIN_MAP :
 				return validateNotApplyToSelf(
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ContinuationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ContinuationImpl.java
index 803c709..a95a47e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ContinuationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ContinuationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -142,8 +142,8 @@
 	 */
 	public boolean validateGlobal(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ContinuationOperations
-			.validateGlobal(this, diagnostics, context);
+		return ContinuationOperations.validateGlobal(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -153,8 +153,8 @@
 	 */
 	public boolean validateFirstOrLastInteractionFragment(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return ContinuationOperations.validateFirstOrLastInteractionFragment(
-			this, diagnostics, context);
+		return ContinuationOperations
+			.validateFirstOrLastInteractionFragment(this, diagnostics, context);
 	}
 
 	/**
@@ -220,13 +220,13 @@
 		switch (featureID) {
 			case UMLPackage.CONTINUATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CONTINUATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CONTINUATION__NAME :
 				setName((String) newValue);
@@ -249,8 +249,8 @@
 				return;
 			case UMLPackage.CONTINUATION__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.CONTINUATION__SETTING :
 				setSetting((Boolean) newValue);
@@ -402,7 +402,8 @@
 			case UMLPackage.CONTINUATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CONTINUATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONTINUATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CONTINUATION___GET_STEREOTYPE_APPLICATIONS :
@@ -410,7 +411,8 @@
 			case UMLPackage.CONTINUATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CONTINUATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONTINUATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ControlFlowImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ControlFlowImpl.java
index fb4aadf..74dc144 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ControlFlowImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ControlFlowImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -128,7 +128,8 @@
 			case UMLPackage.CONTROL_FLOW___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CONTROL_FLOW___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONTROL_FLOW___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CONTROL_FLOW___GET_STEREOTYPE_APPLICATIONS :
@@ -136,7 +137,8 @@
 			case UMLPackage.CONTROL_FLOW___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CONTROL_FLOW___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CONTROL_FLOW___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -213,8 +215,8 @@
 			case UMLPackage.CONTROL_FLOW___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.CONTROL_FLOW___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.CONTROL_FLOW___VALIDATE_SOURCE_AND_TARGET__DIAGNOSTICCHAIN_MAP :
 				return validateSourceAndTarget(
 					(DiagnosticChain) arguments.get(0),
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateLinkActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateLinkActionImpl.java
index 126d67d..e21c8d6 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateLinkActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateLinkActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -109,7 +109,8 @@
 	 */
 	@Override
 	public LinkEndData createEndData() {
-		LinkEndCreationData newEndData = (LinkEndCreationData) create(UMLPackage.Literals.LINK_END_CREATION_DATA);
+		LinkEndCreationData newEndData = (LinkEndCreationData) create(
+			UMLPackage.Literals.LINK_END_CREATION_DATA);
 		getEndData().add(newEndData);
 		return newEndData;
 	}
@@ -144,11 +145,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CREATE_LINK_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CREATE_LINK_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CREATE_LINK_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CREATE_LINK_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -157,14 +158,14 @@
 			case UMLPackage.CREATE_LINK_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.CREATE_LINK_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CREATE_LINK_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CREATE_LINK_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CREATE_LINK_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -178,8 +179,8 @@
 				return ((InternalEList<?>) getEndData()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.CREATE_LINK_ACTION__INPUT_VALUE :
-				return ((InternalEList<?>) getInputValues()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInputValues())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -279,13 +280,13 @@
 		switch (featureID) {
 			case UMLPackage.CREATE_LINK_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__NAME :
 				setName((String) newValue);
@@ -304,60 +305,59 @@
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__END_DATA :
 				getEndData().clear();
-				getEndData().addAll(
-					(Collection<? extends LinkEndData>) newValue);
+				getEndData()
+					.addAll((Collection<? extends LinkEndData>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_ACTION__INPUT_VALUE :
 				getInputValues().clear();
-				getInputValues().addAll(
-					(Collection<? extends InputPin>) newValue);
+				getInputValues()
+					.addAll((Collection<? extends InputPin>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -492,7 +492,8 @@
 			case UMLPackage.CREATE_LINK_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.CREATE_LINK_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.CREATE_LINK_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -566,7 +567,8 @@
 			case UMLPackage.CREATE_LINK_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CREATE_LINK_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CREATE_LINK_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CREATE_LINK_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -574,7 +576,8 @@
 			case UMLPackage.CREATE_LINK_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CREATE_LINK_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CREATE_LINK_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -651,8 +654,8 @@
 			case UMLPackage.CREATE_LINK_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.CREATE_LINK_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.CREATE_LINK_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.CREATE_LINK_ACTION___GET_CONTEXT :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateLinkObjectActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateLinkObjectActionImpl.java
index 2d328c1..ac1b5cd 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateLinkObjectActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateLinkObjectActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -147,19 +147,20 @@
 				InternalEObject newResult = (InternalEObject) result;
 				NotificationChain msgs = oldResult.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT, null,
-					null);
+						- UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT,
+					null, null);
 				if (newResult.eInternalContainer() == null) {
-					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT, null,
-						msgs);
+					msgs = newResult.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT,
-						oldResult, result));
+						UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT, oldResult,
+						result));
 			}
 		}
 		return result;
@@ -206,13 +207,13 @@
 			if (result != null)
 				msgs = ((InternalEObject) result).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT, null,
-					msgs);
+						- UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT,
+					null, msgs);
 			if (newResult != null)
 				msgs = ((InternalEObject) newResult).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT, null,
-					msgs);
+						- UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT,
+					null, msgs);
 			msgs = basicSetResult(newResult, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -228,7 +229,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -280,11 +282,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -293,14 +295,14 @@
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -314,8 +316,8 @@
 				return ((InternalEList<?>) getEndData()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__INPUT_VALUE :
-				return ((InternalEList<?>) getInputValues()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInputValues())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT :
 				return basicSetResult(null, msgs);
 		}
@@ -421,13 +423,13 @@
 		switch (featureID) {
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__NAME :
 				setName((String) newValue);
@@ -446,60 +448,59 @@
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__END_DATA :
 				getEndData().clear();
-				getEndData().addAll(
-					(Collection<? extends LinkEndData>) newValue);
+				getEndData()
+					.addAll((Collection<? extends LinkEndData>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__INPUT_VALUE :
 				getInputValues().clear();
-				getInputValues().addAll(
-					(Collection<? extends InputPin>) newValue);
+				getInputValues()
+					.addAll((Collection<? extends InputPin>) newValue);
 				return;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT :
 				setResult((OutputPin) newValue);
@@ -640,7 +641,8 @@
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -716,7 +718,8 @@
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -724,7 +727,8 @@
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -801,8 +805,8 @@
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.CREATE_LINK_OBJECT_ACTION___GET_CONTEXT :
@@ -854,7 +858,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.CREATE_LINK_OBJECT_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateObjectActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateObjectActionImpl.java
index 3f25bd4..64ac379 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateObjectActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/CreateObjectActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -197,12 +197,16 @@
 			result = (OutputPin) eResolveProxy(oldResult);
 			if (result != oldResult) {
 				InternalEObject newResult = (InternalEObject) result;
-				NotificationChain msgs = oldResult.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CREATE_OBJECT_ACTION__RESULT, null, null);
+				NotificationChain msgs = oldResult
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.CREATE_OBJECT_ACTION__RESULT,
+						null, null);
 				if (newResult.eInternalContainer() == null) {
-					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CREATE_OBJECT_ACTION__RESULT, null, msgs);
+					msgs = newResult.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.CREATE_OBJECT_ACTION__RESULT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -254,13 +258,17 @@
 		if (newResult != result) {
 			NotificationChain msgs = null;
 			if (result != null)
-				msgs = ((InternalEObject) result).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CREATE_OBJECT_ACTION__RESULT, null, msgs);
+				msgs = ((InternalEObject) result)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.CREATE_OBJECT_ACTION__RESULT,
+						null, msgs);
 			if (newResult != null)
-				msgs = ((InternalEObject) newResult).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.CREATE_OBJECT_ACTION__RESULT, null, msgs);
+				msgs = ((InternalEObject) newResult)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.CREATE_OBJECT_ACTION__RESULT,
+						null, msgs);
 			msgs = basicSetResult(newResult, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -275,7 +283,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -338,11 +347,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.CREATE_OBJECT_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CREATE_OBJECT_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CREATE_OBJECT_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.CREATE_OBJECT_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -351,14 +360,14 @@
 			case UMLPackage.CREATE_OBJECT_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.CREATE_OBJECT_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CREATE_OBJECT_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.CREATE_OBJECT_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.CREATE_OBJECT_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -473,13 +482,13 @@
 		switch (featureID) {
 			case UMLPackage.CREATE_OBJECT_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.CREATE_OBJECT_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.CREATE_OBJECT_ACTION__NAME :
 				setName((String) newValue);
@@ -498,50 +507,49 @@
 				return;
 			case UMLPackage.CREATE_OBJECT_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.CREATE_OBJECT_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.CREATE_OBJECT_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CREATE_OBJECT_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.CREATE_OBJECT_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.CREATE_OBJECT_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.CREATE_OBJECT_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.CREATE_OBJECT_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.CREATE_OBJECT_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CREATE_OBJECT_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.CREATE_OBJECT_ACTION__CLASSIFIER :
 				setClassifier((Classifier) newValue);
@@ -682,7 +690,8 @@
 			case UMLPackage.CREATE_OBJECT_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.CREATE_OBJECT_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.CREATE_OBJECT_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -756,7 +765,8 @@
 			case UMLPackage.CREATE_OBJECT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.CREATE_OBJECT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CREATE_OBJECT_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.CREATE_OBJECT_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -764,7 +774,8 @@
 			case UMLPackage.CREATE_OBJECT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.CREATE_OBJECT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.CREATE_OBJECT_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -841,8 +852,8 @@
 			case UMLPackage.CREATE_OBJECT_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.CREATE_OBJECT_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.CREATE_OBJECT_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.CREATE_OBJECT_ACTION___GET_CONTEXT :
@@ -879,7 +890,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.CREATE_OBJECT_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.CREATE_OBJECT_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DataTypeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DataTypeImpl.java
index 11bba63..10be873 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DataTypeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DataTypeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -223,7 +223,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Property createOwnedAttribute(String name, Type type, EClass eClass) {
+	public Property createOwnedAttribute(String name, Type type,
+			EClass eClass) {
 		Property newOwnedAttribute = (Property) create(eClass);
 		getOwnedAttributes().add(newOwnedAttribute);
 		if (name != null)
@@ -294,8 +295,10 @@
 	 * @generated
 	 */
 	public Operation createOwnedOperation(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
-		Operation newOwnedOperation = (Operation) create(UMLPackage.Literals.OPERATION);
+			EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
+		Operation newOwnedOperation = (Operation) create(
+			UMLPackage.Literals.OPERATION);
 		getOwnedOperations().add(newOwnedOperation);
 		if (name != null)
 			newOwnedOperation.setName(name);
@@ -313,9 +316,10 @@
 		for (int i = 0; i < ownedParameterListSize; i++) {
 			newOwnedOperation.createOwnedParameter(i < ownedParameterNamesSize
 				? (String) ownedParameterNames.get(i)
-				: null, i < ownedParameterTypesSize
-				? (Type) ownedParameterTypes.get(i)
-				: null);
+				: null,
+				i < ownedParameterTypesSize
+					? (Type) ownedParameterTypes.get(i)
+					: null);
 		}
 		return newOwnedOperation;
 	}
@@ -326,9 +330,10 @@
 	 * @generated
 	 */
 	public Operation getOwnedOperation(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
-		return getOwnedOperation(name, ownedParameterNames,
-			ownedParameterTypes, false, false);
+			EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
+		return getOwnedOperation(name, ownedParameterNames, ownedParameterTypes,
+			false, false);
 	}
 
 	/**
@@ -349,20 +354,19 @@
 			int ownedParameterListSize = ownedParameterList.size();
 			if (ownedParameterNames != null
 				&& ownedParameterNames.size() != ownedParameterListSize
-				|| (ownedParameterTypes != null && ownedParameterTypes.size() != ownedParameterListSize))
+				|| (ownedParameterTypes != null
+					&& ownedParameterTypes.size() != ownedParameterListSize))
 				continue ownedOperationLoop;
 			for (int j = 0; j < ownedParameterListSize; j++) {
 				Parameter ownedParameter = ownedParameterList.get(j);
-				if (ownedParameterNames != null
-					&& !(ignoreCase
-						? (ownedParameterNames.get(j))
-							.equalsIgnoreCase(ownedParameter.getName())
-						: ownedParameterNames.get(j).equals(
-							ownedParameter.getName())))
+				if (ownedParameterNames != null && !(ignoreCase
+					? (ownedParameterNames.get(j))
+						.equalsIgnoreCase(ownedParameter.getName())
+					: ownedParameterNames.get(j)
+						.equals(ownedParameter.getName())))
 					continue ownedOperationLoop;
-				if (ownedParameterTypes != null
-					&& !ownedParameterTypes.get(j).equals(
-						ownedParameter.getType()))
+				if (ownedParameterTypes != null && !ownedParameterTypes.get(j)
+					.equals(ownedParameter.getType()))
 					continue ownedOperationLoop;
 			}
 			return ownedOperation;
@@ -425,10 +429,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.DATA_TYPE__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.DATA_TYPE__TEMPLATE_BINDING :
@@ -437,8 +441,9 @@
 			case UMLPackage.DATA_TYPE__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.DATA_TYPE__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.DATA_TYPE__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -474,55 +479,55 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.DATA_TYPE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DATA_TYPE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DATA_TYPE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.DATA_TYPE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DATA_TYPE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DATA_TYPE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DATA_TYPE__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.DATA_TYPE__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.DATA_TYPE__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DATA_TYPE__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.DATA_TYPE__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DATA_TYPE__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DATA_TYPE__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DATA_TYPE__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DATA_TYPE__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.DATA_TYPE__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DATA_TYPE__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DATA_TYPE__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -646,13 +651,13 @@
 		switch (featureID) {
 			case UMLPackage.DATA_TYPE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__NAME :
 				setName((String) newValue);
@@ -665,18 +670,18 @@
 				return;
 			case UMLPackage.DATA_TYPE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -692,31 +697,31 @@
 				return;
 			case UMLPackage.DATA_TYPE__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -726,8 +731,8 @@
 				return;
 			case UMLPackage.DATA_TYPE__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__USE_CASE :
 				getUseCases().clear();
@@ -735,26 +740,26 @@
 				return;
 			case UMLPackage.DATA_TYPE__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.DATA_TYPE__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -927,9 +932,11 @@
 			case UMLPackage.DATA_TYPE__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.DATA_TYPE__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.DATA_TYPE__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.DATA_TYPE__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.DATA_TYPE__USE_CASE :
@@ -1006,7 +1013,8 @@
 			case UMLPackage.DATA_TYPE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.DATA_TYPE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DATA_TYPE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.DATA_TYPE___GET_STEREOTYPE_APPLICATIONS :
@@ -1014,7 +1022,8 @@
 			case UMLPackage.DATA_TYPE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.DATA_TYPE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DATA_TYPE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1103,13 +1112,13 @@
 			case UMLPackage.DATA_TYPE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.DATA_TYPE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.DATA_TYPE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.DATA_TYPE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.DATA_TYPE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.DATA_TYPE___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1129,10 +1138,11 @@
 			case UMLPackage.DATA_TYPE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.DATA_TYPE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.DATA_TYPE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.DATA_TYPE___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.DATA_TYPE___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1253,7 +1263,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] ATTRIBUTE_ESUBSETS = new int[]{UMLPackage.DATA_TYPE__OWNED_ATTRIBUTE};
+	protected static final int[] ATTRIBUTE_ESUBSETS = new int[]{
+		UMLPackage.DATA_TYPE__OWNED_ATTRIBUTE};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getOwnedMembers() <em>Owned Member</em>}' reference list.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DecisionNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DecisionNodeImpl.java
index a5f6f95..f71a540 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DecisionNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DecisionNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -155,7 +155,8 @@
 	public ObjectFlow getDecisionInputFlow() {
 		if (decisionInputFlow != null && decisionInputFlow.eIsProxy()) {
 			InternalEObject oldDecisionInputFlow = (InternalEObject) decisionInputFlow;
-			decisionInputFlow = (ObjectFlow) eResolveProxy(oldDecisionInputFlow);
+			decisionInputFlow = (ObjectFlow) eResolveProxy(
+				oldDecisionInputFlow);
 			if (decisionInputFlow != oldDecisionInputFlow) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -359,13 +360,13 @@
 		switch (featureID) {
 			case UMLPackage.DECISION_NODE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.DECISION_NODE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.DECISION_NODE__NAME :
 				setName((String) newValue);
@@ -384,32 +385,31 @@
 				return;
 			case UMLPackage.DECISION_NODE__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.DECISION_NODE__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.DECISION_NODE__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.DECISION_NODE__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.DECISION_NODE__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.DECISION_NODE__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.DECISION_NODE__DECISION_INPUT :
 				setDecisionInput((Behavior) newValue);
@@ -596,7 +596,8 @@
 			case UMLPackage.DECISION_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.DECISION_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DECISION_NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.DECISION_NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -604,7 +605,8 @@
 			case UMLPackage.DECISION_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.DECISION_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DECISION_NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -681,8 +683,8 @@
 			case UMLPackage.DECISION_NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.DECISION_NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.DECISION_NODE___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.DECISION_NODE___VALIDATE_ZERO_INPUT_PARAMETERS__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DependencyImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DependencyImpl.java
index c025859..9d5d306 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DependencyImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DependencyImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -134,8 +134,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> sources = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
+			EList<Element> sources = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
 			if (sources == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE,
@@ -159,8 +159,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> targets = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
+			EList<Element> targets = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
 			if (targets == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET,
@@ -242,7 +242,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NamedElement getClient(String name, boolean ignoreCase, EClass eClass) {
+	public NamedElement getClient(String name, boolean ignoreCase,
+			EClass eClass) {
 		clientLoop : for (NamedElement client : getClients()) {
 			if (eClass != null && !eClass.isInstance(client))
 				continue clientLoop;
@@ -322,13 +323,13 @@
 		switch (featureID) {
 			case UMLPackage.DEPENDENCY__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.DEPENDENCY__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.DEPENDENCY__NAME :
 				setName((String) newValue);
@@ -347,13 +348,13 @@
 				return;
 			case UMLPackage.DEPENDENCY__CLIENT :
 				getClients().clear();
-				getClients().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getClients()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.DEPENDENCY__SUPPLIER :
 				getSuppliers().clear();
-				getSuppliers().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getSuppliers()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -452,7 +453,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Relationship.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.DEPENDENCY__RELATED_ELEMENT :
@@ -480,7 +482,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Relationship.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.RELATIONSHIP__RELATED_ELEMENT :
@@ -530,7 +533,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SOURCE_ESUBSETS = new int[]{UMLPackage.DEPENDENCY__CLIENT};
+	protected static final int[] SOURCE_ESUBSETS = new int[]{
+		UMLPackage.DEPENDENCY__CLIENT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -549,7 +553,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] TARGET_ESUBSETS = new int[]{UMLPackage.DEPENDENCY__SUPPLIER};
+	protected static final int[] TARGET_ESUBSETS = new int[]{
+		UMLPackage.DEPENDENCY__SUPPLIER};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentImpl.java
index 5037544..2f0b004 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -119,8 +119,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -144,8 +144,8 @@
 	public EList<NamedElement> getSuppliers() {
 		if (suppliers == null) {
 			suppliers = new SubsetSupersetEObjectResolvingEList<NamedElement>(
-				NamedElement.class, this, UMLPackage.DEPLOYMENT__SUPPLIER,
-				null, SUPPLIER_ESUBSETS);
+				NamedElement.class, this, UMLPackage.DEPLOYMENT__SUPPLIER, null,
+				SUPPLIER_ESUBSETS);
 		}
 		return suppliers;
 	}
@@ -201,7 +201,8 @@
 	 * @generated
 	 */
 	public DeploymentSpecification createConfiguration(String name) {
-		DeploymentSpecification newConfiguration = (DeploymentSpecification) create(UMLPackage.Literals.DEPLOYMENT_SPECIFICATION);
+		DeploymentSpecification newConfiguration = (DeploymentSpecification) create(
+			UMLPackage.Literals.DEPLOYMENT_SPECIFICATION);
 		getConfigurations().add(newConfiguration);
 		if (name != null)
 			newConfiguration.setName(name);
@@ -286,7 +287,8 @@
 	 */
 	public void setLocation(DeploymentTarget newLocation) {
 		if (newLocation != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.DEPLOYMENT__LOCATION && newLocation != null)) {
+			|| (eContainerFeatureID() != UMLPackage.DEPLOYMENT__LOCATION
+				&& newLocation != null)) {
 			if (EcoreUtil.isAncestor(this, newLocation))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -325,10 +327,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.DEPLOYMENT__CONFIGURATION :
@@ -352,11 +354,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.DEPLOYMENT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.DEPLOYMENT__OWNING_TEMPLATE_PARAMETER :
@@ -364,8 +366,8 @@
 			case UMLPackage.DEPLOYMENT__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.DEPLOYMENT__CONFIGURATION :
-				return ((InternalEList<?>) getConfigurations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getConfigurations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT__LOCATION :
 				return basicSetLocation(null, msgs);
 		}
@@ -468,13 +470,13 @@
 		switch (featureID) {
 			case UMLPackage.DEPLOYMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT__NAME :
 				setName((String) newValue);
@@ -493,13 +495,13 @@
 				return;
 			case UMLPackage.DEPLOYMENT__CLIENT :
 				getClients().clear();
-				getClients().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getClients()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT__SUPPLIER :
 				getSuppliers().clear();
-				getSuppliers().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getSuppliers()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT__CONFIGURATION :
 				getConfigurations().clear();
@@ -508,8 +510,8 @@
 				return;
 			case UMLPackage.DEPLOYMENT__DEPLOYED_ARTIFACT :
 				getDeployedArtifacts().clear();
-				getDeployedArtifacts().addAll(
-					(Collection<? extends DeployedArtifact>) newValue);
+				getDeployedArtifacts()
+					.addAll((Collection<? extends DeployedArtifact>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT__LOCATION :
 				setLocation((DeploymentTarget) newValue);
@@ -669,7 +671,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SUPPLIER_ESUBSETS = new int[]{UMLPackage.DEPLOYMENT__DEPLOYED_ARTIFACT};
+	protected static final int[] SUPPLIER_ESUBSETS = new int[]{
+		UMLPackage.DEPLOYMENT__DEPLOYED_ARTIFACT};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getClients() <em>Client</em>}' reference list.
@@ -679,7 +682,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] CLIENT_ESUBSETS = new int[]{UMLPackage.DEPLOYMENT__LOCATION};
+	protected static final int[] CLIENT_ESUBSETS = new int[]{
+		UMLPackage.DEPLOYMENT__LOCATION};
 
 	/**
 	 * The array of superset feature identifiers for the '{@link #getDeployedArtifacts() <em>Deployed Artifact</em>}' reference list.
@@ -689,7 +693,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] DEPLOYED_ARTIFACT_ESUPERSETS = new int[]{UMLPackage.DEPLOYMENT__SUPPLIER};
+	protected static final int[] DEPLOYED_ARTIFACT_ESUPERSETS = new int[]{
+		UMLPackage.DEPLOYMENT__SUPPLIER};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -705,8 +710,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public DeployedArtifact getDeployedArtifact(String name,
-			boolean ignoreCase, EClass eClass) {
+	public DeployedArtifact getDeployedArtifact(String name, boolean ignoreCase,
+			EClass eClass) {
 		deployedArtifactLoop : for (DeployedArtifact deployedArtifact : getDeployedArtifacts()) {
 			if (eClass != null && !eClass.isInstance(deployedArtifact))
 				continue deployedArtifactLoop;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentSpecificationImpl.java
index 1e814b1..82c9396 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentSpecificationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -208,7 +208,8 @@
 	public void setDeploymentLocation(String newDeploymentLocation) {
 		String oldDeploymentLocation = deploymentLocation;
 		deploymentLocation = newDeploymentLocation;
-		boolean oldDeploymentLocationESet = (eFlags & DEPLOYMENT_LOCATION_ESETFLAG) != 0;
+		boolean oldDeploymentLocationESet = (eFlags
+			& DEPLOYMENT_LOCATION_ESETFLAG) != 0;
 		eFlags |= DEPLOYMENT_LOCATION_ESETFLAG;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
@@ -224,7 +225,8 @@
 	 */
 	public void unsetDeploymentLocation() {
 		String oldDeploymentLocation = deploymentLocation;
-		boolean oldDeploymentLocationESet = (eFlags & DEPLOYMENT_LOCATION_ESETFLAG) != 0;
+		boolean oldDeploymentLocationESet = (eFlags
+			& DEPLOYMENT_LOCATION_ESETFLAG) != 0;
 		deploymentLocation = DEPLOYMENT_LOCATION_EDEFAULT;
 		eFlags &= ~DEPLOYMENT_LOCATION_ESETFLAG;
 		if (eNotificationRequired())
@@ -260,7 +262,8 @@
 	public void setExecutionLocation(String newExecutionLocation) {
 		String oldExecutionLocation = executionLocation;
 		executionLocation = newExecutionLocation;
-		boolean oldExecutionLocationESet = (eFlags & EXECUTION_LOCATION_ESETFLAG) != 0;
+		boolean oldExecutionLocationESet = (eFlags
+			& EXECUTION_LOCATION_ESETFLAG) != 0;
 		eFlags |= EXECUTION_LOCATION_ESETFLAG;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
@@ -276,7 +279,8 @@
 	 */
 	public void unsetExecutionLocation() {
 		String oldExecutionLocation = executionLocation;
-		boolean oldExecutionLocationESet = (eFlags & EXECUTION_LOCATION_ESETFLAG) != 0;
+		boolean oldExecutionLocationESet = (eFlags
+			& EXECUTION_LOCATION_ESETFLAG) != 0;
 		executionLocation = EXECUTION_LOCATION_EDEFAULT;
 		eFlags &= ~EXECUTION_LOCATION_ESETFLAG;
 		if (eNotificationRequired())
@@ -336,7 +340,8 @@
 	 */
 	public void setDeployment(Deployment newDeployment) {
 		if (newDeployment != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.DEPLOYMENT_SPECIFICATION__DEPLOYMENT && newDeployment != null)) {
+			|| (eContainerFeatureID() != UMLPackage.DEPLOYMENT_SPECIFICATION__DEPLOYMENT
+				&& newDeployment != null)) {
 			if (EcoreUtil.isAncestor(this, newDeployment))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -407,10 +412,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__TEMPLATE_BINDING :
@@ -419,8 +424,7 @@
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							EOPPOSITE_FEATURE_BASE
 								- UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
@@ -456,61 +460,61 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__MANIFESTATION :
-				return ((InternalEList<?>) getManifestations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getManifestations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__NESTED_ARTIFACT :
-				return ((InternalEList<?>) getNestedArtifacts()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedArtifacts())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__DEPLOYMENT :
 				return basicSetDeployment(null, msgs);
 		}
@@ -671,13 +675,13 @@
 		switch (featureID) {
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__NAME :
 				setName((String) newValue);
@@ -690,18 +694,18 @@
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -717,31 +721,31 @@
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -751,8 +755,8 @@
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__USE_CASE :
 				getUseCases().clear();
@@ -760,39 +764,39 @@
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__FILE_NAME :
 				setFileName((String) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__MANIFESTATION :
 				getManifestations().clear();
-				getManifestations().addAll(
-					(Collection<? extends Manifestation>) newValue);
+				getManifestations()
+					.addAll((Collection<? extends Manifestation>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__NESTED_ARTIFACT :
 				getNestedArtifacts().clear();
-				getNestedArtifacts().addAll(
-					(Collection<? extends Artifact>) newValue);
+				getNestedArtifacts()
+					.addAll((Collection<? extends Artifact>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__DEPLOYMENT_LOCATION :
 				setDeploymentLocation((String) newValue);
@@ -992,9 +996,11 @@
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__USE_CASE :
@@ -1083,7 +1089,8 @@
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___GET_STEREOTYPE_APPLICATIONS :
@@ -1091,7 +1098,8 @@
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1180,13 +1188,13 @@
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1206,10 +1214,11 @@
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.DEPLOYMENT_SPECIFICATION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentTargetImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentTargetImpl.java
index 603ddfc..ef952eb 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentTargetImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentTargetImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 323181
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -100,8 +100,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -113,7 +113,8 @@
 			return ownedElements;
 		}
 		return new DerivedUnionEObjectEList<Element>(Element.class, this,
-			UMLPackage.DEPLOYMENT_TARGET__OWNED_ELEMENT, OWNED_ELEMENT_ESUBSETS);
+			UMLPackage.DEPLOYMENT_TARGET__OWNED_ELEMENT,
+			OWNED_ELEMENT_ESUBSETS);
 	}
 
 	/**
@@ -144,8 +145,7 @@
 				.get(this,
 					UMLPackage.Literals.DEPLOYMENT_TARGET__DEPLOYED_ELEMENT);
 			if (result == null) {
-				cache.put(
-					this,
+				cache.put(this,
 					UMLPackage.Literals.DEPLOYMENT_TARGET__DEPLOYED_ELEMENT,
 					result = DeploymentTargetOperations
 						.getDeployedElements(this));
@@ -213,16 +213,16 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.DEPLOYMENT_TARGET__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_TARGET__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DEPLOYMENT_TARGET__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.DEPLOYMENT_TARGET__DEPLOYMENT :
-				return ((InternalEList<?>) getDeployments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getDeployments())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -280,13 +280,13 @@
 		switch (featureID) {
 			case UMLPackage.DEPLOYMENT_TARGET__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_TARGET__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.DEPLOYMENT_TARGET__NAME :
 				setName((String) newValue);
@@ -299,8 +299,8 @@
 				return;
 			case UMLPackage.DEPLOYMENT_TARGET__DEPLOYMENT :
 				getDeployments().clear();
-				getDeployments().addAll(
-					(Collection<? extends Deployment>) newValue);
+				getDeployments()
+					.addAll((Collection<? extends Deployment>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -393,7 +393,8 @@
 	 * @generated
 	 */
 	public Deployment createDeployment(String name) {
-		Deployment newDeployment = (Deployment) create(UMLPackage.Literals.DEPLOYMENT);
+		Deployment newDeployment = (Deployment) create(
+			UMLPackage.Literals.DEPLOYMENT);
 		getDeployments().add(newDeployment);
 		if (name != null)
 			newDeployment.setName(name);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestroyLinkActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestroyLinkActionImpl.java
index 01c2f71..831afaf 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestroyLinkActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestroyLinkActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -97,7 +97,8 @@
 	 */
 	@Override
 	public LinkEndData createEndData() {
-		LinkEndDestructionData newEndData = (LinkEndDestructionData) create(UMLPackage.Literals.LINK_END_DESTRUCTION_DATA);
+		LinkEndDestructionData newEndData = (LinkEndDestructionData) create(
+			UMLPackage.Literals.LINK_END_DESTRUCTION_DATA);
 		getEndData().add(newEndData);
 		return newEndData;
 	}
@@ -121,11 +122,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.DESTROY_LINK_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DESTROY_LINK_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DESTROY_LINK_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.DESTROY_LINK_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -134,14 +135,14 @@
 			case UMLPackage.DESTROY_LINK_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.DESTROY_LINK_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.DESTROY_LINK_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.DESTROY_LINK_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DESTROY_LINK_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -155,8 +156,8 @@
 				return ((InternalEList<?>) getEndData()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.DESTROY_LINK_ACTION__INPUT_VALUE :
-				return ((InternalEList<?>) getInputValues()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInputValues())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -256,13 +257,13 @@
 		switch (featureID) {
 			case UMLPackage.DESTROY_LINK_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__NAME :
 				setName((String) newValue);
@@ -281,60 +282,59 @@
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__END_DATA :
 				getEndData().clear();
-				getEndData().addAll(
-					(Collection<? extends LinkEndData>) newValue);
+				getEndData()
+					.addAll((Collection<? extends LinkEndData>) newValue);
 				return;
 			case UMLPackage.DESTROY_LINK_ACTION__INPUT_VALUE :
 				getInputValues().clear();
-				getInputValues().addAll(
-					(Collection<? extends InputPin>) newValue);
+				getInputValues()
+					.addAll((Collection<? extends InputPin>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -469,7 +469,8 @@
 			case UMLPackage.DESTROY_LINK_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.DESTROY_LINK_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.DESTROY_LINK_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestroyObjectActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestroyObjectActionImpl.java
index 622fa45..bdf775b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestroyObjectActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestroyObjectActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -163,12 +163,11 @@
 			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.DESTROY_OBJECT_ACTION__INPUT,
-							INPUT_ESUBSETS));
+				cache.put(eResource, this, UMLPackage.Literals.ACTION__INPUT,
+					inputs = new DerivedUnionEObjectEList<InputPin>(
+						InputPin.class, this,
+						UMLPackage.DESTROY_OBJECT_ACTION__INPUT,
+						INPUT_ESUBSETS));
 			}
 			return inputs;
 		}
@@ -217,7 +216,8 @@
 	 * @generated
 	 */
 	public void setIsDestroyOwnedObjects(boolean newIsDestroyOwnedObjects) {
-		boolean oldIsDestroyOwnedObjects = (eFlags & IS_DESTROY_OWNED_OBJECTS_EFLAG) != 0;
+		boolean oldIsDestroyOwnedObjects = (eFlags
+			& IS_DESTROY_OWNED_OBJECTS_EFLAG) != 0;
 		if (newIsDestroyOwnedObjects)
 			eFlags |= IS_DESTROY_OWNED_OBJECTS_EFLAG;
 		else
@@ -239,12 +239,16 @@
 			target = (InputPin) eResolveProxy(oldTarget);
 			if (target != oldTarget) {
 				InternalEObject newTarget = (InternalEObject) target;
-				NotificationChain msgs = oldTarget.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.DESTROY_OBJECT_ACTION__TARGET, null, null);
+				NotificationChain msgs = oldTarget
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.DESTROY_OBJECT_ACTION__TARGET,
+						null, null);
 				if (newTarget.eInternalContainer() == null) {
-					msgs = newTarget.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.DESTROY_OBJECT_ACTION__TARGET, null, msgs);
+					msgs = newTarget.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.DESTROY_OBJECT_ACTION__TARGET,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -296,19 +300,24 @@
 		if (newTarget != target) {
 			NotificationChain msgs = null;
 			if (target != null)
-				msgs = ((InternalEObject) target).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.DESTROY_OBJECT_ACTION__TARGET, null, msgs);
+				msgs = ((InternalEObject) target)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.DESTROY_OBJECT_ACTION__TARGET,
+						null, msgs);
 			if (newTarget != null)
-				msgs = ((InternalEObject) newTarget).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.DESTROY_OBJECT_ACTION__TARGET, null, msgs);
+				msgs = ((InternalEObject) newTarget)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.DESTROY_OBJECT_ACTION__TARGET,
+						null, msgs);
 			msgs = basicSetTarget(newTarget, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.DESTROY_OBJECT_ACTION__TARGET, newTarget, newTarget));
+				UMLPackage.DESTROY_OBJECT_ACTION__TARGET, newTarget,
+				newTarget));
 	}
 
 	/**
@@ -367,11 +376,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.DESTROY_OBJECT_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DESTROY_OBJECT_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DESTROY_OBJECT_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.DESTROY_OBJECT_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -380,14 +389,14 @@
 			case UMLPackage.DESTROY_OBJECT_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.DESTROY_OBJECT_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.DESTROY_OBJECT_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.DESTROY_OBJECT_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DESTROY_OBJECT_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -502,13 +511,13 @@
 		switch (featureID) {
 			case UMLPackage.DESTROY_OBJECT_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.DESTROY_OBJECT_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.DESTROY_OBJECT_ACTION__NAME :
 				setName((String) newValue);
@@ -527,50 +536,49 @@
 				return;
 			case UMLPackage.DESTROY_OBJECT_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.DESTROY_OBJECT_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.DESTROY_OBJECT_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.DESTROY_OBJECT_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.DESTROY_OBJECT_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.DESTROY_OBJECT_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.DESTROY_OBJECT_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.DESTROY_OBJECT_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.DESTROY_OBJECT_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.DESTROY_OBJECT_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.DESTROY_OBJECT_ACTION__IS_DESTROY_LINKS :
 				setIsDestroyLinks((Boolean) newValue);
@@ -717,7 +725,8 @@
 			case UMLPackage.DESTROY_OBJECT_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.DESTROY_OBJECT_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.DESTROY_OBJECT_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -727,9 +736,11 @@
 			case UMLPackage.DESTROY_OBJECT_ACTION__OUTPUT :
 				return isSetOutputs();
 			case UMLPackage.DESTROY_OBJECT_ACTION__IS_DESTROY_LINKS :
-				return ((eFlags & IS_DESTROY_LINKS_EFLAG) != 0) != IS_DESTROY_LINKS_EDEFAULT;
+				return ((eFlags
+					& IS_DESTROY_LINKS_EFLAG) != 0) != IS_DESTROY_LINKS_EDEFAULT;
 			case UMLPackage.DESTROY_OBJECT_ACTION__IS_DESTROY_OWNED_OBJECTS :
-				return ((eFlags & IS_DESTROY_OWNED_OBJECTS_EFLAG) != 0) != IS_DESTROY_OWNED_OBJECTS_EDEFAULT;
+				return ((eFlags
+					& IS_DESTROY_OWNED_OBJECTS_EFLAG) != 0) != IS_DESTROY_OWNED_OBJECTS_EDEFAULT;
 			case UMLPackage.DESTROY_OBJECT_ACTION__TARGET :
 				return target != null;
 		}
@@ -793,7 +804,8 @@
 			case UMLPackage.DESTROY_OBJECT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.DESTROY_OBJECT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DESTROY_OBJECT_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.DESTROY_OBJECT_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -801,7 +813,8 @@
 			case UMLPackage.DESTROY_OBJECT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.DESTROY_OBJECT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DESTROY_OBJECT_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -878,8 +891,8 @@
 			case UMLPackage.DESTROY_OBJECT_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.DESTROY_OBJECT_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.DESTROY_OBJECT_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.DESTROY_OBJECT_ACTION___GET_CONTEXT :
@@ -927,7 +940,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.DESTROY_OBJECT_ACTION__TARGET};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.DESTROY_OBJECT_ACTION__TARGET};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestructionOccurrenceSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestructionOccurrenceSpecificationImpl.java
index 728db37..a5b2889 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestructionOccurrenceSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DestructionOccurrenceSpecificationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015 CEA and others.
+ * Copyright (c) 2011, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 351774, 297216, 418466, 451350
+ *   Kenn Hussey (CEA) - 351774, 297216, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -68,7 +68,8 @@
 	public boolean validateNoOccurrenceSpecificationsBelow(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return DestructionOccurrenceSpecificationOperations
-			.validateNoOccurrenceSpecificationsBelow(this, diagnostics, context);
+			.validateNoOccurrenceSpecificationsBelow(this, diagnostics,
+				context);
 	}
 
 	/**
@@ -128,7 +129,8 @@
 			case UMLPackage.DESTRUCTION_OCCURRENCE_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.DESTRUCTION_OCCURRENCE_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DESTRUCTION_OCCURRENCE_SPECIFICATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.DESTRUCTION_OCCURRENCE_SPECIFICATION___GET_STEREOTYPE_APPLICATIONS :
@@ -136,7 +138,8 @@
 			case UMLPackage.DESTRUCTION_OCCURRENCE_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.DESTRUCTION_OCCURRENCE_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DESTRUCTION_OCCURRENCE_SPECIFICATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DirectedRelationshipImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DirectedRelationshipImpl.java
index df66d2e..bf88f19 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DirectedRelationshipImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DirectedRelationshipImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 451350
+ *   Kenn Hussey (CEA) - 327039, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -72,8 +72,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> sources = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
+			EList<Element> sources = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
 			if (sources == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE,
@@ -126,8 +126,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> targets = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
+			EList<Element> targets = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
 			if (targets == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET,
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationConstraintImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationConstraintImpl.java
index b289692..d07f4e9 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationConstraintImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationConstraintImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 397324, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 397324, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -104,8 +104,8 @@
 	 */
 	public EList<Boolean> getFirstEvents() {
 		if (firstEvents == null) {
-			firstEvents = new EDataTypeUniqueEList<Boolean>(Boolean.class,
-				this, UMLPackage.DURATION_CONSTRAINT__FIRST_EVENT);
+			firstEvents = new EDataTypeUniqueEList<Boolean>(Boolean.class, this,
+				UMLPackage.DURATION_CONSTRAINT__FIRST_EVENT);
 		}
 		return firstEvents;
 	}
@@ -119,13 +119,14 @@
 	public ValueSpecification getSpecification() {
 		if (specification != null && specification.eIsProxy()) {
 			InternalEObject oldSpecification = (InternalEObject) specification;
-			specification = (ValueSpecification) eResolveProxy(oldSpecification);
+			specification = (ValueSpecification) eResolveProxy(
+				oldSpecification);
 			if (specification != oldSpecification) {
 				InternalEObject newSpecification = (InternalEObject) specification;
 				NotificationChain msgs = oldSpecification.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.DURATION_CONSTRAINT__SPECIFICATION, null,
-					null);
+						- UMLPackage.DURATION_CONSTRAINT__SPECIFICATION,
+					null, null);
 				if (newSpecification.eInternalContainer() == null) {
 					msgs = newSpecification.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
@@ -170,8 +171,7 @@
 		specification = newSpecification;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this,
-				Notification.SET,
-				UMLPackage.DURATION_CONSTRAINT__SPECIFICATION,
+				Notification.SET, UMLPackage.DURATION_CONSTRAINT__SPECIFICATION,
 				oldSpecification, newSpecification);
 			if (msgs == null)
 				msgs = notification;
@@ -198,20 +198,20 @@
 			if (specification != null)
 				msgs = ((InternalEObject) specification).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.DURATION_CONSTRAINT__SPECIFICATION, null,
-					msgs);
+						- UMLPackage.DURATION_CONSTRAINT__SPECIFICATION,
+					null, msgs);
 			if (newSpecification != null)
 				msgs = ((InternalEObject) newSpecification).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.DURATION_CONSTRAINT__SPECIFICATION, null,
-					msgs);
+						- UMLPackage.DURATION_CONSTRAINT__SPECIFICATION,
+					null, msgs);
 			msgs = basicSetSpecification(newSpecification, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.DURATION_CONSTRAINT__SPECIFICATION,
-				newSpecification, newSpecification));
+				UMLPackage.DURATION_CONSTRAINT__SPECIFICATION, newSpecification,
+				newSpecification));
 	}
 
 	/**
@@ -221,7 +221,8 @@
 	 */
 	public ValueSpecification createSpecification(String name, Type type,
 			EClass eClass) {
-		ValueSpecification newSpecification = (ValueSpecification) create(eClass);
+		ValueSpecification newSpecification = (ValueSpecification) create(
+			eClass);
 		setSpecification(newSpecification);
 		if (name != null)
 			newSpecification.setName(name);
@@ -247,8 +248,8 @@
 	 */
 	public boolean validateFirstEventMultiplicity(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DurationConstraintOperations.validateFirstEventMultiplicity(
-			this, diagnostics, context);
+		return DurationConstraintOperations.validateFirstEventMultiplicity(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -272,11 +273,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.DURATION_CONSTRAINT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DURATION_CONSTRAINT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DURATION_CONSTRAINT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.DURATION_CONSTRAINT__OWNING_TEMPLATE_PARAMETER :
@@ -360,13 +361,13 @@
 		switch (featureID) {
 			case UMLPackage.DURATION_CONSTRAINT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.DURATION_CONSTRAINT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.DURATION_CONSTRAINT__NAME :
 				setName((String) newValue);
@@ -385,8 +386,8 @@
 				return;
 			case UMLPackage.DURATION_CONSTRAINT__CONSTRAINED_ELEMENT :
 				getConstrainedElements().clear();
-				getConstrainedElements().addAll(
-					(Collection<? extends Element>) newValue);
+				getConstrainedElements()
+					.addAll((Collection<? extends Element>) newValue);
 				return;
 			case UMLPackage.DURATION_CONSTRAINT__CONTEXT :
 				setContext((Namespace) newValue);
@@ -396,8 +397,8 @@
 				return;
 			case UMLPackage.DURATION_CONSTRAINT__FIRST_EVENT :
 				getFirstEvents().clear();
-				getFirstEvents().addAll(
-					(Collection<? extends Boolean>) newValue);
+				getFirstEvents()
+					.addAll((Collection<? extends Boolean>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -552,7 +553,8 @@
 			case UMLPackage.DURATION_CONSTRAINT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.DURATION_CONSTRAINT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DURATION_CONSTRAINT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.DURATION_CONSTRAINT___GET_STEREOTYPE_APPLICATIONS :
@@ -560,7 +562,8 @@
 			case UMLPackage.DURATION_CONSTRAINT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.DURATION_CONSTRAINT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DURATION_CONSTRAINT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -623,7 +626,8 @@
 			case UMLPackage.DURATION_CONSTRAINT___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.DURATION_CONSTRAINT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.DURATION_CONSTRAINT___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.DURATION_CONSTRAINT___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -634,8 +638,7 @@
 				return validateBooleanValue((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.DURATION_CONSTRAINT___VALIDATE_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP :
-				return validateNoSideEffects(
-					(DiagnosticChain) arguments.get(0),
+				return validateNoSideEffects((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.DURATION_CONSTRAINT___VALIDATE_NOT_APPLY_TO_SELF__DIAGNOSTICCHAIN_MAP :
 				return validateNotApplyToSelf(
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationImpl.java
index 5e1c05b..febb0b4 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -120,14 +120,13 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
 					ownedElements = new DerivedUnionEObjectEList<Element>(
-						Element.class, this,
-						UMLPackage.DURATION__OWNED_ELEMENT,
+						Element.class, this, UMLPackage.DURATION__OWNED_ELEMENT,
 						OWNED_ELEMENT_ESUBSETS));
 			}
 			return ownedElements;
@@ -163,8 +162,9 @@
 					EOPPOSITE_FEATURE_BASE - UMLPackage.DURATION__EXPR, null,
 					null);
 				if (newExpr.eInternalContainer() == null) {
-					msgs = newExpr.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.DURATION__EXPR, null, msgs);
+					msgs = newExpr.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - UMLPackage.DURATION__EXPR,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -234,7 +234,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ValueSpecification createExpr(String name, Type type, EClass eClass) {
+	public ValueSpecification createExpr(String name, Type type,
+			EClass eClass) {
 		ValueSpecification newExpr = (ValueSpecification) create(eClass);
 		setExpr(newExpr);
 		if (name != null)
@@ -316,11 +317,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.DURATION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DURATION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.DURATION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.DURATION__OWNING_TEMPLATE_PARAMETER :
@@ -400,13 +401,13 @@
 		switch (featureID) {
 			case UMLPackage.DURATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.DURATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.DURATION__NAME :
 				setName((String) newValue);
@@ -431,8 +432,8 @@
 				return;
 			case UMLPackage.DURATION__OBSERVATION :
 				getObservations().clear();
-				getObservations().addAll(
-					(Collection<? extends Observation>) newValue);
+				getObservations()
+					.addAll((Collection<? extends Observation>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -581,7 +582,8 @@
 			case UMLPackage.DURATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.DURATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DURATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.DURATION___GET_STEREOTYPE_APPLICATIONS :
@@ -589,7 +591,8 @@
 			case UMLPackage.DURATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.DURATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DURATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -652,7 +655,8 @@
 			case UMLPackage.DURATION___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.DURATION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.DURATION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.DURATION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationIntervalImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationIntervalImpl.java
index d8f6955..5aa7d33 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationIntervalImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationIntervalImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -193,13 +193,13 @@
 		switch (featureID) {
 			case UMLPackage.DURATION_INTERVAL__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.DURATION_INTERVAL__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.DURATION_INTERVAL__NAME :
 				setName((String) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationObservationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationObservationImpl.java
index 5ab661a..112e1a4 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationObservationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DurationObservationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 397324, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 397324, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -103,9 +103,8 @@
 	 */
 	public EList<NamedElement> getEvents() {
 		if (events == null) {
-			events = new EObjectResolvingEList<NamedElement>(
-				NamedElement.class, this,
-				UMLPackage.DURATION_OBSERVATION__EVENT);
+			events = new EObjectResolvingEList<NamedElement>(NamedElement.class,
+				this, UMLPackage.DURATION_OBSERVATION__EVENT);
 		}
 		return events;
 	}
@@ -124,7 +123,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NamedElement getEvent(String name, boolean ignoreCase, EClass eClass) {
+	public NamedElement getEvent(String name, boolean ignoreCase,
+			EClass eClass) {
 		eventLoop : for (NamedElement event : getEvents()) {
 			if (eClass != null && !eClass.isInstance(event))
 				continue eventLoop;
@@ -144,8 +144,8 @@
 	 */
 	public EList<Boolean> getFirstEvents() {
 		if (firstEvents == null) {
-			firstEvents = new EDataTypeUniqueEList<Boolean>(Boolean.class,
-				this, UMLPackage.DURATION_OBSERVATION__FIRST_EVENT);
+			firstEvents = new EDataTypeUniqueEList<Boolean>(Boolean.class, this,
+				UMLPackage.DURATION_OBSERVATION__FIRST_EVENT);
 		}
 		return firstEvents;
 	}
@@ -157,8 +157,8 @@
 	 */
 	public boolean validateFirstEventMultiplicity(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DurationObservationOperations.validateFirstEventMultiplicity(
-			this, diagnostics, context);
+		return DurationObservationOperations
+			.validateFirstEventMultiplicity(this, diagnostics, context);
 	}
 
 	/**
@@ -222,13 +222,13 @@
 		switch (featureID) {
 			case UMLPackage.DURATION_OBSERVATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.DURATION_OBSERVATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.DURATION_OBSERVATION__NAME :
 				setName((String) newValue);
@@ -247,13 +247,13 @@
 				return;
 			case UMLPackage.DURATION_OBSERVATION__EVENT :
 				getEvents().clear();
-				getEvents().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getEvents()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.DURATION_OBSERVATION__FIRST_EVENT :
 				getFirstEvents().clear();
-				getFirstEvents().addAll(
-					(Collection<? extends Boolean>) newValue);
+				getFirstEvents()
+					.addAll((Collection<? extends Boolean>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -397,7 +397,8 @@
 			case UMLPackage.DURATION_OBSERVATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.DURATION_OBSERVATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DURATION_OBSERVATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.DURATION_OBSERVATION___GET_STEREOTYPE_APPLICATIONS :
@@ -405,7 +406,8 @@
 			case UMLPackage.DURATION_OBSERVATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.DURATION_OBSERVATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.DURATION_OBSERVATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -468,7 +470,8 @@
 			case UMLPackage.DURATION_OBSERVATION___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.DURATION_OBSERVATION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.DURATION_OBSERVATION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.DURATION_OBSERVATION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImpl.java
index 3dbe60a..d92720b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181, 335125
- *   Kenn Hussey (CEA) - 327039, 424895, 451350
+ *   Kenn Hussey (CEA) - 327039, 424895, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -110,8 +110,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -328,8 +328,7 @@
 			EList<Relationship> result = (EList<Relationship>) cache.get(this,
 				UMLPackage.Literals.ELEMENT___GET_RELATIONSHIPS);
 			if (result == null) {
-				cache.put(this,
-					UMLPackage.Literals.ELEMENT___GET_RELATIONSHIPS,
+				cache.put(this, UMLPackage.Literals.ELEMENT___GET_RELATIONSHIPS,
 					result = ElementOperations.getRelationships(this));
 			}
 			return result;
@@ -356,16 +355,13 @@
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
 			EList<DirectedRelationship> result = (EList<DirectedRelationship>) cache
-				.get(
-					this,
+				.get(this,
 					UMLPackage.Literals.ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS,
-						result = ElementOperations
-							.getSourceDirectedRelationships(this));
+				cache.put(this,
+					UMLPackage.Literals.ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS,
+					result = ElementOperations
+						.getSourceDirectedRelationships(this));
 			}
 			return result;
 		}
@@ -392,16 +388,13 @@
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
 			EList<DirectedRelationship> result = (EList<DirectedRelationship>) cache
-				.get(
-					this,
+				.get(this,
 					UMLPackage.Literals.ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS,
-						result = ElementOperations
-							.getTargetDirectedRelationships(this));
+				cache.put(this,
+					UMLPackage.Literals.ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS,
+					result = ElementOperations
+						.getTargetDirectedRelationships(this));
 			}
 			return result;
 		}
@@ -608,11 +601,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ELEMENT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ELEMENT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -650,13 +643,13 @@
 		switch (featureID) {
 			case UMLPackage.ELEMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ELEMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -757,7 +750,8 @@
 			case UMLPackage.ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ELEMENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ELEMENT___GET_STEREOTYPE_APPLICATIONS :
@@ -765,7 +759,8 @@
 			case UMLPackage.ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ELEMENT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -827,7 +822,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_ELEMENT_ESUBSETS = new int[]{UMLPackage.ELEMENT__OWNED_COMMENT};
+	protected static final int[] OWNED_ELEMENT_ESUBSETS = new int[]{
+		UMLPackage.ELEMENT__OWNED_COMMENT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -899,9 +895,9 @@
 	public NotificationChain eBasicSetContainer(InternalEObject newContainer,
 			int newContainerFeatureID, NotificationChain msgs) {
 
-		if (eDirectResource() != null
-			&& newContainer != null
-			&& eContainmentFeature(this, newContainer, newContainerFeatureID) == null) {
+		if (eDirectResource() != null && newContainer != null
+			&& eContainmentFeature(this, newContainer,
+				newContainerFeatureID) == null) {
 
 			InternalEObject oldContainer = eInternalContainer();
 			int oldContainerFeatureID = eContainerFeatureID();
@@ -913,9 +909,9 @@
 				if (oldContainer != null && oldContainerFeatureID >= 0
 					&& oldContainerFeatureID != newContainerFeatureID) {
 
-					ENotificationImpl notification = new ENotificationImpl(
-						this, Notification.SET, oldContainerFeatureID,
-						oldContainer, null);
+					ENotificationImpl notification = new ENotificationImpl(this,
+						Notification.SET, oldContainerFeatureID, oldContainer,
+						null);
 
 					if (msgs == null) {
 						msgs = notification;
@@ -924,11 +920,12 @@
 					}
 				}
 				if (newContainerFeatureID >= 0) {
-					ENotificationImpl notification = new ENotificationImpl(
-						this, Notification.SET, newContainerFeatureID,
+					ENotificationImpl notification = new ENotificationImpl(this,
+						Notification.SET, newContainerFeatureID,
 						oldContainerFeatureID == newContainerFeatureID
 							? oldContainer
-							: null, newContainer);
+							: null,
+						newContainer);
 
 					if (msgs == null) {
 						msgs = notification;
@@ -938,13 +935,12 @@
 				}
 			}
 		} else {
-			msgs = super.eBasicSetContainer(newContainer,
-				newContainerFeatureID, msgs);
+			msgs = super.eBasicSetContainer(newContainer, newContainerFeatureID,
+				msgs);
 		}
 
-		if (newContainer != null
-			&& (CHANGE_DESCRIPTION_CLASS == null || !(CHANGE_DESCRIPTION_CLASS
-				.isInstance(newContainer)))) {
+		if (newContainer != null && (CHANGE_DESCRIPTION_CLASS == null
+			|| !(CHANGE_DESCRIPTION_CLASS.isInstance(newContainer)))) {
 
 			Resource.Internal eInternalResource = eInternalResource();
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImportImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImportImpl.java
index ed84054..b67ab85 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImportImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ElementImportImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -191,8 +191,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> targets = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
+			EList<Element> targets = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
 			if (targets == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET,
@@ -217,8 +217,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> sources = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
+			EList<Element> sources = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
 			if (sources == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE,
@@ -238,7 +238,8 @@
 	 * @generated
 	 */
 	public VisibilityKind getVisibility() {
-		return VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		return VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 	}
 
 	/**
@@ -247,7 +248,8 @@
 	 * @generated
 	 */
 	public void setVisibility(VisibilityKind newVisibility) {
-		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 		if (newVisibility == null)
 			newVisibility = VISIBILITY_EDEFAULT;
 		eFlags = eFlags & ~VISIBILITY_EFLAG
@@ -316,7 +318,8 @@
 	public PackageableElement getImportedElement() {
 		if (importedElement != null && importedElement.eIsProxy()) {
 			InternalEObject oldImportedElement = (InternalEObject) importedElement;
-			importedElement = (PackageableElement) eResolveProxy(oldImportedElement);
+			importedElement = (PackageableElement) eResolveProxy(
+				oldImportedElement);
 			if (importedElement != oldImportedElement) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -346,8 +349,8 @@
 		importedElement = newImportedElement;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.ELEMENT_IMPORT__IMPORTED_ELEMENT,
-				oldImportedElement, importedElement));
+				UMLPackage.ELEMENT_IMPORT__IMPORTED_ELEMENT, oldImportedElement,
+				importedElement));
 	}
 
 	/**
@@ -391,7 +394,8 @@
 	 */
 	public void setImportingNamespace(Namespace newImportingNamespace) {
 		if (newImportingNamespace != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.ELEMENT_IMPORT__IMPORTING_NAMESPACE && newImportingNamespace != null)) {
+			|| (eContainerFeatureID() != UMLPackage.ELEMENT_IMPORT__IMPORTING_NAMESPACE
+				&& newImportingNamespace != null)) {
 			if (EcoreUtil.isAncestor(this, newImportingNamespace))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -400,8 +404,8 @@
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newImportingNamespace != null)
 				msgs = ((InternalEObject) newImportingNamespace).eInverseAdd(
-					this, UMLPackage.NAMESPACE__ELEMENT_IMPORT,
-					Namespace.class, msgs);
+					this, UMLPackage.NAMESPACE__ELEMENT_IMPORT, Namespace.class,
+					msgs);
 			msgs = basicSetImportingNamespace(newImportingNamespace, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -473,11 +477,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ELEMENT_IMPORT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ELEMENT_IMPORT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ELEMENT_IMPORT__IMPORTING_NAMESPACE :
 				return basicSetImportingNamespace(null, msgs);
 		}
@@ -494,9 +498,9 @@
 			NotificationChain msgs) {
 		switch (eContainerFeatureID()) {
 			case UMLPackage.ELEMENT_IMPORT__IMPORTING_NAMESPACE :
-				return eInternalContainer()
-					.eInverseRemove(this, UMLPackage.NAMESPACE__ELEMENT_IMPORT,
-						Namespace.class, msgs);
+				return eInternalContainer().eInverseRemove(this,
+					UMLPackage.NAMESPACE__ELEMENT_IMPORT, Namespace.class,
+					msgs);
 		}
 		return eDynamicBasicRemoveFromContainer(msgs);
 	}
@@ -552,13 +556,13 @@
 		switch (featureID) {
 			case UMLPackage.ELEMENT_IMPORT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ELEMENT_IMPORT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ELEMENT_IMPORT__ALIAS :
 				setAlias((String) newValue);
@@ -697,7 +701,8 @@
 			case UMLPackage.ELEMENT_IMPORT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ELEMENT_IMPORT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ELEMENT_IMPORT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ELEMENT_IMPORT___GET_STEREOTYPE_APPLICATIONS :
@@ -705,7 +710,8 @@
 			case UMLPackage.ELEMENT_IMPORT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ELEMENT_IMPORT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ELEMENT_IMPORT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -763,8 +769,8 @@
 		else
 			result.append("<unset>"); //$NON-NLS-1$
 		result.append(", visibility: "); //$NON-NLS-1$
-		result
-			.append(VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET]);
+		result.append(VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET]);
 		result.append(')');
 		return result.toString();
 	}
@@ -777,7 +783,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] TARGET_ESUBSETS = new int[]{UMLPackage.ELEMENT_IMPORT__IMPORTED_ELEMENT};
+	protected static final int[] TARGET_ESUBSETS = new int[]{
+		UMLPackage.ELEMENT_IMPORT__IMPORTED_ELEMENT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -798,7 +805,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SOURCE_ESUBSETS = new int[]{UMLPackage.ELEMENT_IMPORT__IMPORTING_NAMESPACE};
+	protected static final int[] SOURCE_ESUBSETS = new int[]{
+		UMLPackage.ELEMENT_IMPORT__IMPORTING_NAMESPACE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EncapsulatedClassifierImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EncapsulatedClassifierImpl.java
index 452b802..8ad980b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EncapsulatedClassifierImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EncapsulatedClassifierImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -77,7 +77,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_PORT_ESUPERSETS = new int[]{UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_ATTRIBUTE};
+	protected static final int[] OWNED_PORT_ESUPERSETS = new int[]{
+		UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_ATTRIBUTE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -146,9 +147,8 @@
 			if (ownedPorts == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ENCAPSULATED_CLASSIFIER__OWNED_PORT,
-					ownedPorts = new DerivedSubsetEObjectEList<Port>(
-						Port.class, this,
-						UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_PORT,
+					ownedPorts = new DerivedSubsetEObjectEList<Port>(Port.class,
+						this, UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_PORT,
 						OWNED_PORT_ESUPERSETS));
 			}
 			return ownedPorts;
@@ -204,55 +204,55 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_CONNECTOR :
-				return ((InternalEList<?>) getOwnedConnectors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedConnectors())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -382,13 +382,13 @@
 		switch (featureID) {
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__NAME :
 				setName((String) newValue);
@@ -401,18 +401,18 @@
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -428,31 +428,31 @@
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -462,8 +462,8 @@
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__USE_CASE :
 				getUseCases().clear();
@@ -471,26 +471,26 @@
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -663,9 +663,11 @@
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.ENCAPSULATED_CLASSIFIER__USE_CASE :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationImpl.java
index 1fab63e..bc7e10d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -157,7 +157,8 @@
 	 * @generated
 	 */
 	public EnumerationLiteral createOwnedLiteral(String name) {
-		EnumerationLiteral newOwnedLiteral = (EnumerationLiteral) create(UMLPackage.Literals.ENUMERATION_LITERAL);
+		EnumerationLiteral newOwnedLiteral = (EnumerationLiteral) create(
+			UMLPackage.Literals.ENUMERATION_LITERAL);
 		getOwnedLiterals().add(newOwnedLiteral);
 		if (name != null)
 			newOwnedLiteral.setName(name);
@@ -232,10 +233,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.ENUMERATION__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.ENUMERATION__TEMPLATE_BINDING :
@@ -244,8 +245,9 @@
 			case UMLPackage.ENUMERATION__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.ENUMERATION__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.ENUMERATION__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -284,58 +286,58 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ENUMERATION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ENUMERATION__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.ENUMERATION__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.ENUMERATION__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.ENUMERATION__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.ENUMERATION__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION__OWNED_LITERAL :
-				return ((InternalEList<?>) getOwnedLiterals()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedLiterals())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -461,13 +463,13 @@
 		switch (featureID) {
 			case UMLPackage.ENUMERATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__NAME :
 				setName((String) newValue);
@@ -480,18 +482,18 @@
 				return;
 			case UMLPackage.ENUMERATION__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -507,31 +509,31 @@
 				return;
 			case UMLPackage.ENUMERATION__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.ENUMERATION__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -541,8 +543,8 @@
 				return;
 			case UMLPackage.ENUMERATION__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__USE_CASE :
 				getUseCases().clear();
@@ -550,26 +552,26 @@
 				return;
 			case UMLPackage.ENUMERATION__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.ENUMERATION__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 			case UMLPackage.ENUMERATION__OWNED_LITERAL :
 				getOwnedLiterals().clear();
@@ -750,9 +752,11 @@
 			case UMLPackage.ENUMERATION__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.ENUMERATION__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.ENUMERATION__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.ENUMERATION__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.ENUMERATION__USE_CASE :
@@ -831,7 +835,8 @@
 			case UMLPackage.ENUMERATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ENUMERATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ENUMERATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ENUMERATION___GET_STEREOTYPE_APPLICATIONS :
@@ -839,7 +844,8 @@
 			case UMLPackage.ENUMERATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ENUMERATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ENUMERATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -928,13 +934,13 @@
 			case UMLPackage.ENUMERATION___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.ENUMERATION___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.ENUMERATION___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.ENUMERATION___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.ENUMERATION___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.ENUMERATION___MEMBERS_ARE_DISTINGUISHABLE :
@@ -954,10 +960,11 @@
 			case UMLPackage.ENUMERATION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.ENUMERATION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.ENUMERATION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.ENUMERATION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.ENUMERATION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationLiteralImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationLiteralImpl.java
index 6711ab1..b9ec1ed 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationLiteralImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/EnumerationLiteralImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -139,7 +139,8 @@
 	 */
 	public void setEnumeration(Enumeration newEnumeration) {
 		if (newEnumeration != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.ENUMERATION_LITERAL__ENUMERATION && newEnumeration != null)) {
+			|| (eContainerFeatureID() != UMLPackage.ENUMERATION_LITERAL__ENUMERATION
+				&& newEnumeration != null)) {
 			if (EcoreUtil.isAncestor(this, newEnumeration))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -247,10 +248,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.ENUMERATION_LITERAL__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.ENUMERATION_LITERAL__SLOT :
@@ -274,16 +275,16 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.ENUMERATION_LITERAL__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION_LITERAL__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION_LITERAL__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.ENUMERATION_LITERAL__DEPLOYMENT :
-				return ((InternalEList<?>) getDeployments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getDeployments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.ENUMERATION_LITERAL__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.ENUMERATION_LITERAL__TEMPLATE_PARAMETER :
@@ -393,13 +394,13 @@
 		switch (featureID) {
 			case UMLPackage.ENUMERATION_LITERAL__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.ENUMERATION_LITERAL__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.ENUMERATION_LITERAL__NAME :
 				setName((String) newValue);
@@ -412,8 +413,8 @@
 				return;
 			case UMLPackage.ENUMERATION_LITERAL__DEPLOYMENT :
 				getDeployments().clear();
-				getDeployments().addAll(
-					(Collection<? extends Deployment>) newValue);
+				getDeployments()
+					.addAll((Collection<? extends Deployment>) newValue);
 				return;
 			case UMLPackage.ENUMERATION_LITERAL__OWNING_TEMPLATE_PARAMETER :
 				setOwningTemplateParameter((TemplateParameter) newValue);
@@ -423,8 +424,8 @@
 				return;
 			case UMLPackage.ENUMERATION_LITERAL__CLASSIFIER :
 				getClassifiers().clear();
-				getClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.ENUMERATION_LITERAL__SLOT :
 				getSlots().clear();
@@ -595,7 +596,8 @@
 			case UMLPackage.ENUMERATION_LITERAL___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.ENUMERATION_LITERAL___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ENUMERATION_LITERAL___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.ENUMERATION_LITERAL___GET_STEREOTYPE_APPLICATIONS :
@@ -603,7 +605,8 @@
 			case UMLPackage.ENUMERATION_LITERAL___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.ENUMERATION_LITERAL___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.ENUMERATION_LITERAL___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -668,7 +671,8 @@
 			case UMLPackage.ENUMERATION_LITERAL___GET_DEPLOYED_ELEMENTS :
 				return getDeployedElements();
 			case UMLPackage.ENUMERATION_LITERAL___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.ENUMERATION_LITERAL___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.ENUMERATION_LITERAL___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExceptionHandlerImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExceptionHandlerImpl.java
index 26a65a6..b06073b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExceptionHandlerImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExceptionHandlerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -295,7 +295,8 @@
 	 */
 	public void setProtectedNode(ExecutableNode newProtectedNode) {
 		if (newProtectedNode != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.EXCEPTION_HANDLER__PROTECTED_NODE && newProtectedNode != null)) {
+			|| (eContainerFeatureID() != UMLPackage.EXCEPTION_HANDLER__PROTECTED_NODE
+				&& newProtectedNode != null)) {
 			if (EcoreUtil.isAncestor(this, newProtectedNode))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -412,11 +413,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.EXCEPTION_HANDLER__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXCEPTION_HANDLER__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXCEPTION_HANDLER__PROTECTED_NODE :
 				return basicSetProtectedNode(null, msgs);
 		}
@@ -487,21 +488,21 @@
 		switch (featureID) {
 			case UMLPackage.EXCEPTION_HANDLER__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.EXCEPTION_HANDLER__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.EXCEPTION_HANDLER__EXCEPTION_INPUT :
 				setExceptionInput((ObjectNode) newValue);
 				return;
 			case UMLPackage.EXCEPTION_HANDLER__EXCEPTION_TYPE :
 				getExceptionTypes().clear();
-				getExceptionTypes().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getExceptionTypes()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.EXCEPTION_HANDLER__HANDLER_BODY :
 				setHandlerBody((ExecutableNode) newValue);
@@ -628,7 +629,8 @@
 			case UMLPackage.EXCEPTION_HANDLER___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.EXCEPTION_HANDLER___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXCEPTION_HANDLER___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.EXCEPTION_HANDLER___GET_STEREOTYPE_APPLICATIONS :
@@ -636,7 +638,8 @@
 			case UMLPackage.EXCEPTION_HANDLER___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.EXCEPTION_HANDLER___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXCEPTION_HANDLER___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutableNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutableNodeImpl.java
index d044dae..01bb5f1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutableNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutableNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -101,8 +101,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -138,7 +138,8 @@
 	 * @generated
 	 */
 	public ExceptionHandler createHandler() {
-		ExceptionHandler newHandler = (ExceptionHandler) create(UMLPackage.Literals.EXCEPTION_HANDLER);
+		ExceptionHandler newHandler = (ExceptionHandler) create(
+			UMLPackage.Literals.EXCEPTION_HANDLER);
 		getHandlers().add(newHandler);
 		return newHandler;
 	}
@@ -190,11 +191,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.EXECUTABLE_NODE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXECUTABLE_NODE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXECUTABLE_NODE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.EXECUTABLE_NODE__IN_INTERRUPTIBLE_REGION :
@@ -203,14 +204,14 @@
 			case UMLPackage.EXECUTABLE_NODE__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.EXECUTABLE_NODE__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.EXECUTABLE_NODE__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.EXECUTABLE_NODE__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXECUTABLE_NODE__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -295,13 +296,13 @@
 		switch (featureID) {
 			case UMLPackage.EXECUTABLE_NODE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.EXECUTABLE_NODE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.EXECUTABLE_NODE__NAME :
 				setName((String) newValue);
@@ -320,37 +321,36 @@
 				return;
 			case UMLPackage.EXECUTABLE_NODE__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.EXECUTABLE_NODE__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.EXECUTABLE_NODE__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.EXECUTABLE_NODE__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.EXECUTABLE_NODE__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.EXECUTABLE_NODE__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.EXECUTABLE_NODE__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionOccurrenceSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionOccurrenceSpecificationImpl.java
index f4dbf20..292f92d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionOccurrenceSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionOccurrenceSpecificationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -89,9 +89,7 @@
 			execution = (ExecutionSpecification) eResolveProxy(oldExecution);
 			if (execution != oldExecution) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.EXECUTION_OCCURRENCE_SPECIFICATION__EXECUTION,
 						oldExecution, execution));
 			}
@@ -191,13 +189,13 @@
 		switch (featureID) {
 			case UMLPackage.EXECUTION_OCCURRENCE_SPECIFICATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.EXECUTION_OCCURRENCE_SPECIFICATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.EXECUTION_OCCURRENCE_SPECIFICATION__NAME :
 				setName((String) newValue);
@@ -220,18 +218,18 @@
 				return;
 			case UMLPackage.EXECUTION_OCCURRENCE_SPECIFICATION__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.EXECUTION_OCCURRENCE_SPECIFICATION__TO_AFTER :
 				getToAfters().clear();
-				getToAfters().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getToAfters()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.EXECUTION_OCCURRENCE_SPECIFICATION__TO_BEFORE :
 				getToBefores().clear();
-				getToBefores().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getToBefores()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.EXECUTION_OCCURRENCE_SPECIFICATION__EXECUTION :
 				setExecution((ExecutionSpecification) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionSpecificationImpl.java
index b0dc28b..51f2781 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExecutionSpecificationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -263,13 +263,13 @@
 		switch (featureID) {
 			case UMLPackage.EXECUTION_SPECIFICATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.EXECUTION_SPECIFICATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.EXECUTION_SPECIFICATION__NAME :
 				setName((String) newValue);
@@ -292,8 +292,8 @@
 				return;
 			case UMLPackage.EXECUTION_SPECIFICATION__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.EXECUTION_SPECIFICATION__FINISH :
 				setFinish((OccurrenceSpecification) newValue);
@@ -453,7 +453,8 @@
 			case UMLPackage.EXECUTION_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.EXECUTION_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXECUTION_SPECIFICATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.EXECUTION_SPECIFICATION___GET_STEREOTYPE_APPLICATIONS :
@@ -461,7 +462,8 @@
 			case UMLPackage.EXECUTION_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.EXECUTION_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXECUTION_SPECIFICATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionNodeImpl.java
index 541af39..8793eba 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -324,11 +324,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.EXPANSION_NODE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPANSION_NODE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPANSION_NODE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.EXPANSION_NODE__IN_INTERRUPTIBLE_REGION :
@@ -337,14 +337,14 @@
 			case UMLPackage.EXPANSION_NODE__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.EXPANSION_NODE__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.EXPANSION_NODE__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.EXPANSION_NODE__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPANSION_NODE__UPPER_BOUND :
 				return basicSetUpperBound(null, msgs);
 			case UMLPackage.EXPANSION_NODE__REGION_AS_INPUT :
@@ -456,13 +456,13 @@
 		switch (featureID) {
 			case UMLPackage.EXPANSION_NODE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.EXPANSION_NODE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.EXPANSION_NODE__NAME :
 				setName((String) newValue);
@@ -481,32 +481,31 @@
 				return;
 			case UMLPackage.EXPANSION_NODE__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.EXPANSION_NODE__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.EXPANSION_NODE__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.EXPANSION_NODE__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.EXPANSION_NODE__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.EXPANSION_NODE__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.EXPANSION_NODE__TYPE :
 				setType((Type) newValue);
@@ -670,7 +669,8 @@
 			case UMLPackage.EXPANSION_NODE__IN_STATE :
 				return inStates != null && !inStates.isEmpty();
 			case UMLPackage.EXPANSION_NODE__IS_CONTROL_TYPE :
-				return ((eFlags & IS_CONTROL_TYPE_EFLAG) != 0) != IS_CONTROL_TYPE_EDEFAULT;
+				return ((eFlags
+					& IS_CONTROL_TYPE_EFLAG) != 0) != IS_CONTROL_TYPE_EDEFAULT;
 			case UMLPackage.EXPANSION_NODE__ORDERING :
 				return (eFlags & ORDERING_EFLAG) != ORDERING_EFLAG_DEFAULT;
 			case UMLPackage.EXPANSION_NODE__SELECTION :
@@ -742,7 +742,8 @@
 			case UMLPackage.EXPANSION_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.EXPANSION_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXPANSION_NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.EXPANSION_NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -750,7 +751,8 @@
 			case UMLPackage.EXPANSION_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.EXPANSION_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXPANSION_NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -827,8 +829,8 @@
 			case UMLPackage.EXPANSION_NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.EXPANSION_NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.EXPANSION_NODE___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.EXPANSION_NODE___VALIDATE_INPUT_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionRegionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionRegionImpl.java
index b659f17..028b9ae 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionRegionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpansionRegionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -97,7 +97,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int MODE_EFLAG_DEFAULT = MODE_EDEFAULT.ordinal() << MODE_EFLAG_OFFSET;
+	protected static final int MODE_EFLAG_DEFAULT = MODE_EDEFAULT
+		.ordinal() << MODE_EFLAG_OFFSET;
 
 	/**
 	 * The array of enumeration values for '{@link ExpansionKind Expansion Kind}'
@@ -174,7 +175,8 @@
 	 * @generated
 	 */
 	public void setMode(ExpansionKind newMode) {
-		ExpansionKind oldMode = MODE_EFLAG_VALUES[(eFlags & MODE_EFLAG) >>> MODE_EFLAG_OFFSET];
+		ExpansionKind oldMode = MODE_EFLAG_VALUES[(eFlags
+			& MODE_EFLAG) >>> MODE_EFLAG_OFFSET];
 		if (newMode == null)
 			newMode = MODE_EDEFAULT;
 		eFlags = eFlags & ~MODE_EFLAG | newMode.ordinal() << MODE_EFLAG_OFFSET;
@@ -340,11 +342,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.EXPANSION_REGION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPANSION_REGION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPANSION_REGION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.EXPANSION_REGION__IN_INTERRUPTIBLE_REGION :
@@ -353,14 +355,14 @@
 			case UMLPackage.EXPANSION_REGION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.EXPANSION_REGION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.EXPANSION_REGION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.EXPANSION_REGION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPANSION_REGION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -371,14 +373,14 @@
 				return ((InternalEList<?>) getLocalPreconditions())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPANSION_REGION__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPANSION_REGION__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPANSION_REGION__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPANSION_REGION__EDGE :
 				return ((InternalEList<?>) getEdges()).basicRemove(otherEnd,
 					msgs);
@@ -389,17 +391,17 @@
 				return ((InternalEList<?>) getStructuredNodeOutputs())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPANSION_REGION__VARIABLE :
-				return ((InternalEList<?>) getVariables()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getVariables()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.EXPANSION_REGION__NODE :
 				return ((InternalEList<?>) getNodes()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.EXPANSION_REGION__OUTPUT_ELEMENT :
-				return ((InternalEList<?>) getOutputElements()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutputElements())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPANSION_REGION__INPUT_ELEMENT :
-				return ((InternalEList<?>) getInputElements()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInputElements())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -539,13 +541,13 @@
 		switch (featureID) {
 			case UMLPackage.EXPANSION_REGION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__NAME :
 				setName((String) newValue);
@@ -564,65 +566,64 @@
 				return;
 			case UMLPackage.EXPANSION_REGION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__IN_ACTIVITY :
 				setInActivity((Activity) newValue);
@@ -637,13 +638,13 @@
 				return;
 			case UMLPackage.EXPANSION_REGION__STRUCTURED_NODE_INPUT :
 				getStructuredNodeInputs().clear();
-				getStructuredNodeInputs().addAll(
-					(Collection<? extends InputPin>) newValue);
+				getStructuredNodeInputs()
+					.addAll((Collection<? extends InputPin>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__STRUCTURED_NODE_OUTPUT :
 				getStructuredNodeOutputs().clear();
-				getStructuredNodeOutputs().addAll(
-					(Collection<? extends OutputPin>) newValue);
+				getStructuredNodeOutputs()
+					.addAll((Collection<? extends OutputPin>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__VARIABLE :
 				getVariables().clear();
@@ -660,13 +661,13 @@
 				return;
 			case UMLPackage.EXPANSION_REGION__OUTPUT_ELEMENT :
 				getOutputElements().clear();
-				getOutputElements().addAll(
-					(Collection<? extends ExpansionNode>) newValue);
+				getOutputElements()
+					.addAll((Collection<? extends ExpansionNode>) newValue);
 				return;
 			case UMLPackage.EXPANSION_REGION__INPUT_ELEMENT :
 				getInputElements().clear();
-				getInputElements().addAll(
-					(Collection<? extends ExpansionNode>) newValue);
+				getInputElements()
+					.addAll((Collection<? extends ExpansionNode>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -834,7 +835,8 @@
 			case UMLPackage.EXPANSION_REGION__INPUT :
 				return isSetInputs();
 			case UMLPackage.EXPANSION_REGION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.EXPANSION_REGION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -868,7 +870,8 @@
 			case UMLPackage.EXPANSION_REGION__EDGE :
 				return edges != null && !edges.isEmpty();
 			case UMLPackage.EXPANSION_REGION__MUST_ISOLATE :
-				return ((eFlags & MUST_ISOLATE_EFLAG) != 0) != MUST_ISOLATE_EDEFAULT;
+				return ((eFlags
+					& MUST_ISOLATE_EFLAG) != 0) != MUST_ISOLATE_EDEFAULT;
 			case UMLPackage.EXPANSION_REGION__STRUCTURED_NODE_INPUT :
 				return structuredNodeInputs != null
 					&& !structuredNodeInputs.isEmpty();
@@ -901,8 +904,8 @@
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (mode: "); //$NON-NLS-1$
-		result
-			.append(MODE_EFLAG_VALUES[(eFlags & MODE_EFLAG) >>> MODE_EFLAG_OFFSET]);
+		result.append(
+			MODE_EFLAG_VALUES[(eFlags & MODE_EFLAG) >>> MODE_EFLAG_OFFSET]);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpressionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpressionImpl.java
index 7033b67..1305d06 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpressionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExpressionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -131,8 +131,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -268,11 +268,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.EXPRESSION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPRESSION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXPRESSION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.EXPRESSION__OWNING_TEMPLATE_PARAMETER :
@@ -351,13 +351,13 @@
 		switch (featureID) {
 			case UMLPackage.EXPRESSION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.EXPRESSION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.EXPRESSION__NAME :
 				setName((String) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtendImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtendImpl.java
index ec82410..6aeedcb 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtendImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtendImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -147,8 +147,7 @@
 				cache.put(eResource, this,
 					UMLPackage.Literals.RELATIONSHIP__RELATED_ELEMENT,
 					relatedElements = new DerivedUnionEObjectEList<Element>(
-						Element.class, this,
-						UMLPackage.EXTEND__RELATED_ELEMENT,
+						Element.class, this, UMLPackage.EXTEND__RELATED_ELEMENT,
 						RELATED_ELEMENT_ESUBSETS));
 			}
 			return relatedElements;
@@ -167,8 +166,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> sources = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
+			EList<Element> sources = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
 			if (sources == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE,
@@ -192,8 +191,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> targets = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
+			EList<Element> targets = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
 			if (targets == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET,
@@ -218,8 +217,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -271,7 +270,8 @@
 		extendedCase = newExtendedCase;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.EXTEND__EXTENDED_CASE, oldExtendedCase, extendedCase));
+				UMLPackage.EXTEND__EXTENDED_CASE, oldExtendedCase,
+				extendedCase));
 	}
 
 	/**
@@ -286,8 +286,8 @@
 			if (condition != oldCondition) {
 				InternalEObject newCondition = (InternalEObject) condition;
 				NotificationChain msgs = oldCondition.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE - UMLPackage.EXTEND__CONDITION,
-					null, null);
+					EOPPOSITE_FEATURE_BASE - UMLPackage.EXTEND__CONDITION, null,
+					null);
 				if (newCondition.eInternalContainer() == null) {
 					msgs = newCondition.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE - UMLPackage.EXTEND__CONDITION,
@@ -343,12 +343,12 @@
 			NotificationChain msgs = null;
 			if (condition != null)
 				msgs = ((InternalEObject) condition).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE - UMLPackage.EXTEND__CONDITION,
-					null, msgs);
+					EOPPOSITE_FEATURE_BASE - UMLPackage.EXTEND__CONDITION, null,
+					msgs);
 			if (newCondition != null)
 				msgs = ((InternalEObject) newCondition).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE - UMLPackage.EXTEND__CONDITION,
-					null, msgs);
+					EOPPOSITE_FEATURE_BASE - UMLPackage.EXTEND__CONDITION, null,
+					msgs);
 			msgs = basicSetCondition(newCondition, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -407,7 +407,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ExtensionPoint getExtensionLocation(String name, boolean ignoreCase) {
+	public ExtensionPoint getExtensionLocation(String name,
+			boolean ignoreCase) {
 		extensionLocationLoop : for (ExtensionPoint extensionLocation : getExtensionLocations()) {
 			if (name != null && !(ignoreCase
 				? name.equalsIgnoreCase(extensionLocation.getName())
@@ -459,7 +460,8 @@
 	 */
 	public void setExtension(UseCase newExtension) {
 		if (newExtension != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.EXTEND__EXTENSION && newExtension != null)) {
+			|| (eContainerFeatureID() != UMLPackage.EXTEND__EXTENSION
+				&& newExtension != null)) {
 			if (EcoreUtil.isAncestor(this, newExtension))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -519,11 +521,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.EXTEND__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTEND__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTEND__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.EXTEND__CONDITION :
@@ -619,13 +621,13 @@
 		switch (featureID) {
 			case UMLPackage.EXTEND__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.EXTEND__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.EXTEND__NAME :
 				setName((String) newValue);
@@ -644,8 +646,8 @@
 				return;
 			case UMLPackage.EXTEND__EXTENSION_LOCATION :
 				getExtensionLocations().clear();
-				getExtensionLocations().addAll(
-					(Collection<? extends ExtensionPoint>) newValue);
+				getExtensionLocations()
+					.addAll((Collection<? extends ExtensionPoint>) newValue);
 				return;
 			case UMLPackage.EXTEND__EXTENSION :
 				setExtension((UseCase) newValue);
@@ -748,7 +750,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Relationship.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.EXTEND__RELATED_ELEMENT :
@@ -776,7 +779,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Relationship.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.RELATIONSHIP__RELATED_ELEMENT :
@@ -855,7 +859,8 @@
 			case UMLPackage.EXTEND___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.EXTEND___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXTEND___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.EXTEND___GET_STEREOTYPE_APPLICATIONS :
@@ -863,7 +868,8 @@
 			case UMLPackage.EXTEND___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.EXTEND___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXTEND___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -961,7 +967,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SOURCE_ESUBSETS = new int[]{UMLPackage.EXTEND__EXTENSION};
+	protected static final int[] SOURCE_ESUBSETS = new int[]{
+		UMLPackage.EXTEND__EXTENSION};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -980,7 +987,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] TARGET_ESUBSETS = new int[]{UMLPackage.EXTEND__EXTENDED_CASE};
+	protected static final int[] TARGET_ESUBSETS = new int[]{
+		UMLPackage.EXTEND__EXTENDED_CASE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionEndImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionEndImpl.java
index 553eab1..baecacf 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionEndImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionEndImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -350,13 +350,13 @@
 		switch (featureID) {
 			case UMLPackage.EXTENSION_END__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.EXTENSION_END__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.EXTENSION_END__NAME :
 				setName((String) newValue);
@@ -405,8 +405,8 @@
 				return;
 			case UMLPackage.EXTENSION_END__DEPLOYMENT :
 				getDeployments().clear();
-				getDeployments().addAll(
-					(Collection<? extends Deployment>) newValue);
+				getDeployments()
+					.addAll((Collection<? extends Deployment>) newValue);
 				return;
 			case UMLPackage.EXTENSION_END__DATATYPE :
 				setDatatype((DataType) newValue);
@@ -425,8 +425,8 @@
 				return;
 			case UMLPackage.EXTENSION_END__QUALIFIER :
 				getQualifiers().clear();
-				getQualifiers().addAll(
-					(Collection<? extends Property>) newValue);
+				getQualifiers()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.EXTENSION_END__DEFAULT_VALUE :
 				setDefaultValue((ValueSpecification) newValue);
@@ -451,13 +451,13 @@
 				return;
 			case UMLPackage.EXTENSION_END__REDEFINED_PROPERTY :
 				getRedefinedProperties().clear();
-				getRedefinedProperties().addAll(
-					(Collection<? extends Property>) newValue);
+				getRedefinedProperties()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.EXTENSION_END__SUBSETTED_PROPERTY :
 				getSubsettedProperties().clear();
-				getSubsettedProperties().addAll(
-					(Collection<? extends Property>) newValue);
+				getSubsettedProperties()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.EXTENSION_END__ASSOCIATION :
 				setAssociation((Association) newValue);
@@ -623,7 +623,8 @@
 			case UMLPackage.EXTENSION_END__TYPE :
 				return isSetType();
 			case UMLPackage.EXTENSION_END__IS_ORDERED :
-				return ((eFlags & IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
+				return ((eFlags
+					& IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
 			case UMLPackage.EXTENSION_END__IS_UNIQUE :
 				return ((eFlags & IS_UNIQUE_EFLAG) != 0) != IS_UNIQUE_EDEFAULT;
 			case UMLPackage.EXTENSION_END__LOWER :
@@ -635,7 +636,8 @@
 			case UMLPackage.EXTENSION_END__UPPER_VALUE :
 				return upperValue != null;
 			case UMLPackage.EXTENSION_END__IS_READ_ONLY :
-				return ((eFlags & IS_READ_ONLY_EFLAG) != 0) != IS_READ_ONLY_EDEFAULT;
+				return ((eFlags
+					& IS_READ_ONLY_EFLAG) != 0) != IS_READ_ONLY_EDEFAULT;
 			case UMLPackage.EXTENSION_END__OWNING_TEMPLATE_PARAMETER :
 				return basicGetOwningTemplateParameter() != null;
 			case UMLPackage.EXTENSION_END__TEMPLATE_PARAMETER :
@@ -653,7 +655,8 @@
 			case UMLPackage.EXTENSION_END__DEFAULT :
 				return isSetDefault();
 			case UMLPackage.EXTENSION_END__AGGREGATION :
-				return (eFlags & AGGREGATION_EFLAG) != AGGREGATION_EFLAG_DEFAULT;
+				return (eFlags
+					& AGGREGATION_EFLAG) != AGGREGATION_EFLAG_DEFAULT;
 			case UMLPackage.EXTENSION_END__ASSOCIATION_END :
 				return basicGetAssociationEnd() != null;
 			case UMLPackage.EXTENSION_END__QUALIFIER :
@@ -665,9 +668,11 @@
 			case UMLPackage.EXTENSION_END__IS_COMPOSITE :
 				return isComposite() != IS_COMPOSITE_EDEFAULT;
 			case UMLPackage.EXTENSION_END__IS_DERIVED :
-				return ((eFlags & IS_DERIVED_EFLAG) != 0) != IS_DERIVED_EDEFAULT;
+				return ((eFlags
+					& IS_DERIVED_EFLAG) != 0) != IS_DERIVED_EDEFAULT;
 			case UMLPackage.EXTENSION_END__IS_DERIVED_UNION :
-				return ((eFlags & IS_DERIVED_UNION_EFLAG) != 0) != IS_DERIVED_UNION_EDEFAULT;
+				return ((eFlags
+					& IS_DERIVED_UNION_EFLAG) != 0) != IS_DERIVED_UNION_EDEFAULT;
 			case UMLPackage.EXTENSION_END__IS_ID :
 				return ((eFlags & IS_ID_EFLAG) != 0) != IS_ID_EDEFAULT;
 			case UMLPackage.EXTENSION_END__OPPOSITE :
@@ -743,7 +748,8 @@
 			case UMLPackage.EXTENSION_END___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.EXTENSION_END___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXTENSION_END___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.EXTENSION_END___GET_STEREOTYPE_APPLICATIONS :
@@ -751,7 +757,8 @@
 			case UMLPackage.EXTENSION_END___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.EXTENSION_END___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXTENSION_END___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -828,8 +835,8 @@
 			case UMLPackage.EXTENSION_END___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.EXTENSION_END___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.EXTENSION_END___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP :
 				return validateUpperGeLower((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
@@ -861,8 +868,8 @@
 			case UMLPackage.EXTENSION_END___COMPATIBLE_WITH__MULTIPLICITYELEMENT :
 				return compatibleWith((MultiplicityElement) arguments.get(0));
 			case UMLPackage.EXTENSION_END___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT :
-				return includesMultiplicity((MultiplicityElement) arguments
-					.get(0));
+				return includesMultiplicity(
+					(MultiplicityElement) arguments.get(0));
 			case UMLPackage.EXTENSION_END___IS__INT_INT :
 				return is((Integer) arguments.get(0),
 					(Integer) arguments.get(1));
@@ -877,7 +884,8 @@
 			case UMLPackage.EXTENSION_END___UPPER_BOUND :
 				return upperBound();
 			case UMLPackage.EXTENSION_END___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.EXTENSION_END___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.EXTENSION_END___GET_ENDS :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionImpl.java
index b254dd8..2eb4cd0 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -139,7 +139,8 @@
 	 * @generated
 	 */
 	public Property createOwnedEnd(String name, Type type) {
-		ExtensionEnd newOwnedEnd = (ExtensionEnd) create(UMLPackage.Literals.EXTENSION_END);
+		ExtensionEnd newOwnedEnd = (ExtensionEnd) create(
+			UMLPackage.Literals.EXTENSION_END);
 		getOwnedEnds().add(newOwnedEnd);
 		if (name != null)
 			newOwnedEnd.setName(name);
@@ -204,7 +205,8 @@
 	public org.eclipse.uml2.uml.Class getMetaclass() {
 		org.eclipse.uml2.uml.Class metaclass = basicGetMetaclass();
 		return metaclass != null && metaclass.eIsProxy()
-			? (org.eclipse.uml2.uml.Class) eResolveProxy((InternalEObject) metaclass)
+			? (org.eclipse.uml2.uml.Class) eResolveProxy(
+				(InternalEObject) metaclass)
 			: metaclass;
 	}
 
@@ -294,10 +296,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.EXTENSION__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.EXTENSION__TEMPLATE_BINDING :
@@ -306,8 +308,9 @@
 			case UMLPackage.EXTENSION__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.EXTENSION__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.EXTENSION__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -343,55 +346,55 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.EXTENSION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.EXTENSION__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.EXTENSION__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.EXTENSION__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.EXTENSION__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.EXTENSION__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION__MEMBER_END :
-				return ((InternalEList<?>) getMemberEnds()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getMemberEnds())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION__OWNED_END :
-				return ((InternalEList<?>) getOwnedEnds()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedEnds()).basicRemove(otherEnd,
+					msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -529,13 +532,13 @@
 		switch (featureID) {
 			case UMLPackage.EXTENSION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.EXTENSION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.EXTENSION__NAME :
 				setName((String) newValue);
@@ -548,18 +551,18 @@
 				return;
 			case UMLPackage.EXTENSION__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.EXTENSION__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.EXTENSION__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.EXTENSION__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -575,31 +578,31 @@
 				return;
 			case UMLPackage.EXTENSION__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.EXTENSION__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.EXTENSION__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.EXTENSION__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.EXTENSION__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.EXTENSION__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.EXTENSION__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -609,8 +612,8 @@
 				return;
 			case UMLPackage.EXTENSION__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.EXTENSION__USE_CASE :
 				getUseCases().clear();
@@ -618,24 +621,24 @@
 				return;
 			case UMLPackage.EXTENSION__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.EXTENSION__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.EXTENSION__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.EXTENSION__IS_DERIVED :
 				setIsDerived((Boolean) newValue);
 				return;
 			case UMLPackage.EXTENSION__MEMBER_END :
 				getMemberEnds().clear();
-				getMemberEnds().addAll(
-					(Collection<? extends Property>) newValue);
+				getMemberEnds()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.EXTENSION__OWNED_END :
 				getOwnedEnds().clear();
@@ -644,8 +647,8 @@
 				return;
 			case UMLPackage.EXTENSION__NAVIGABLE_OWNED_END :
 				getNavigableOwnedEnds().clear();
-				getNavigableOwnedEnds().addAll(
-					(Collection<? extends Property>) newValue);
+				getNavigableOwnedEnds()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -824,9 +827,11 @@
 			case UMLPackage.EXTENSION__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.EXTENSION__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.EXTENSION__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.EXTENSION__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.EXTENSION__USE_CASE :
@@ -843,7 +848,8 @@
 			case UMLPackage.EXTENSION__END_TYPE :
 				return !getEndTypes().isEmpty();
 			case UMLPackage.EXTENSION__IS_DERIVED :
-				return ((eFlags & IS_DERIVED_EFLAG) != 0) != IS_DERIVED_EDEFAULT;
+				return ((eFlags
+					& IS_DERIVED_EFLAG) != 0) != IS_DERIVED_EDEFAULT;
 			case UMLPackage.EXTENSION__MEMBER_END :
 				return memberEnds != null && !memberEnds.isEmpty();
 			case UMLPackage.EXTENSION__OWNED_END :
@@ -916,7 +922,8 @@
 			case UMLPackage.EXTENSION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.EXTENSION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXTENSION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.EXTENSION___GET_STEREOTYPE_APPLICATIONS :
@@ -924,7 +931,8 @@
 			case UMLPackage.EXTENSION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.EXTENSION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXTENSION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1013,13 +1021,13 @@
 			case UMLPackage.EXTENSION___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.EXTENSION___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.EXTENSION___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.EXTENSION___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.EXTENSION___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.EXTENSION___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1039,10 +1047,11 @@
 			case UMLPackage.EXTENSION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.EXTENSION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.EXTENSION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.EXTENSION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.EXTENSION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionPointImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionPointImpl.java
index 6263ec7..73f961a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionPointImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ExtensionPointImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -150,7 +150,8 @@
 	 */
 	public void setUseCase(UseCase newUseCase) {
 		if (newUseCase != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.EXTENSION_POINT__USE_CASE && newUseCase != null)) {
+			|| (eContainerFeatureID() != UMLPackage.EXTENSION_POINT__USE_CASE
+				&& newUseCase != null)) {
 			if (EcoreUtil.isAncestor(this, newUseCase))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -210,11 +211,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.EXTENSION_POINT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION_POINT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.EXTENSION_POINT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.EXTENSION_POINT__USE_CASE :
@@ -298,13 +299,13 @@
 		switch (featureID) {
 			case UMLPackage.EXTENSION_POINT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.EXTENSION_POINT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.EXTENSION_POINT__NAME :
 				setName((String) newValue);
@@ -457,7 +458,8 @@
 			case UMLPackage.EXTENSION_POINT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.EXTENSION_POINT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXTENSION_POINT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.EXTENSION_POINT___GET_STEREOTYPE_APPLICATIONS :
@@ -465,7 +467,8 @@
 			case UMLPackage.EXTENSION_POINT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.EXTENSION_POINT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.EXTENSION_POINT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -542,8 +545,8 @@
 			case UMLPackage.EXTENSION_POINT___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.EXTENSION_POINT___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.EXTENSION_POINT___VALIDATE_MUST_HAVE_NAME__DIAGNOSTICCHAIN_MAP :
 				return validateMustHaveName((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FeatureImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FeatureImpl.java
index 7fd22fb..d0eea1b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FeatureImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FeatureImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -105,14 +105,11 @@
 				.get(eResource, this,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
 			if (featuringClassifiers == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER,
-						featuringClassifiers = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class, this,
-							UMLPackage.FEATURE__FEATURING_CLASSIFIER, null));
+				cache.put(eResource, this,
+					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER,
+					featuringClassifiers = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.FEATURE__FEATURING_CLASSIFIER, null));
 			}
 			return featuringClassifiers;
 		}
@@ -124,7 +121,8 @@
 	 * The array of subset feature identifiers for the '{@link #getFeaturingClassifiers() <em>Featuring Classifier</em>}' reference list.
 	 * @see #getFeaturingClassifiers()
 	 */
-	protected static final int[] FEATURING_CLASSIFIER_ESUBSETS = new int[]{UMLPackage.FEATURE__NAMESPACE};
+	protected static final int[] FEATURING_CLASSIFIER_ESUBSETS = new int[]{
+		UMLPackage.FEATURE__NAMESPACE};
 
 	public EList<Classifier> getFeaturingClassifiers() {
 		CacheAdapter cache = getCacheAdapter();
@@ -135,15 +133,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
 			if (featuringClassifiers == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER,
-						featuringClassifiers = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class, this,
-							UMLPackage.FEATURE__FEATURING_CLASSIFIER,
-							FEATURING_CLASSIFIER_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER,
+					featuringClassifiers = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.FEATURE__FEATURING_CLASSIFIER,
+						FEATURING_CLASSIFIER_ESUBSETS));
 			}
 			return featuringClassifiers;
 		}
@@ -264,13 +259,13 @@
 		switch (featureID) {
 			case UMLPackage.FEATURE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.FEATURE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.FEATURE__NAME :
 				setName((String) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FinalNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FinalNodeImpl.java
index 1c71a84..8146f17 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FinalNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FinalNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -128,7 +128,8 @@
 			case UMLPackage.FINAL_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.FINAL_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.FINAL_NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.FINAL_NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -136,7 +137,8 @@
 			case UMLPackage.FINAL_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.FINAL_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.FINAL_NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -213,8 +215,8 @@
 			case UMLPackage.FINAL_NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.FINAL_NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.FINAL_NODE___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.FINAL_NODE___VALIDATE_NO_OUTGOING_EDGES__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FinalStateImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FinalStateImpl.java
index 19f9dfb..adbf253 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FinalStateImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FinalStateImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -187,7 +187,8 @@
 			case UMLPackage.FINAL_STATE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.FINAL_STATE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.FINAL_STATE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.FINAL_STATE___GET_STEREOTYPE_APPLICATIONS :
@@ -195,7 +196,8 @@
 			case UMLPackage.FINAL_STATE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.FINAL_STATE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.FINAL_STATE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -284,13 +286,13 @@
 			case UMLPackage.FINAL_STATE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.FINAL_STATE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.FINAL_STATE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.FINAL_STATE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.FINAL_STATE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.FINAL_STATE___MEMBERS_ARE_DISTINGUISHABLE :
@@ -310,8 +312,8 @@
 			case UMLPackage.FINAL_STATE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.FINAL_STATE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.FINAL_STATE___CONTAINING_STATE_MACHINE :
 				return containingStateMachine();
 			case UMLPackage.FINAL_STATE___GET_INCOMINGS :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ForkNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ForkNodeImpl.java
index f35fcfa..46e585e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ForkNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ForkNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -138,7 +138,8 @@
 			case UMLPackage.FORK_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.FORK_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.FORK_NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.FORK_NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -146,7 +147,8 @@
 			case UMLPackage.FORK_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.FORK_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.FORK_NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -223,8 +225,8 @@
 			case UMLPackage.FORK_NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.FORK_NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.FORK_NODE___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.FORK_NODE___VALIDATE_EDGES__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FunctionBehaviorImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FunctionBehaviorImpl.java
index a795777..bf8165c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FunctionBehaviorImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/FunctionBehaviorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -156,7 +156,8 @@
 			case UMLPackage.FUNCTION_BEHAVIOR___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.FUNCTION_BEHAVIOR___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.FUNCTION_BEHAVIOR___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.FUNCTION_BEHAVIOR___GET_STEREOTYPE_APPLICATIONS :
@@ -164,7 +165,8 @@
 			case UMLPackage.FUNCTION_BEHAVIOR___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.FUNCTION_BEHAVIOR___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.FUNCTION_BEHAVIOR___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -253,13 +255,13 @@
 			case UMLPackage.FUNCTION_BEHAVIOR___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.FUNCTION_BEHAVIOR___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.FUNCTION_BEHAVIOR___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.FUNCTION_BEHAVIOR___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.FUNCTION_BEHAVIOR___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.FUNCTION_BEHAVIOR___MEMBERS_ARE_DISTINGUISHABLE :
@@ -279,10 +281,11 @@
 			case UMLPackage.FUNCTION_BEHAVIOR___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.FUNCTION_BEHAVIOR___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.FUNCTION_BEHAVIOR___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.FUNCTION_BEHAVIOR___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.FUNCTION_BEHAVIOR___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -383,8 +386,7 @@
 			case UMLPackage.FUNCTION_BEHAVIOR___GET_OWNED_PORTS :
 				return getOwnedPorts();
 			case UMLPackage.FUNCTION_BEHAVIOR___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.FUNCTION_BEHAVIOR___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GateImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GateImpl.java
index 3ffa934..7390506 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GateImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GateImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -260,7 +260,8 @@
 			case UMLPackage.GATE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.GATE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.GATE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.GATE___GET_STEREOTYPE_APPLICATIONS :
@@ -268,7 +269,8 @@
 			case UMLPackage.GATE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.GATE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.GATE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralOrderingImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralOrderingImpl.java
index 9677e33..e12d45a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralOrderingImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralOrderingImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -108,7 +108,8 @@
 			if (before != oldBefore) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.GENERAL_ORDERING__BEFORE, oldBefore, before));
+						UMLPackage.GENERAL_ORDERING__BEFORE, oldBefore,
+						before));
 			}
 		}
 		return before;
@@ -175,8 +176,8 @@
 	 */
 	public boolean validateIrreflexiveTransitiveClosure(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return GeneralOrderingOperations.validateIrreflexiveTransitiveClosure(
-			this, diagnostics, context);
+		return GeneralOrderingOperations
+			.validateIrreflexiveTransitiveClosure(this, diagnostics, context);
 	}
 
 	/**
@@ -290,11 +291,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.GENERAL_ORDERING__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.GENERAL_ORDERING__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.GENERAL_ORDERING__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.GENERAL_ORDERING__AFTER :
@@ -362,13 +363,13 @@
 		switch (featureID) {
 			case UMLPackage.GENERAL_ORDERING__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.GENERAL_ORDERING__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.GENERAL_ORDERING__NAME :
 				setName((String) newValue);
@@ -517,7 +518,8 @@
 			case UMLPackage.GENERAL_ORDERING___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.GENERAL_ORDERING___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.GENERAL_ORDERING___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.GENERAL_ORDERING___GET_STEREOTYPE_APPLICATIONS :
@@ -525,7 +527,8 @@
 			case UMLPackage.GENERAL_ORDERING___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.GENERAL_ORDERING___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.GENERAL_ORDERING___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationImpl.java
index 76f0170..75befbe 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -136,8 +136,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> targets = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
+			EList<Element> targets = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
 			if (targets == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET,
@@ -162,8 +162,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> sources = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
+			EList<Element> sources = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
 			if (sources == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE,
@@ -199,8 +199,8 @@
 			eFlags &= ~IS_SUBSTITUTABLE_EFLAG;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.GENERALIZATION__IS_SUBSTITUTABLE,
-				oldIsSubstitutable, newIsSubstitutable));
+				UMLPackage.GENERALIZATION__IS_SUBSTITUTABLE, oldIsSubstitutable,
+				newIsSubstitutable));
 	}
 
 	/**
@@ -215,7 +215,8 @@
 			if (general != oldGeneral) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.GENERALIZATION__GENERAL, oldGeneral, general));
+						UMLPackage.GENERALIZATION__GENERAL, oldGeneral,
+						general));
 			}
 		}
 		return general;
@@ -325,7 +326,8 @@
 	 */
 	public void setSpecific(Classifier newSpecific) {
 		if (newSpecific != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.GENERALIZATION__SPECIFIC && newSpecific != null)) {
+			|| (eContainerFeatureID() != UMLPackage.GENERALIZATION__SPECIFIC
+				&& newSpecific != null)) {
 			if (EcoreUtil.isAncestor(this, newSpecific))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -378,11 +380,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.GENERALIZATION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.GENERALIZATION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.GENERALIZATION__GENERALIZATION_SET :
 				return ((InternalEList<?>) getGeneralizationSets())
 					.basicRemove(otherEnd, msgs);
@@ -460,21 +462,21 @@
 		switch (featureID) {
 			case UMLPackage.GENERALIZATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.GENERALIZATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.GENERALIZATION__GENERAL :
 				setGeneral((Classifier) newValue);
 				return;
 			case UMLPackage.GENERALIZATION__GENERALIZATION_SET :
 				getGeneralizationSets().clear();
-				getGeneralizationSets().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getGeneralizationSets()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.GENERALIZATION__IS_SUBSTITUTABLE :
 				setIsSubstitutable((Boolean) newValue);
@@ -544,7 +546,8 @@
 				return generalizationSets != null
 					&& !generalizationSets.isEmpty();
 			case UMLPackage.GENERALIZATION__IS_SUBSTITUTABLE :
-				return ((eFlags & IS_SUBSTITUTABLE_EFLAG) != 0) != IS_SUBSTITUTABLE_EDEFAULT;
+				return ((eFlags
+					& IS_SUBSTITUTABLE_EFLAG) != 0) != IS_SUBSTITUTABLE_EDEFAULT;
 			case UMLPackage.GENERALIZATION__SPECIFIC :
 				return basicGetSpecific() != null;
 		}
@@ -576,7 +579,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] TARGET_ESUBSETS = new int[]{UMLPackage.GENERALIZATION__GENERAL};
+	protected static final int[] TARGET_ESUBSETS = new int[]{
+		UMLPackage.GENERALIZATION__GENERAL};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -597,7 +601,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SOURCE_ESUBSETS = new int[]{UMLPackage.GENERALIZATION__SPECIFIC};
+	protected static final int[] SOURCE_ESUBSETS = new int[]{
+		UMLPackage.GENERALIZATION__SPECIFIC};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationSetImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationSetImpl.java
index 6e116e5..d09b5c1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationSetImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/GeneralizationSetImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -321,8 +321,8 @@
 	 */
 	public boolean validateMapsToGeneralizationSet(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return GeneralizationSetOperations.validateMapsToGeneralizationSet(
-			this, diagnostics, context);
+		return GeneralizationSetOperations.validateMapsToGeneralizationSet(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -345,10 +345,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.GENERALIZATION_SET__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.GENERALIZATION_SET__POWERTYPE :
@@ -374,11 +374,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.GENERALIZATION_SET__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.GENERALIZATION_SET__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.GENERALIZATION_SET__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.GENERALIZATION_SET__OWNING_TEMPLATE_PARAMETER :
@@ -388,8 +388,8 @@
 			case UMLPackage.GENERALIZATION_SET__POWERTYPE :
 				return basicSetPowertype(null, msgs);
 			case UMLPackage.GENERALIZATION_SET__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -461,13 +461,13 @@
 		switch (featureID) {
 			case UMLPackage.GENERALIZATION_SET__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.GENERALIZATION_SET__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.GENERALIZATION_SET__NAME :
 				setName((String) newValue);
@@ -495,8 +495,8 @@
 				return;
 			case UMLPackage.GENERALIZATION_SET__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -582,9 +582,11 @@
 			case UMLPackage.GENERALIZATION_SET__TEMPLATE_PARAMETER :
 				return templateParameter != null;
 			case UMLPackage.GENERALIZATION_SET__IS_COVERING :
-				return ((eFlags & IS_COVERING_EFLAG) != 0) != IS_COVERING_EDEFAULT;
+				return ((eFlags
+					& IS_COVERING_EFLAG) != 0) != IS_COVERING_EDEFAULT;
 			case UMLPackage.GENERALIZATION_SET__IS_DISJOINT :
-				return ((eFlags & IS_DISJOINT_EFLAG) != 0) != IS_DISJOINT_EDEFAULT;
+				return ((eFlags
+					& IS_DISJOINT_EFLAG) != 0) != IS_DISJOINT_EDEFAULT;
 			case UMLPackage.GENERALIZATION_SET__POWERTYPE :
 				return powertype != null;
 			case UMLPackage.GENERALIZATION_SET__GENERALIZATION :
@@ -650,7 +652,8 @@
 			case UMLPackage.GENERALIZATION_SET___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.GENERALIZATION_SET___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.GENERALIZATION_SET___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.GENERALIZATION_SET___GET_STEREOTYPE_APPLICATIONS :
@@ -658,7 +661,8 @@
 			case UMLPackage.GENERALIZATION_SET___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.GENERALIZATION_SET___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.GENERALIZATION_SET___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -721,7 +725,8 @@
 			case UMLPackage.GENERALIZATION_SET___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.GENERALIZATION_SET___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.GENERALIZATION_SET___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.GENERALIZATION_SET___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ImageImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ImageImpl.java
index c6e3948..27f00cb 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ImageImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ImageImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 451350
+ *   Kenn Hussey (CEA) - 327039, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -171,7 +171,8 @@
 		eFlags |= CONTENT_ESETFLAG;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.IMAGE__CONTENT, oldContent, content, !oldContentESet));
+				UMLPackage.IMAGE__CONTENT, oldContent, content,
+				!oldContentESet));
 	}
 
 	/**
@@ -337,13 +338,13 @@
 		switch (featureID) {
 			case UMLPackage.IMAGE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.IMAGE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.IMAGE__CONTENT :
 				setContent((String) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IncludeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IncludeImpl.java
index eb354ee..d51606d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IncludeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IncludeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -131,8 +131,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> sources = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
+			EList<Element> sources = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
 			if (sources == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE,
@@ -156,8 +156,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> targets = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
+			EList<Element> targets = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
 			if (targets == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET,
@@ -252,7 +252,8 @@
 	 */
 	public void setIncludingCase(UseCase newIncludingCase) {
 		if (newIncludingCase != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.INCLUDE__INCLUDING_CASE && newIncludingCase != null)) {
+			|| (eContainerFeatureID() != UMLPackage.INCLUDE__INCLUDING_CASE
+				&& newIncludingCase != null)) {
 			if (EcoreUtil.isAncestor(this, newIncludingCase))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -302,11 +303,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.INCLUDE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INCLUDE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INCLUDE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.INCLUDE__INCLUDING_CASE :
@@ -394,13 +395,13 @@
 		switch (featureID) {
 			case UMLPackage.INCLUDE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INCLUDE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INCLUDE__NAME :
 				setName((String) newValue);
@@ -504,7 +505,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Relationship.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.INCLUDE__RELATED_ELEMENT :
@@ -532,7 +534,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Relationship.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.RELATIONSHIP__RELATED_ELEMENT :
@@ -582,7 +585,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SOURCE_ESUBSETS = new int[]{UMLPackage.INCLUDE__INCLUDING_CASE};
+	protected static final int[] SOURCE_ESUBSETS = new int[]{
+		UMLPackage.INCLUDE__INCLUDING_CASE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -601,7 +605,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] TARGET_ESUBSETS = new int[]{UMLPackage.INCLUDE__ADDITION};
+	protected static final int[] TARGET_ESUBSETS = new int[]{
+		UMLPackage.INCLUDE__ADDITION};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InformationFlowImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InformationFlowImpl.java
index ec3da2c..c06fada 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InformationFlowImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InformationFlowImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -203,8 +203,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> sources = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
+			EList<Element> sources = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
 			if (sources == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE,
@@ -228,8 +228,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> targets = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
+			EList<Element> targets = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
 			if (targets == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET,
@@ -284,7 +284,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Classifier getConveyed(String name, boolean ignoreCase, EClass eClass) {
+	public Classifier getConveyed(String name, boolean ignoreCase,
+			EClass eClass) {
 		conveyedLoop : for (Classifier conveyed : getConveyeds()) {
 			if (eClass != null && !eClass.isInstance(conveyed))
 				continue conveyedLoop;
@@ -611,13 +612,13 @@
 		switch (featureID) {
 			case UMLPackage.INFORMATION_FLOW__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INFORMATION_FLOW__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INFORMATION_FLOW__NAME :
 				setName((String) newValue);
@@ -636,38 +637,38 @@
 				return;
 			case UMLPackage.INFORMATION_FLOW__CONVEYED :
 				getConveyeds().clear();
-				getConveyeds().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getConveyeds()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.INFORMATION_FLOW__INFORMATION_SOURCE :
 				getInformationSources().clear();
-				getInformationSources().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getInformationSources()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.INFORMATION_FLOW__INFORMATION_TARGET :
 				getInformationTargets().clear();
-				getInformationTargets().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getInformationTargets()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.INFORMATION_FLOW__REALIZATION :
 				getRealizations().clear();
-				getRealizations().addAll(
-					(Collection<? extends Relationship>) newValue);
+				getRealizations()
+					.addAll((Collection<? extends Relationship>) newValue);
 				return;
 			case UMLPackage.INFORMATION_FLOW__REALIZING_ACTIVITY_EDGE :
 				getRealizingActivityEdges().clear();
-				getRealizingActivityEdges().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getRealizingActivityEdges()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.INFORMATION_FLOW__REALIZING_CONNECTOR :
 				getRealizingConnectors().clear();
-				getRealizingConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getRealizingConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.INFORMATION_FLOW__REALIZING_MESSAGE :
 				getRealizingMessages().clear();
-				getRealizingMessages().addAll(
-					(Collection<? extends Message>) newValue);
+				getRealizingMessages()
+					.addAll((Collection<? extends Message>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -796,7 +797,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Relationship.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.INFORMATION_FLOW__RELATED_ELEMENT :
@@ -824,7 +826,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Relationship.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.RELATIONSHIP__RELATED_ELEMENT :
@@ -903,7 +906,8 @@
 			case UMLPackage.INFORMATION_FLOW___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.INFORMATION_FLOW___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INFORMATION_FLOW___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.INFORMATION_FLOW___GET_STEREOTYPE_APPLICATIONS :
@@ -911,7 +915,8 @@
 			case UMLPackage.INFORMATION_FLOW___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.INFORMATION_FLOW___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INFORMATION_FLOW___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -974,7 +979,8 @@
 			case UMLPackage.INFORMATION_FLOW___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.INFORMATION_FLOW___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.INFORMATION_FLOW___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.INFORMATION_FLOW___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1025,7 +1031,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SOURCE_ESUBSETS = new int[]{UMLPackage.INFORMATION_FLOW__INFORMATION_SOURCE};
+	protected static final int[] SOURCE_ESUBSETS = new int[]{
+		UMLPackage.INFORMATION_FLOW__INFORMATION_SOURCE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1044,7 +1051,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] TARGET_ESUBSETS = new int[]{UMLPackage.INFORMATION_FLOW__INFORMATION_TARGET};
+	protected static final int[] TARGET_ESUBSETS = new int[]{
+		UMLPackage.INFORMATION_FLOW__INFORMATION_TARGET};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InformationItemImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InformationItemImpl.java
index 7f64110..ac06416 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InformationItemImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InformationItemImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -291,13 +291,13 @@
 		switch (featureID) {
 			case UMLPackage.INFORMATION_ITEM__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__NAME :
 				setName((String) newValue);
@@ -310,18 +310,18 @@
 				return;
 			case UMLPackage.INFORMATION_ITEM__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -337,31 +337,31 @@
 				return;
 			case UMLPackage.INFORMATION_ITEM__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -371,8 +371,8 @@
 				return;
 			case UMLPackage.INFORMATION_ITEM__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__USE_CASE :
 				getUseCases().clear();
@@ -380,21 +380,21 @@
 				return;
 			case UMLPackage.INFORMATION_ITEM__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.INFORMATION_ITEM__REPRESENTED :
 				getRepresenteds().clear();
-				getRepresenteds().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRepresenteds()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -564,9 +564,11 @@
 			case UMLPackage.INFORMATION_ITEM__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.INFORMATION_ITEM__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.INFORMATION_ITEM__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.INFORMATION_ITEM__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.INFORMATION_ITEM__USE_CASE :
@@ -641,7 +643,8 @@
 			case UMLPackage.INFORMATION_ITEM___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.INFORMATION_ITEM___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INFORMATION_ITEM___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.INFORMATION_ITEM___GET_STEREOTYPE_APPLICATIONS :
@@ -649,7 +652,8 @@
 			case UMLPackage.INFORMATION_ITEM___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.INFORMATION_ITEM___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INFORMATION_ITEM___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -738,13 +742,13 @@
 			case UMLPackage.INFORMATION_ITEM___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.INFORMATION_ITEM___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.INFORMATION_ITEM___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.INFORMATION_ITEM___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.INFORMATION_ITEM___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.INFORMATION_ITEM___MEMBERS_ARE_DISTINGUISHABLE :
@@ -764,10 +768,11 @@
 			case UMLPackage.INFORMATION_ITEM___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.INFORMATION_ITEM___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.INFORMATION_ITEM___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.INFORMATION_ITEM___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.INFORMATION_ITEM___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InitialNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InitialNodeImpl.java
index 082ab34..b376b37 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InitialNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InitialNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -139,7 +139,8 @@
 			case UMLPackage.INITIAL_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.INITIAL_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INITIAL_NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.INITIAL_NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -147,7 +148,8 @@
 			case UMLPackage.INITIAL_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.INITIAL_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INITIAL_NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -224,8 +226,8 @@
 			case UMLPackage.INITIAL_NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.INITIAL_NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.INITIAL_NODE___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.INITIAL_NODE___VALIDATE_NO_INCOMING_EDGES__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InputPinImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InputPinImpl.java
index 3aebc34..b50fef5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InputPinImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InputPinImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -129,7 +129,8 @@
 			case UMLPackage.INPUT_PIN___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.INPUT_PIN___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INPUT_PIN___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.INPUT_PIN___GET_STEREOTYPE_APPLICATIONS :
@@ -137,7 +138,8 @@
 			case UMLPackage.INPUT_PIN___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.INPUT_PIN___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INPUT_PIN___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -214,8 +216,8 @@
 			case UMLPackage.INPUT_PIN___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.INPUT_PIN___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.INPUT_PIN___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.INPUT_PIN___VALIDATE_INPUT_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP :
@@ -261,8 +263,8 @@
 			case UMLPackage.INPUT_PIN___COMPATIBLE_WITH__MULTIPLICITYELEMENT :
 				return compatibleWith((MultiplicityElement) arguments.get(0));
 			case UMLPackage.INPUT_PIN___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT :
-				return includesMultiplicity((MultiplicityElement) arguments
-					.get(0));
+				return includesMultiplicity(
+					(MultiplicityElement) arguments.get(0));
 			case UMLPackage.INPUT_PIN___IS__INT_INT :
 				return is((Integer) arguments.get(0),
 					(Integer) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceSpecificationImpl.java
index 4df6598..4d99d8c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceSpecificationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 454400, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 454400, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -168,7 +168,8 @@
 	public TemplateParameter getTemplateParameter() {
 		if (templateParameter != null && templateParameter.eIsProxy()) {
 			InternalEObject oldTemplateParameter = (InternalEObject) templateParameter;
-			templateParameter = (TemplateParameter) eResolveProxy(oldTemplateParameter);
+			templateParameter = (TemplateParameter) eResolveProxy(
+				oldTemplateParameter);
 			if (templateParameter != oldTemplateParameter) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -271,7 +272,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetOwningTemplateParameter(
-			TemplateParameter newOwningTemplateParameter, NotificationChain msgs) {
+			TemplateParameter newOwningTemplateParameter,
+			NotificationChain msgs) {
 		msgs = eBasicSetContainer((InternalEObject) newOwningTemplateParameter,
 			UMLPackage.INSTANCE_SPECIFICATION__OWNING_TEMPLATE_PARAMETER, msgs);
 		Resource.Internal eInternalResource = eInternalResource();
@@ -293,7 +295,8 @@
 	public void setOwningTemplateParameter(
 			TemplateParameter newOwningTemplateParameter) {
 		if (newOwningTemplateParameter != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.INSTANCE_SPECIFICATION__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
+			|| (eContainerFeatureID() != UMLPackage.INSTANCE_SPECIFICATION__OWNING_TEMPLATE_PARAMETER
+				&& newOwningTemplateParameter != null)) {
 			if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -302,8 +305,7 @@
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newOwningTemplateParameter != null)
 				msgs = ((InternalEObject) newOwningTemplateParameter)
-					.eInverseAdd(
-						this,
+					.eInverseAdd(this,
 						UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 						TemplateParameter.class, msgs);
 			msgs = basicSetOwningTemplateParameter(newOwningTemplateParameter,
@@ -323,7 +325,8 @@
 	 */
 	@Override
 	public VisibilityKind getVisibility() {
-		return VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		return VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 	}
 
 	/**
@@ -333,7 +336,8 @@
 	 */
 	@Override
 	public void setVisibility(VisibilityKind newVisibility) {
-		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 		if (newVisibility == null)
 			newVisibility = VISIBILITY_EDEFAULT;
 		eFlags = eFlags & ~VISIBILITY_EFLAG
@@ -353,7 +357,8 @@
 	 */
 	@Override
 	public void unsetVisibility() {
-		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 		boolean oldVisibilityESet = (eFlags & VISIBILITY_ESETFLAG) != 0;
 		eFlags = eFlags & ~VISIBILITY_EFLAG | VISIBILITY_EFLAG_DEFAULT;
 		eFlags &= ~VISIBILITY_ESETFLAG;
@@ -384,8 +389,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -451,7 +456,8 @@
 	public ValueSpecification getSpecification() {
 		if (specification != null && specification.eIsProxy()) {
 			InternalEObject oldSpecification = (InternalEObject) specification;
-			specification = (ValueSpecification) eResolveProxy(oldSpecification);
+			specification = (ValueSpecification) eResolveProxy(
+				oldSpecification);
 			if (specification != oldSpecification) {
 				InternalEObject newSpecification = (InternalEObject) specification;
 				NotificationChain msgs = oldSpecification.eInverseRemove(this,
@@ -540,7 +546,8 @@
 	 */
 	public ValueSpecification createSpecification(String name, Type type,
 			EClass eClass) {
-		ValueSpecification newSpecification = (ValueSpecification) create(eClass);
+		ValueSpecification newSpecification = (ValueSpecification) create(
+			eClass);
 		setSpecification(newSpecification);
 		if (name != null)
 			newSpecification.setName(name);
@@ -597,10 +604,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateNamespaceNeedsVisibility(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return PackageableElementOperations.validateNamespaceNeedsVisibility(
-			this, diagnostics, context);
+	public boolean validateNamespaceNeedsVisibility(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return PackageableElementOperations
+			.validateNamespaceNeedsVisibility(this, diagnostics, context);
 	}
 
 	/**
@@ -670,10 +677,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.INSTANCE_SPECIFICATION__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.INSTANCE_SPECIFICATION__SLOT :
@@ -693,16 +700,16 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.INSTANCE_SPECIFICATION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INSTANCE_SPECIFICATION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INSTANCE_SPECIFICATION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.INSTANCE_SPECIFICATION__DEPLOYMENT :
-				return ((InternalEList<?>) getDeployments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getDeployments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INSTANCE_SPECIFICATION__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.INSTANCE_SPECIFICATION__TEMPLATE_PARAMETER :
@@ -802,13 +809,13 @@
 		switch (featureID) {
 			case UMLPackage.INSTANCE_SPECIFICATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INSTANCE_SPECIFICATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INSTANCE_SPECIFICATION__NAME :
 				setName((String) newValue);
@@ -821,8 +828,8 @@
 				return;
 			case UMLPackage.INSTANCE_SPECIFICATION__DEPLOYMENT :
 				getDeployments().clear();
-				getDeployments().addAll(
-					(Collection<? extends Deployment>) newValue);
+				getDeployments()
+					.addAll((Collection<? extends Deployment>) newValue);
 				return;
 			case UMLPackage.INSTANCE_SPECIFICATION__OWNING_TEMPLATE_PARAMETER :
 				setOwningTemplateParameter((TemplateParameter) newValue);
@@ -832,8 +839,8 @@
 				return;
 			case UMLPackage.INSTANCE_SPECIFICATION__CLASSIFIER :
 				getClassifiers().clear();
-				getClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.INSTANCE_SPECIFICATION__SLOT :
 				getSlots().clear();
@@ -945,7 +952,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == ParameterableElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.INSTANCE_SPECIFICATION__OWNING_TEMPLATE_PARAMETER :
@@ -977,7 +985,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == ParameterableElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER :
@@ -1094,7 +1103,8 @@
 			case UMLPackage.INSTANCE_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.INSTANCE_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INSTANCE_SPECIFICATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.INSTANCE_SPECIFICATION___GET_STEREOTYPE_APPLICATIONS :
@@ -1102,7 +1112,8 @@
 			case UMLPackage.INSTANCE_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.INSTANCE_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INSTANCE_SPECIFICATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1167,7 +1178,8 @@
 			case UMLPackage.INSTANCE_SPECIFICATION___GET_DEPLOYED_ELEMENTS :
 				return getDeployedElements();
 			case UMLPackage.INSTANCE_SPECIFICATION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.INSTANCE_SPECIFICATION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.INSTANCE_SPECIFICATION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1215,8 +1227,8 @@
 	 */
 	@Override
 	public boolean isSetOwner() {
-		return super.isSetOwner()
-			|| eIsSet(UMLPackage.INSTANCE_SPECIFICATION__OWNING_TEMPLATE_PARAMETER);
+		return super.isSetOwner() || eIsSet(
+			UMLPackage.INSTANCE_SPECIFICATION__OWNING_TEMPLATE_PARAMETER);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceValueImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceValueImpl.java
index e3e5820..3aac07d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceValueImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InstanceValueImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -203,13 +203,13 @@
 		switch (featureID) {
 			case UMLPackage.INSTANCE_VALUE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INSTANCE_VALUE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INSTANCE_VALUE__NAME :
 				setName((String) newValue);
@@ -374,7 +374,8 @@
 			case UMLPackage.INSTANCE_VALUE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.INSTANCE_VALUE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INSTANCE_VALUE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.INSTANCE_VALUE___GET_STEREOTYPE_APPLICATIONS :
@@ -382,7 +383,8 @@
 			case UMLPackage.INSTANCE_VALUE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.INSTANCE_VALUE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INSTANCE_VALUE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -445,7 +447,8 @@
 			case UMLPackage.INSTANCE_VALUE___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.INSTANCE_VALUE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.INSTANCE_VALUE___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.INSTANCE_VALUE___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionConstraintImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionConstraintImpl.java
index 1d9d20f..5cdd2c2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionConstraintImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionConstraintImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -122,8 +122,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -150,14 +150,15 @@
 			minint = (ValueSpecification) eResolveProxy(oldMinint);
 			if (minint != oldMinint) {
 				InternalEObject newMinint = (InternalEObject) minint;
-				NotificationChain msgs = oldMinint
-					.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERACTION_CONSTRAINT__MININT, null, null);
+				NotificationChain msgs = oldMinint.eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.INTERACTION_CONSTRAINT__MININT,
+					null, null);
 				if (newMinint.eInternalContainer() == null) {
-					msgs = newMinint
-						.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.INTERACTION_CONSTRAINT__MININT, null,
-							msgs);
+					msgs = newMinint.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.INTERACTION_CONSTRAINT__MININT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -209,19 +210,22 @@
 		if (newMinint != minint) {
 			NotificationChain msgs = null;
 			if (minint != null)
-				msgs = ((InternalEObject) minint)
-					.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERACTION_CONSTRAINT__MININT, null, msgs);
+				msgs = ((InternalEObject) minint).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.INTERACTION_CONSTRAINT__MININT,
+					null, msgs);
 			if (newMinint != null)
-				msgs = ((InternalEObject) newMinint)
-					.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERACTION_CONSTRAINT__MININT, null, msgs);
+				msgs = ((InternalEObject) newMinint).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.INTERACTION_CONSTRAINT__MININT,
+					null, msgs);
 			msgs = basicSetMinint(newMinint, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.INTERACTION_CONSTRAINT__MININT, newMinint, newMinint));
+				UMLPackage.INTERACTION_CONSTRAINT__MININT, newMinint,
+				newMinint));
 	}
 
 	/**
@@ -229,7 +233,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ValueSpecification createMinint(String name, Type type, EClass eClass) {
+	public ValueSpecification createMinint(String name, Type type,
+			EClass eClass) {
 		ValueSpecification newMinint = (ValueSpecification) create(eClass);
 		setMinint(newMinint);
 		if (name != null)
@@ -250,14 +255,15 @@
 			maxint = (ValueSpecification) eResolveProxy(oldMaxint);
 			if (maxint != oldMaxint) {
 				InternalEObject newMaxint = (InternalEObject) maxint;
-				NotificationChain msgs = oldMaxint
-					.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERACTION_CONSTRAINT__MAXINT, null, null);
+				NotificationChain msgs = oldMaxint.eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.INTERACTION_CONSTRAINT__MAXINT,
+					null, null);
 				if (newMaxint.eInternalContainer() == null) {
-					msgs = newMaxint
-						.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.INTERACTION_CONSTRAINT__MAXINT, null,
-							msgs);
+					msgs = newMaxint.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.INTERACTION_CONSTRAINT__MAXINT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -309,19 +315,22 @@
 		if (newMaxint != maxint) {
 			NotificationChain msgs = null;
 			if (maxint != null)
-				msgs = ((InternalEObject) maxint)
-					.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERACTION_CONSTRAINT__MAXINT, null, msgs);
+				msgs = ((InternalEObject) maxint).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.INTERACTION_CONSTRAINT__MAXINT,
+					null, msgs);
 			if (newMaxint != null)
-				msgs = ((InternalEObject) newMaxint)
-					.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERACTION_CONSTRAINT__MAXINT, null, msgs);
+				msgs = ((InternalEObject) newMaxint).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.INTERACTION_CONSTRAINT__MAXINT,
+					null, msgs);
 			msgs = basicSetMaxint(newMaxint, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.INTERACTION_CONSTRAINT__MAXINT, newMaxint, newMaxint));
+				UMLPackage.INTERACTION_CONSTRAINT__MAXINT, newMaxint,
+				newMaxint));
 	}
 
 	/**
@@ -329,7 +338,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ValueSpecification createMaxint(String name, Type type, EClass eClass) {
+	public ValueSpecification createMaxint(String name, Type type,
+			EClass eClass) {
 		ValueSpecification newMaxint = (ValueSpecification) create(eClass);
 		setMaxint(newMaxint);
 		if (name != null)
@@ -399,8 +409,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateMaxintGreaterEqualMinint(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateMaxintGreaterEqualMinint(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return InteractionConstraintOperations
 			.validateMaxintGreaterEqualMinint(this, diagnostics, context);
 	}
@@ -415,11 +425,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.INTERACTION_CONSTRAINT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_CONSTRAINT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_CONSTRAINT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.INTERACTION_CONSTRAINT__OWNING_TEMPLATE_PARAMETER :
@@ -513,13 +523,13 @@
 		switch (featureID) {
 			case UMLPackage.INTERACTION_CONSTRAINT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INTERACTION_CONSTRAINT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INTERACTION_CONSTRAINT__NAME :
 				setName((String) newValue);
@@ -538,8 +548,8 @@
 				return;
 			case UMLPackage.INTERACTION_CONSTRAINT__CONSTRAINED_ELEMENT :
 				getConstrainedElements().clear();
-				getConstrainedElements().addAll(
-					(Collection<? extends Element>) newValue);
+				getConstrainedElements()
+					.addAll((Collection<? extends Element>) newValue);
 				return;
 			case UMLPackage.INTERACTION_CONSTRAINT__CONTEXT :
 				setContext((Namespace) newValue);
@@ -711,7 +721,8 @@
 			case UMLPackage.INTERACTION_CONSTRAINT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.INTERACTION_CONSTRAINT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INTERACTION_CONSTRAINT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.INTERACTION_CONSTRAINT___GET_STEREOTYPE_APPLICATIONS :
@@ -719,7 +730,8 @@
 			case UMLPackage.INTERACTION_CONSTRAINT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.INTERACTION_CONSTRAINT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INTERACTION_CONSTRAINT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -782,7 +794,8 @@
 			case UMLPackage.INTERACTION_CONSTRAINT___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.INTERACTION_CONSTRAINT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.INTERACTION_CONSTRAINT___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.INTERACTION_CONSTRAINT___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -793,8 +806,7 @@
 				return validateBooleanValue((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.INTERACTION_CONSTRAINT___VALIDATE_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP :
-				return validateNoSideEffects(
-					(DiagnosticChain) arguments.get(0),
+				return validateNoSideEffects((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.INTERACTION_CONSTRAINT___VALIDATE_NOT_APPLY_TO_SELF__DIAGNOSTICCHAIN_MAP :
 				return validateNotApplyToSelf(
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionFragmentImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionFragmentImpl.java
index 632538a..1588fab 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionFragmentImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionFragmentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -118,8 +118,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -194,7 +194,8 @@
 	 * @generated
 	 */
 	public GeneralOrdering createGeneralOrdering(String name) {
-		GeneralOrdering newGeneralOrdering = (GeneralOrdering) create(UMLPackage.Literals.GENERAL_ORDERING);
+		GeneralOrdering newGeneralOrdering = (GeneralOrdering) create(
+			UMLPackage.Literals.GENERAL_ORDERING);
 		getGeneralOrderings().add(newGeneralOrdering);
 		if (name != null)
 			newGeneralOrdering.setName(name);
@@ -270,7 +271,8 @@
 	 */
 	public void setEnclosingInteraction(Interaction newEnclosingInteraction) {
 		if (newEnclosingInteraction != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.INTERACTION_FRAGMENT__ENCLOSING_INTERACTION && newEnclosingInteraction != null)) {
+			|| (eContainerFeatureID() != UMLPackage.INTERACTION_FRAGMENT__ENCLOSING_INTERACTION
+				&& newEnclosingInteraction != null)) {
 			if (EcoreUtil.isAncestor(this, newEnclosingInteraction))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -331,7 +333,8 @@
 	 */
 	public void setEnclosingOperand(InteractionOperand newEnclosingOperand) {
 		if (newEnclosingOperand != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.INTERACTION_FRAGMENT__ENCLOSING_OPERAND && newEnclosingOperand != null)) {
+			|| (eContainerFeatureID() != UMLPackage.INTERACTION_FRAGMENT__ENCLOSING_OPERAND
+				&& newEnclosingOperand != null)) {
 			if (EcoreUtil.isAncestor(this, newEnclosingOperand))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -339,8 +342,8 @@
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newEnclosingOperand != null)
-				msgs = ((InternalEObject) newEnclosingOperand).eInverseAdd(
-					this, UMLPackage.INTERACTION_OPERAND__FRAGMENT,
+				msgs = ((InternalEObject) newEnclosingOperand).eInverseAdd(this,
+					UMLPackage.INTERACTION_OPERAND__FRAGMENT,
 					InteractionOperand.class, msgs);
 			msgs = basicSetEnclosingOperand(newEnclosingOperand, msgs);
 			if (msgs != null)
@@ -391,11 +394,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.INTERACTION_FRAGMENT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_FRAGMENT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_FRAGMENT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.INTERACTION_FRAGMENT__COVERED :
@@ -406,8 +409,8 @@
 			case UMLPackage.INTERACTION_FRAGMENT__ENCLOSING_INTERACTION :
 				return basicSetEnclosingInteraction(null, msgs);
 			case UMLPackage.INTERACTION_FRAGMENT__GENERAL_ORDERING :
-				return ((InternalEList<?>) getGeneralOrderings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralOrderings())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -493,13 +496,13 @@
 		switch (featureID) {
 			case UMLPackage.INTERACTION_FRAGMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INTERACTION_FRAGMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INTERACTION_FRAGMENT__NAME :
 				setName((String) newValue);
@@ -522,8 +525,8 @@
 				return;
 			case UMLPackage.INTERACTION_FRAGMENT__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionImpl.java
index d9172f4..49c65b3 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -210,8 +210,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -285,7 +285,8 @@
 	 * @generated
 	 */
 	public GeneralOrdering createGeneralOrdering(String name) {
-		GeneralOrdering newGeneralOrdering = (GeneralOrdering) create(UMLPackage.Literals.GENERAL_ORDERING);
+		GeneralOrdering newGeneralOrdering = (GeneralOrdering) create(
+			UMLPackage.Literals.GENERAL_ORDERING);
 		getGeneralOrderings().add(newGeneralOrdering);
 		if (name != null)
 			newGeneralOrdering.setName(name);
@@ -361,7 +362,8 @@
 	 */
 	public void setEnclosingInteraction(Interaction newEnclosingInteraction) {
 		if (newEnclosingInteraction != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.INTERACTION__ENCLOSING_INTERACTION && newEnclosingInteraction != null)) {
+			|| (eContainerFeatureID() != UMLPackage.INTERACTION__ENCLOSING_INTERACTION
+				&& newEnclosingInteraction != null)) {
 			if (EcoreUtil.isAncestor(this, newEnclosingInteraction))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -422,7 +424,8 @@
 	 */
 	public void setEnclosingOperand(InteractionOperand newEnclosingOperand) {
 		if (newEnclosingOperand != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.INTERACTION__ENCLOSING_OPERAND && newEnclosingOperand != null)) {
+			|| (eContainerFeatureID() != UMLPackage.INTERACTION__ENCLOSING_OPERAND
+				&& newEnclosingOperand != null)) {
 			if (EcoreUtil.isAncestor(this, newEnclosingOperand))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -430,8 +433,8 @@
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newEnclosingOperand != null)
-				msgs = ((InternalEObject) newEnclosingOperand).eInverseAdd(
-					this, UMLPackage.INTERACTION_OPERAND__FRAGMENT,
+				msgs = ((InternalEObject) newEnclosingOperand).eInverseAdd(this,
+					UMLPackage.INTERACTION_OPERAND__FRAGMENT,
 					InteractionOperand.class, msgs);
 			msgs = basicSetEnclosingOperand(newEnclosingOperand, msgs);
 			if (msgs != null)
@@ -787,10 +790,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.INTERACTION__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.INTERACTION__TEMPLATE_BINDING :
@@ -799,8 +802,9 @@
 			case UMLPackage.INTERACTION__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.INTERACTION__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.INTERACTION__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -827,7 +831,8 @@
 					msgs = ((InternalEObject) specification).eInverseRemove(
 						this, UMLPackage.BEHAVIORAL_FEATURE__METHOD,
 						BehavioralFeature.class, msgs);
-				return basicSetSpecification((BehavioralFeature) otherEnd, msgs);
+				return basicSetSpecification((BehavioralFeature) otherEnd,
+					msgs);
 			case UMLPackage.INTERACTION__COVERED :
 				return ((InternalEList<InternalEObject>) (InternalEList<?>) getCovereds())
 					.basicAdd(otherEnd, msgs);
@@ -864,75 +869,75 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.INTERACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.INTERACTION__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.INTERACTION__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.INTERACTION__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.INTERACTION__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.INTERACTION__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__OWNED_CONNECTOR :
-				return ((InternalEList<?>) getOwnedConnectors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedConnectors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__INTERFACE_REALIZATION :
 				return ((InternalEList<?>) getInterfaceRealizations())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__OWNED_BEHAVIOR :
-				return ((InternalEList<?>) getOwnedBehaviors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedBehaviors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__NESTED_CLASSIFIER :
-				return ((InternalEList<?>) getNestedClassifiers()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedClassifiers())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__OWNED_RECEPTION :
-				return ((InternalEList<?>) getOwnedReceptions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedReceptions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__SPECIFICATION :
 				return basicSetSpecification(null, msgs);
 			case UMLPackage.INTERACTION__OWNED_PARAMETER :
-				return ((InternalEList<?>) getOwnedParameters()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedParameters())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__OWNED_PARAMETER_SET :
 				return ((InternalEList<?>) getOwnedParameterSets())
 					.basicRemove(otherEnd, msgs);
@@ -944,20 +949,20 @@
 			case UMLPackage.INTERACTION__ENCLOSING_INTERACTION :
 				return basicSetEnclosingInteraction(null, msgs);
 			case UMLPackage.INTERACTION__GENERAL_ORDERING :
-				return ((InternalEList<?>) getGeneralOrderings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralOrderings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__LIFELINE :
-				return ((InternalEList<?>) getLifelines()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getLifelines()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.INTERACTION__FRAGMENT :
-				return ((InternalEList<?>) getFragments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getFragments()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.INTERACTION__ACTION :
 				return ((InternalEList<?>) getActions()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.INTERACTION__FORMAL_GATE :
-				return ((InternalEList<?>) getFormalGates()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getFormalGates())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION__MESSAGE :
 				return ((InternalEList<?>) getMessages()).basicRemove(otherEnd,
 					msgs);
@@ -1176,13 +1181,13 @@
 		switch (featureID) {
 			case UMLPackage.INTERACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INTERACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INTERACTION__NAME :
 				setName((String) newValue);
@@ -1195,18 +1200,18 @@
 				return;
 			case UMLPackage.INTERACTION__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.INTERACTION__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.INTERACTION__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.INTERACTION__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -1222,31 +1227,31 @@
 				return;
 			case UMLPackage.INTERACTION__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.INTERACTION__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.INTERACTION__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.INTERACTION__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.INTERACTION__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.INTERACTION__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.INTERACTION__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -1256,8 +1261,8 @@
 				return;
 			case UMLPackage.INTERACTION__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.INTERACTION__USE_CASE :
 				getUseCases().clear();
@@ -1265,26 +1270,26 @@
 				return;
 			case UMLPackage.INTERACTION__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.INTERACTION__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.INTERACTION__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.INTERACTION__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.INTERACTION__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.INTERACTION__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -1296,32 +1301,31 @@
 				return;
 			case UMLPackage.INTERACTION__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.INTERACTION__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 			case UMLPackage.INTERACTION__IS_ACTIVE :
 				setIsActive((Boolean) newValue);
 				return;
 			case UMLPackage.INTERACTION__NESTED_CLASSIFIER :
 				getNestedClassifiers().clear();
-				getNestedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getNestedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.INTERACTION__OWNED_RECEPTION :
 				getOwnedReceptions().clear();
-				getOwnedReceptions().addAll(
-					(Collection<? extends Reception>) newValue);
+				getOwnedReceptions()
+					.addAll((Collection<? extends Reception>) newValue);
 				return;
 			case UMLPackage.INTERACTION__SUPER_CLASS :
 				getSuperClasses().clear();
-				getSuperClasses()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
+				getSuperClasses().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
 				return;
 			case UMLPackage.INTERACTION__SPECIFICATION :
 				setSpecification((BehavioralFeature) newValue);
@@ -1331,28 +1335,28 @@
 				return;
 			case UMLPackage.INTERACTION__OWNED_PARAMETER :
 				getOwnedParameters().clear();
-				getOwnedParameters().addAll(
-					(Collection<? extends Parameter>) newValue);
+				getOwnedParameters()
+					.addAll((Collection<? extends Parameter>) newValue);
 				return;
 			case UMLPackage.INTERACTION__OWNED_PARAMETER_SET :
 				getOwnedParameterSets().clear();
-				getOwnedParameterSets().addAll(
-					(Collection<? extends ParameterSet>) newValue);
+				getOwnedParameterSets()
+					.addAll((Collection<? extends ParameterSet>) newValue);
 				return;
 			case UMLPackage.INTERACTION__POSTCONDITION :
 				getPostconditions().clear();
-				getPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.INTERACTION__PRECONDITION :
 				getPreconditions().clear();
-				getPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.INTERACTION__REDEFINED_BEHAVIOR :
 				getRedefinedBehaviors().clear();
-				getRedefinedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getRedefinedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.INTERACTION__COVERED :
 				getCovereds().clear();
@@ -1366,8 +1370,8 @@
 				return;
 			case UMLPackage.INTERACTION__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.INTERACTION__LIFELINE :
 				getLifelines().clear();
@@ -1636,7 +1640,8 @@
 			case UMLPackage.INTERACTION__IS_ABSTRACT :
 				return isSetIsAbstract();
 			case UMLPackage.INTERACTION__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.INTERACTION__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.INTERACTION__USE_CASE :
@@ -1724,7 +1729,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == InteractionFragment.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.INTERACTION__COVERED :
@@ -1748,7 +1754,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == InteractionFragment.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.INTERACTION_FRAGMENT__COVERED :
@@ -1823,7 +1830,8 @@
 			case UMLPackage.INTERACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.INTERACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INTERACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.INTERACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -1831,7 +1839,8 @@
 			case UMLPackage.INTERACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.INTERACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INTERACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1920,13 +1929,13 @@
 			case UMLPackage.INTERACTION___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.INTERACTION___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.INTERACTION___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.INTERACTION___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.INTERACTION___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.INTERACTION___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1946,10 +1955,11 @@
 			case UMLPackage.INTERACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.INTERACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.INTERACTION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.INTERACTION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.INTERACTION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -2050,8 +2060,7 @@
 			case UMLPackage.INTERACTION___GET_OWNED_PORTS :
 				return getOwnedPorts();
 			case UMLPackage.INTERACTION___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.INTERACTION___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionOperandImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionOperandImpl.java
index 88c48a3..880ce50 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionOperandImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionOperandImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -157,8 +157,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -233,7 +233,8 @@
 	 * @generated
 	 */
 	public GeneralOrdering createGeneralOrdering(String name) {
-		GeneralOrdering newGeneralOrdering = (GeneralOrdering) create(UMLPackage.Literals.GENERAL_ORDERING);
+		GeneralOrdering newGeneralOrdering = (GeneralOrdering) create(
+			UMLPackage.Literals.GENERAL_ORDERING);
 		getGeneralOrderings().add(newGeneralOrdering);
 		if (name != null)
 			newGeneralOrdering.setName(name);
@@ -309,7 +310,8 @@
 	 */
 	public void setEnclosingInteraction(Interaction newEnclosingInteraction) {
 		if (newEnclosingInteraction != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.INTERACTION_OPERAND__ENCLOSING_INTERACTION && newEnclosingInteraction != null)) {
+			|| (eContainerFeatureID() != UMLPackage.INTERACTION_OPERAND__ENCLOSING_INTERACTION
+				&& newEnclosingInteraction != null)) {
 			if (EcoreUtil.isAncestor(this, newEnclosingInteraction))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -370,7 +372,8 @@
 	 */
 	public void setEnclosingOperand(InteractionOperand newEnclosingOperand) {
 		if (newEnclosingOperand != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.INTERACTION_OPERAND__ENCLOSING_OPERAND && newEnclosingOperand != null)) {
+			|| (eContainerFeatureID() != UMLPackage.INTERACTION_OPERAND__ENCLOSING_OPERAND
+				&& newEnclosingOperand != null)) {
 			if (EcoreUtil.isAncestor(this, newEnclosingOperand))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -378,8 +381,8 @@
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newEnclosingOperand != null)
-				msgs = ((InternalEObject) newEnclosingOperand).eInverseAdd(
-					this, UMLPackage.INTERACTION_OPERAND__FRAGMENT,
+				msgs = ((InternalEObject) newEnclosingOperand).eInverseAdd(this,
+					UMLPackage.INTERACTION_OPERAND__FRAGMENT,
 					InteractionOperand.class, msgs);
 			msgs = basicSetEnclosingOperand(newEnclosingOperand, msgs);
 			if (msgs != null)
@@ -429,18 +432,23 @@
 			guard = (InteractionConstraint) eResolveProxy(oldGuard);
 			if (guard != oldGuard) {
 				InternalEObject newGuard = (InternalEObject) guard;
-				NotificationChain msgs = oldGuard.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERACTION_OPERAND__GUARD, null, null);
+				NotificationChain msgs = oldGuard
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.INTERACTION_OPERAND__GUARD,
+						null, null);
 				if (newGuard.eInternalContainer() == null) {
-					msgs = newGuard.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERACTION_OPERAND__GUARD, null, msgs);
+					msgs = newGuard.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.INTERACTION_OPERAND__GUARD,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.INTERACTION_OPERAND__GUARD, oldGuard, guard));
+						UMLPackage.INTERACTION_OPERAND__GUARD, oldGuard,
+						guard));
 			}
 		}
 		return guard;
@@ -485,13 +493,17 @@
 		if (newGuard != guard) {
 			NotificationChain msgs = null;
 			if (guard != null)
-				msgs = ((InternalEObject) guard).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERACTION_OPERAND__GUARD, null, msgs);
+				msgs = ((InternalEObject) guard)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.INTERACTION_OPERAND__GUARD,
+						null, msgs);
 			if (newGuard != null)
-				msgs = ((InternalEObject) newGuard).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERACTION_OPERAND__GUARD, null, msgs);
+				msgs = ((InternalEObject) newGuard)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.INTERACTION_OPERAND__GUARD,
+						null, msgs);
 			msgs = basicSetGuard(newGuard, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -506,7 +518,8 @@
 	 * @generated
 	 */
 	public InteractionConstraint createGuard(String name) {
-		InteractionConstraint newGuard = (InteractionConstraint) create(UMLPackage.Literals.INTERACTION_CONSTRAINT);
+		InteractionConstraint newGuard = (InteractionConstraint) create(
+			UMLPackage.Literals.INTERACTION_CONSTRAINT);
 		setGuard(newGuard);
 		if (name != null)
 			newGuard.setName(name);
@@ -589,8 +602,8 @@
 	 */
 	public boolean validateGuardContainReferences(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return InteractionOperandOperations.validateGuardContainReferences(
-			this, diagnostics, context);
+		return InteractionOperandOperations.validateGuardContainReferences(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -645,22 +658,22 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.INTERACTION_OPERAND__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_OPERAND__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_OPERAND__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.INTERACTION_OPERAND__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_OPERAND__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_OPERAND__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_OPERAND__COVERED :
 				return ((InternalEList<?>) getCovereds()).basicRemove(otherEnd,
 					msgs);
@@ -669,11 +682,11 @@
 			case UMLPackage.INTERACTION_OPERAND__ENCLOSING_INTERACTION :
 				return basicSetEnclosingInteraction(null, msgs);
 			case UMLPackage.INTERACTION_OPERAND__GENERAL_ORDERING :
-				return ((InternalEList<?>) getGeneralOrderings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralOrderings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_OPERAND__FRAGMENT :
-				return ((InternalEList<?>) getFragments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getFragments()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.INTERACTION_OPERAND__GUARD :
 				return basicSetGuard(null, msgs);
 		}
@@ -779,13 +792,13 @@
 		switch (featureID) {
 			case UMLPackage.INTERACTION_OPERAND__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INTERACTION_OPERAND__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INTERACTION_OPERAND__NAME :
 				setName((String) newValue);
@@ -798,18 +811,18 @@
 				return;
 			case UMLPackage.INTERACTION_OPERAND__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.INTERACTION_OPERAND__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.INTERACTION_OPERAND__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.INTERACTION_OPERAND__COVERED :
 				getCovereds().clear();
@@ -823,8 +836,8 @@
 				return;
 			case UMLPackage.INTERACTION_OPERAND__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.INTERACTION_OPERAND__FRAGMENT :
 				getFragments().clear();
@@ -956,7 +969,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == InteractionFragment.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.INTERACTION_OPERAND__COVERED :
@@ -980,7 +994,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == InteractionFragment.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.INTERACTION_FRAGMENT__COVERED :
@@ -1055,7 +1070,8 @@
 			case UMLPackage.INTERACTION_OPERAND___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.INTERACTION_OPERAND___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INTERACTION_OPERAND___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.INTERACTION_OPERAND___GET_STEREOTYPE_APPLICATIONS :
@@ -1063,7 +1079,8 @@
 			case UMLPackage.INTERACTION_OPERAND___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.INTERACTION_OPERAND___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INTERACTION_OPERAND___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1152,13 +1169,13 @@
 			case UMLPackage.INTERACTION_OPERAND___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.INTERACTION_OPERAND___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.INTERACTION_OPERAND___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.INTERACTION_OPERAND___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.INTERACTION_OPERAND___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.INTERACTION_OPERAND___MEMBERS_ARE_DISTINGUISHABLE :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionUseImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionUseImpl.java
index dba70a2..f234fbe 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionUseImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InteractionUseImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -160,8 +160,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -228,14 +228,16 @@
 			returnValue = (ValueSpecification) eResolveProxy(oldReturnValue);
 			if (returnValue != oldReturnValue) {
 				InternalEObject newReturnValue = (InternalEObject) returnValue;
-				NotificationChain msgs = oldReturnValue.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERACTION_USE__RETURN_VALUE, null, null);
+				NotificationChain msgs = oldReturnValue
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.INTERACTION_USE__RETURN_VALUE,
+						null, null);
 				if (newReturnValue.eInternalContainer() == null) {
 					msgs = newReturnValue.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.INTERACTION_USE__RETURN_VALUE, null,
-						msgs);
+							- UMLPackage.INTERACTION_USE__RETURN_VALUE,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -287,13 +289,17 @@
 		if (newReturnValue != returnValue) {
 			NotificationChain msgs = null;
 			if (returnValue != null)
-				msgs = ((InternalEObject) returnValue).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERACTION_USE__RETURN_VALUE, null, msgs);
+				msgs = ((InternalEObject) returnValue)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.INTERACTION_USE__RETURN_VALUE,
+						null, msgs);
 			if (newReturnValue != null)
-				msgs = ((InternalEObject) newReturnValue).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERACTION_USE__RETURN_VALUE, null, msgs);
+				msgs = ((InternalEObject) newReturnValue)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.INTERACTION_USE__RETURN_VALUE,
+						null, msgs);
 			msgs = basicSetReturnValue(newReturnValue, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -327,7 +333,8 @@
 	public Property getReturnValueRecipient() {
 		if (returnValueRecipient != null && returnValueRecipient.eIsProxy()) {
 			InternalEObject oldReturnValueRecipient = (InternalEObject) returnValueRecipient;
-			returnValueRecipient = (Property) eResolveProxy(oldReturnValueRecipient);
+			returnValueRecipient = (Property) eResolveProxy(
+				oldReturnValueRecipient);
 			if (returnValueRecipient != oldReturnValueRecipient) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -506,8 +513,8 @@
 	 */
 	public boolean validateArgumentsCorrespondToParameters(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return InteractionUseOperations
-			.validateArgumentsCorrespondToParameters(this, diagnostics, context);
+		return InteractionUseOperations.validateArgumentsCorrespondToParameters(
+			this, diagnostics, context);
 	}
 
 	/**
@@ -540,8 +547,8 @@
 	 */
 	public boolean validateReturnValueRecipientCoverage(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return InteractionUseOperations.validateReturnValueRecipientCoverage(
-			this, diagnostics, context);
+		return InteractionUseOperations
+			.validateReturnValueRecipientCoverage(this, diagnostics, context);
 	}
 
 	/**
@@ -554,11 +561,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.INTERACTION_USE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_USE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_USE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.INTERACTION_USE__COVERED :
@@ -569,14 +576,14 @@
 			case UMLPackage.INTERACTION_USE__ENCLOSING_INTERACTION :
 				return basicSetEnclosingInteraction(null, msgs);
 			case UMLPackage.INTERACTION_USE__GENERAL_ORDERING :
-				return ((InternalEList<?>) getGeneralOrderings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralOrderings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_USE__ACTUAL_GATE :
-				return ((InternalEList<?>) getActualGates()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getActualGates())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERACTION_USE__ARGUMENT :
-				return ((InternalEList<?>) getArguments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getArguments()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.INTERACTION_USE__RETURN_VALUE :
 				return basicSetReturnValue(null, msgs);
 		}
@@ -660,13 +667,13 @@
 		switch (featureID) {
 			case UMLPackage.INTERACTION_USE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INTERACTION_USE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INTERACTION_USE__NAME :
 				setName((String) newValue);
@@ -689,8 +696,8 @@
 				return;
 			case UMLPackage.INTERACTION_USE__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.INTERACTION_USE__ACTUAL_GATE :
 				getActualGates().clear();
@@ -877,7 +884,8 @@
 			case UMLPackage.INTERACTION_USE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.INTERACTION_USE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INTERACTION_USE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.INTERACTION_USE___GET_STEREOTYPE_APPLICATIONS :
@@ -885,7 +893,8 @@
 			case UMLPackage.INTERACTION_USE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.INTERACTION_USE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INTERACTION_USE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceImpl.java
index d3f7038..be36078 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -277,7 +277,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Property createOwnedAttribute(String name, Type type, EClass eClass) {
+	public Property createOwnedAttribute(String name, Type type,
+			EClass eClass) {
 		Property newOwnedAttribute = (Property) create(eClass);
 		getOwnedAttributes().add(newOwnedAttribute);
 		if (name != null)
@@ -336,7 +337,8 @@
 	public EList<Classifier> getNestedClassifiers() {
 		if (nestedClassifiers == null) {
 			nestedClassifiers = new EObjectContainmentEList.Resolving<Classifier>(
-				Classifier.class, this, UMLPackage.INTERFACE__NESTED_CLASSIFIER);
+				Classifier.class, this,
+				UMLPackage.INTERFACE__NESTED_CLASSIFIER);
 		}
 		return nestedClassifiers;
 	}
@@ -418,8 +420,10 @@
 	 * @generated
 	 */
 	public Reception createOwnedReception(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
-		Reception newOwnedReception = (Reception) create(UMLPackage.Literals.RECEPTION);
+			EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
+		Reception newOwnedReception = (Reception) create(
+			UMLPackage.Literals.RECEPTION);
 		getOwnedReceptions().add(newOwnedReception);
 		if (name != null)
 			newOwnedReception.setName(name);
@@ -437,9 +441,10 @@
 		for (int i = 0; i < ownedParameterListSize; i++) {
 			newOwnedReception.createOwnedParameter(i < ownedParameterNamesSize
 				? (String) ownedParameterNames.get(i)
-				: null, i < ownedParameterTypesSize
-				? (Type) ownedParameterTypes.get(i)
-				: null);
+				: null,
+				i < ownedParameterTypesSize
+					? (Type) ownedParameterTypes.get(i)
+					: null);
 		}
 		return newOwnedReception;
 	}
@@ -450,9 +455,10 @@
 	 * @generated
 	 */
 	public Reception getOwnedReception(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
-		return getOwnedReception(name, ownedParameterNames,
-			ownedParameterTypes, false, false);
+			EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
+		return getOwnedReception(name, ownedParameterNames, ownedParameterTypes,
+			false, false);
 	}
 
 	/**
@@ -473,20 +479,19 @@
 			int ownedParameterListSize = ownedParameterList.size();
 			if (ownedParameterNames != null
 				&& ownedParameterNames.size() != ownedParameterListSize
-				|| (ownedParameterTypes != null && ownedParameterTypes.size() != ownedParameterListSize))
+				|| (ownedParameterTypes != null
+					&& ownedParameterTypes.size() != ownedParameterListSize))
 				continue ownedReceptionLoop;
 			for (int j = 0; j < ownedParameterListSize; j++) {
 				Parameter ownedParameter = ownedParameterList.get(j);
-				if (ownedParameterNames != null
-					&& !(ignoreCase
-						? (ownedParameterNames.get(j))
-							.equalsIgnoreCase(ownedParameter.getName())
-						: ownedParameterNames.get(j).equals(
-							ownedParameter.getName())))
+				if (ownedParameterNames != null && !(ignoreCase
+					? (ownedParameterNames.get(j))
+						.equalsIgnoreCase(ownedParameter.getName())
+					: ownedParameterNames.get(j)
+						.equals(ownedParameter.getName())))
 					continue ownedReceptionLoop;
-				if (ownedParameterTypes != null
-					&& !ownedParameterTypes.get(j).equals(
-						ownedParameter.getType()))
+				if (ownedParameterTypes != null && !ownedParameterTypes.get(j)
+					.equals(ownedParameter.getType()))
 					continue ownedReceptionLoop;
 			}
 			return ownedReception;
@@ -512,8 +517,9 @@
 					EOPPOSITE_FEATURE_BASE - UMLPackage.INTERFACE__PROTOCOL,
 					null, null);
 				if (newProtocol.eInternalContainer() == null) {
-					msgs = newProtocol.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERFACE__PROTOCOL, null, msgs);
+					msgs = newProtocol.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - UMLPackage.INTERFACE__PROTOCOL,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -585,7 +591,8 @@
 	 * @generated
 	 */
 	public ProtocolStateMachine createProtocol(String name) {
-		ProtocolStateMachine newProtocol = (ProtocolStateMachine) create(UMLPackage.Literals.PROTOCOL_STATE_MACHINE);
+		ProtocolStateMachine newProtocol = (ProtocolStateMachine) create(
+			UMLPackage.Literals.PROTOCOL_STATE_MACHINE);
 		setProtocol(newProtocol);
 		if (name != null)
 			newProtocol.setName(name);
@@ -612,8 +619,10 @@
 	 * @generated
 	 */
 	public Operation createOwnedOperation(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
-		Operation newOwnedOperation = (Operation) create(UMLPackage.Literals.OPERATION);
+			EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
+		Operation newOwnedOperation = (Operation) create(
+			UMLPackage.Literals.OPERATION);
 		getOwnedOperations().add(newOwnedOperation);
 		if (name != null)
 			newOwnedOperation.setName(name);
@@ -631,9 +640,10 @@
 		for (int i = 0; i < ownedParameterListSize; i++) {
 			newOwnedOperation.createOwnedParameter(i < ownedParameterNamesSize
 				? (String) ownedParameterNames.get(i)
-				: null, i < ownedParameterTypesSize
-				? (Type) ownedParameterTypes.get(i)
-				: null);
+				: null,
+				i < ownedParameterTypesSize
+					? (Type) ownedParameterTypes.get(i)
+					: null);
 		}
 		return newOwnedOperation;
 	}
@@ -644,9 +654,10 @@
 	 * @generated
 	 */
 	public Operation getOwnedOperation(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
-		return getOwnedOperation(name, ownedParameterNames,
-			ownedParameterTypes, false, false);
+			EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
+		return getOwnedOperation(name, ownedParameterNames, ownedParameterTypes,
+			false, false);
 	}
 
 	/**
@@ -667,20 +678,19 @@
 			int ownedParameterListSize = ownedParameterList.size();
 			if (ownedParameterNames != null
 				&& ownedParameterNames.size() != ownedParameterListSize
-				|| (ownedParameterTypes != null && ownedParameterTypes.size() != ownedParameterListSize))
+				|| (ownedParameterTypes != null
+					&& ownedParameterTypes.size() != ownedParameterListSize))
 				continue ownedOperationLoop;
 			for (int j = 0; j < ownedParameterListSize; j++) {
 				Parameter ownedParameter = ownedParameterList.get(j);
-				if (ownedParameterNames != null
-					&& !(ignoreCase
-						? (ownedParameterNames.get(j))
-							.equalsIgnoreCase(ownedParameter.getName())
-						: ownedParameterNames.get(j).equals(
-							ownedParameter.getName())))
+				if (ownedParameterNames != null && !(ignoreCase
+					? (ownedParameterNames.get(j))
+						.equalsIgnoreCase(ownedParameter.getName())
+					: ownedParameterNames.get(j)
+						.equals(ownedParameter.getName())))
 					continue ownedOperationLoop;
-				if (ownedParameterTypes != null
-					&& !ownedParameterTypes.get(j).equals(
-						ownedParameter.getType()))
+				if (ownedParameterTypes != null && !ownedParameterTypes.get(j)
+					.equals(ownedParameter.getType()))
 					continue ownedOperationLoop;
 			}
 			return ownedOperation;
@@ -721,8 +731,8 @@
 	 */
 	public Property createOwnedAttribute(String name, Type type, int lower,
 			int upper) {
-		return InterfaceOperations.createOwnedAttribute(this, name, type,
-			lower, upper);
+		return InterfaceOperations.createOwnedAttribute(this, name, type, lower,
+			upper);
 	}
 
 	/**
@@ -754,10 +764,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.INTERFACE__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.INTERFACE__TEMPLATE_BINDING :
@@ -766,8 +776,9 @@
 			case UMLPackage.INTERFACE__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.INTERFACE__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.INTERFACE__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -803,63 +814,63 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.INTERFACE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.INTERFACE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.INTERFACE__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.INTERFACE__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.INTERFACE__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.INTERFACE__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__NESTED_CLASSIFIER :
-				return ((InternalEList<?>) getNestedClassifiers()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedClassifiers())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__OWNED_RECEPTION :
-				return ((InternalEList<?>) getOwnedReceptions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedReceptions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE__PROTOCOL :
 				return basicSetProtocol(null, msgs);
 			case UMLPackage.INTERFACE__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -993,13 +1004,13 @@
 		switch (featureID) {
 			case UMLPackage.INTERFACE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INTERFACE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INTERFACE__NAME :
 				setName((String) newValue);
@@ -1012,18 +1023,18 @@
 				return;
 			case UMLPackage.INTERFACE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.INTERFACE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.INTERFACE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.INTERFACE__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -1039,31 +1050,31 @@
 				return;
 			case UMLPackage.INTERFACE__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.INTERFACE__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.INTERFACE__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.INTERFACE__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.INTERFACE__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.INTERFACE__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.INTERFACE__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -1073,8 +1084,8 @@
 				return;
 			case UMLPackage.INTERFACE__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.INTERFACE__USE_CASE :
 				getUseCases().clear();
@@ -1082,44 +1093,44 @@
 				return;
 			case UMLPackage.INTERFACE__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.INTERFACE__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.INTERFACE__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.INTERFACE__NESTED_CLASSIFIER :
 				getNestedClassifiers().clear();
-				getNestedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getNestedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.INTERFACE__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.INTERFACE__OWNED_RECEPTION :
 				getOwnedReceptions().clear();
-				getOwnedReceptions().addAll(
-					(Collection<? extends Reception>) newValue);
+				getOwnedReceptions()
+					.addAll((Collection<? extends Reception>) newValue);
 				return;
 			case UMLPackage.INTERFACE__PROTOCOL :
 				setProtocol((ProtocolStateMachine) newValue);
 				return;
 			case UMLPackage.INTERFACE__REDEFINED_INTERFACE :
 				getRedefinedInterfaces().clear();
-				getRedefinedInterfaces().addAll(
-					(Collection<? extends Interface>) newValue);
+				getRedefinedInterfaces()
+					.addAll((Collection<? extends Interface>) newValue);
 				return;
 			case UMLPackage.INTERFACE__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -1304,9 +1315,11 @@
 			case UMLPackage.INTERFACE__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.INTERFACE__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.INTERFACE__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.INTERFACE__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.INTERFACE__USE_CASE :
@@ -1393,7 +1406,8 @@
 			case UMLPackage.INTERFACE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.INTERFACE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INTERFACE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.INTERFACE___GET_STEREOTYPE_APPLICATIONS :
@@ -1401,7 +1415,8 @@
 			case UMLPackage.INTERFACE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.INTERFACE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INTERFACE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1490,13 +1505,13 @@
 			case UMLPackage.INTERFACE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.INTERFACE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.INTERFACE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.INTERFACE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.INTERFACE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.INTERFACE___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1516,10 +1531,11 @@
 			case UMLPackage.INTERFACE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.INTERFACE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.INTERFACE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.INTERFACE___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.INTERFACE___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1658,7 +1674,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] ATTRIBUTE_ESUBSETS = new int[]{UMLPackage.INTERFACE__OWNED_ATTRIBUTE};
+	protected static final int[] ATTRIBUTE_ESUBSETS = new int[]{
+		UMLPackage.INTERFACE__OWNED_ATTRIBUTE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1711,7 +1728,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_CLASSIFIER_ESUBSETS = new int[]{UMLPackage.INTERFACE__REDEFINED_INTERFACE};
+	protected static final int[] REDEFINED_CLASSIFIER_ESUBSETS = new int[]{
+		UMLPackage.INTERFACE__REDEFINED_INTERFACE};
 
 	/**
 	 * The array of superset feature identifiers for the '{@link #getRedefinedInterfaces() <em>Redefined Interface</em>}' reference list.
@@ -1721,7 +1739,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_INTERFACE_ESUPERSETS = new int[]{UMLPackage.INTERFACE__REDEFINED_CLASSIFIER};
+	protected static final int[] REDEFINED_INTERFACE_ESUPERSETS = new int[]{
+		UMLPackage.INTERFACE__REDEFINED_CLASSIFIER};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceRealizationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceRealizationImpl.java
index 6818fe0..b59a440 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceRealizationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceRealizationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -144,7 +144,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SUPPLIER_ESUBSETS = new int[]{UMLPackage.INTERFACE_REALIZATION__CONTRACT};
+	protected static final int[] SUPPLIER_ESUBSETS = new int[]{
+		UMLPackage.INTERFACE_REALIZATION__CONTRACT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -156,7 +157,8 @@
 		if (clients == null) {
 			clients = new SubsetSupersetEObjectResolvingEList<NamedElement>(
 				NamedElement.class, this,
-				UMLPackage.INTERFACE_REALIZATION__CLIENT, null, CLIENT_ESUBSETS);
+				UMLPackage.INTERFACE_REALIZATION__CLIENT, null,
+				CLIENT_ESUBSETS);
 		}
 		return clients;
 	}
@@ -169,7 +171,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] CLIENT_ESUBSETS = new int[]{UMLPackage.INTERFACE_REALIZATION__IMPLEMENTING_CLASSIFIER};
+	protected static final int[] CLIENT_ESUBSETS = new int[]{
+		UMLPackage.INTERFACE_REALIZATION__IMPLEMENTING_CLASSIFIER};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -183,8 +186,8 @@
 			if (contract != oldContract) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.INTERFACE_REALIZATION__CONTRACT,
-						oldContract, contract));
+						UMLPackage.INTERFACE_REALIZATION__CONTRACT, oldContract,
+						contract));
 			}
 		}
 		return contract;
@@ -274,7 +277,8 @@
 	public void setImplementingClassifier(
 			BehavioredClassifier newImplementingClassifier) {
 		if (newImplementingClassifier != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.INTERFACE_REALIZATION__IMPLEMENTING_CLASSIFIER && newImplementingClassifier != null)) {
+			|| (eContainerFeatureID() != UMLPackage.INTERFACE_REALIZATION__IMPLEMENTING_CLASSIFIER
+				&& newImplementingClassifier != null)) {
 			if (EcoreUtil.isAncestor(this, newImplementingClassifier))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -283,8 +287,7 @@
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newImplementingClassifier != null)
 				msgs = ((InternalEObject) newImplementingClassifier)
-					.eInverseAdd(
-						this,
+					.eInverseAdd(this,
 						UMLPackage.BEHAVIORED_CLASSIFIER__INTERFACE_REALIZATION,
 						BehavioredClassifier.class, msgs);
 			msgs = basicSetImplementingClassifier(newImplementingClassifier,
@@ -317,10 +320,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.INTERFACE_REALIZATION__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.INTERFACE_REALIZATION__IMPLEMENTING_CLASSIFIER :
@@ -342,11 +345,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.INTERFACE_REALIZATION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE_REALIZATION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERFACE_REALIZATION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.INTERFACE_REALIZATION__OWNING_TEMPLATE_PARAMETER :
@@ -461,13 +464,13 @@
 		switch (featureID) {
 			case UMLPackage.INTERFACE_REALIZATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INTERFACE_REALIZATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INTERFACE_REALIZATION__NAME :
 				setName((String) newValue);
@@ -486,13 +489,13 @@
 				return;
 			case UMLPackage.INTERFACE_REALIZATION__CLIENT :
 				getClients().clear();
-				getClients().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getClients()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.INTERFACE_REALIZATION__SUPPLIER :
 				getSuppliers().clear();
-				getSuppliers().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getSuppliers()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.INTERFACE_REALIZATION__MAPPING :
 				setMapping((OpaqueExpression) newValue);
@@ -616,8 +619,8 @@
 	 */
 	@Override
 	public boolean isSetOwner() {
-		return super.isSetOwner()
-			|| eIsSet(UMLPackage.INTERFACE_REALIZATION__IMPLEMENTING_CLASSIFIER);
+		return super.isSetOwner() || eIsSet(
+			UMLPackage.INTERFACE_REALIZATION__IMPLEMENTING_CLASSIFIER);
 	}
 
 } //InterfaceRealizationImpl
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterruptibleActivityRegionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterruptibleActivityRegionImpl.java
index f21864a..ee8f4a3 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterruptibleActivityRegionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterruptibleActivityRegionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -122,16 +122,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_NODE);
 			if (containedNodes == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_NODE,
-						containedNodes = new DerivedUnionEObjectEList<ActivityNode>(
-							ActivityNode.class,
-							this,
-							UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__CONTAINED_NODE,
-							CONTAINED_NODE_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_NODE,
+					containedNodes = new DerivedUnionEObjectEList<ActivityNode>(
+						ActivityNode.class, this,
+						UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__CONTAINED_NODE,
+						CONTAINED_NODE_ESUBSETS));
 			}
 			return containedNodes;
 		}
@@ -169,7 +165,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ActivityNode getNode(String name, boolean ignoreCase, EClass eClass) {
+	public ActivityNode getNode(String name, boolean ignoreCase,
+			EClass eClass) {
 		nodeLoop : for (ActivityNode node : getNodes()) {
 			if (eClass != null && !eClass.isInstance(node))
 				continue nodeLoop;
@@ -232,8 +229,8 @@
 	 */
 	public boolean validateInterruptingEdges(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return InterruptibleActivityRegionOperations.validateInterruptingEdges(
-			this, diagnostics, context);
+		return InterruptibleActivityRegionOperations
+			.validateInterruptingEdges(this, diagnostics, context);
 	}
 
 	/**
@@ -269,16 +266,16 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE :
-				return ((InternalEList<?>) getInterruptingEdges()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInterruptingEdges())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__NODE :
 				return ((InternalEList<?>) getNodes()).basicRemove(otherEnd,
 					msgs);
@@ -353,13 +350,13 @@
 		switch (featureID) {
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__NAME :
 				setName((String) newValue);
@@ -375,8 +372,8 @@
 				return;
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE :
 				getInterruptingEdges().clear();
-				getInterruptingEdges().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getInterruptingEdges()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__NODE :
 				getNodes().clear();
@@ -529,7 +526,8 @@
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION___GET_STEREOTYPE_APPLICATIONS :
@@ -537,7 +535,8 @@
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -602,8 +601,7 @@
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION___VALIDATE_NODES_AND_EDGES__DIAGNOSTICCHAIN_MAP :
-				return validateNodesAndEdges(
-					(DiagnosticChain) arguments.get(0),
+				return validateNodesAndEdges((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION___VALIDATE_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP :
 				return validateNotContained((DiagnosticChain) arguments.get(0),
@@ -624,7 +622,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] CONTAINED_NODE_ESUBSETS = new int[]{UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__NODE};
+	protected static final int[] CONTAINED_NODE_ESUBSETS = new int[]{
+		UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION__NODE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalConstraintImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalConstraintImpl.java
index c154137..ede9a53 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalConstraintImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalConstraintImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -80,13 +80,14 @@
 	public ValueSpecification getSpecification() {
 		if (specification != null && specification.eIsProxy()) {
 			InternalEObject oldSpecification = (InternalEObject) specification;
-			specification = (ValueSpecification) eResolveProxy(oldSpecification);
+			specification = (ValueSpecification) eResolveProxy(
+				oldSpecification);
 			if (specification != oldSpecification) {
 				InternalEObject newSpecification = (InternalEObject) specification;
 				NotificationChain msgs = oldSpecification.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERVAL_CONSTRAINT__SPECIFICATION, null,
-					null);
+						- UMLPackage.INTERVAL_CONSTRAINT__SPECIFICATION,
+					null, null);
 				if (newSpecification.eInternalContainer() == null) {
 					msgs = newSpecification.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
@@ -122,7 +123,8 @@
 	@Override
 	public NotificationChain basicSetSpecification(
 			ValueSpecification newSpecification, NotificationChain msgs) {
-		if (newSpecification != null && !(newSpecification instanceof Interval)) {
+		if (newSpecification != null
+			&& !(newSpecification instanceof Interval)) {
 			throw new IllegalArgumentException(
 				"newSpecification must be an instance of Interval"); //$NON-NLS-1$
 		}
@@ -130,8 +132,7 @@
 		specification = newSpecification;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this,
-				Notification.SET,
-				UMLPackage.INTERVAL_CONSTRAINT__SPECIFICATION,
+				Notification.SET, UMLPackage.INTERVAL_CONSTRAINT__SPECIFICATION,
 				oldSpecification, newSpecification);
 			if (msgs == null)
 				msgs = notification;
@@ -148,7 +149,8 @@
 	 */
 	@Override
 	public void setSpecification(ValueSpecification newSpecification) {
-		if (newSpecification != null && !(newSpecification instanceof Interval)) {
+		if (newSpecification != null
+			&& !(newSpecification instanceof Interval)) {
 			throw new IllegalArgumentException(
 				"newSpecification must be an instance of Interval"); //$NON-NLS-1$
 		}
@@ -157,20 +159,20 @@
 			if (specification != null)
 				msgs = ((InternalEObject) specification).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERVAL_CONSTRAINT__SPECIFICATION, null,
-					msgs);
+						- UMLPackage.INTERVAL_CONSTRAINT__SPECIFICATION,
+					null, msgs);
 			if (newSpecification != null)
 				msgs = ((InternalEObject) newSpecification).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.INTERVAL_CONSTRAINT__SPECIFICATION, null,
-					msgs);
+						- UMLPackage.INTERVAL_CONSTRAINT__SPECIFICATION,
+					null, msgs);
 			msgs = basicSetSpecification(newSpecification, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.INTERVAL_CONSTRAINT__SPECIFICATION,
-				newSpecification, newSpecification));
+				UMLPackage.INTERVAL_CONSTRAINT__SPECIFICATION, newSpecification,
+				newSpecification));
 	}
 
 	/**
@@ -180,7 +182,8 @@
 	 */
 	public ValueSpecification createSpecification(String name, Type type,
 			EClass eClass) {
-		ValueSpecification newSpecification = (ValueSpecification) create(eClass);
+		ValueSpecification newSpecification = (ValueSpecification) create(
+			eClass);
 		setSpecification(newSpecification);
 		if (name != null)
 			newSpecification.setName(name);
@@ -208,11 +211,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.INTERVAL_CONSTRAINT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERVAL_CONSTRAINT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INTERVAL_CONSTRAINT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.INTERVAL_CONSTRAINT__OWNING_TEMPLATE_PARAMETER :
@@ -294,13 +297,13 @@
 		switch (featureID) {
 			case UMLPackage.INTERVAL_CONSTRAINT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INTERVAL_CONSTRAINT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INTERVAL_CONSTRAINT__NAME :
 				setName((String) newValue);
@@ -319,8 +322,8 @@
 				return;
 			case UMLPackage.INTERVAL_CONSTRAINT__CONSTRAINED_ELEMENT :
 				getConstrainedElements().clear();
-				getConstrainedElements().addAll(
-					(Collection<? extends Element>) newValue);
+				getConstrainedElements()
+					.addAll((Collection<? extends Element>) newValue);
 				return;
 			case UMLPackage.INTERVAL_CONSTRAINT__CONTEXT :
 				setContext((Namespace) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalImpl.java
index 07d0456..bcb9d73 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/IntervalImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -236,13 +236,13 @@
 		switch (featureID) {
 			case UMLPackage.INTERVAL__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INTERVAL__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INTERVAL__NAME :
 				setName((String) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InvocationActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InvocationActionImpl.java
index 09e5895..051f027 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InvocationActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InvocationActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -254,11 +254,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.INVOCATION_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INVOCATION_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INVOCATION_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.INVOCATION_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -267,14 +267,14 @@
 			case UMLPackage.INVOCATION_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.INVOCATION_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.INVOCATION_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.INVOCATION_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INVOCATION_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -285,8 +285,8 @@
 				return ((InternalEList<?>) getLocalPreconditions())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.INVOCATION_ACTION__ARGUMENT :
-				return ((InternalEList<?>) getArguments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getArguments()).basicRemove(otherEnd,
+					msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -388,13 +388,13 @@
 		switch (featureID) {
 			case UMLPackage.INVOCATION_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.INVOCATION_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.INVOCATION_ACTION__NAME :
 				setName((String) newValue);
@@ -413,50 +413,49 @@
 				return;
 			case UMLPackage.INVOCATION_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.INVOCATION_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.INVOCATION_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.INVOCATION_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.INVOCATION_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.INVOCATION_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.INVOCATION_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.INVOCATION_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.INVOCATION_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.INVOCATION_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.INVOCATION_ACTION__ARGUMENT :
 				getArguments().clear();
@@ -599,7 +598,8 @@
 			case UMLPackage.INVOCATION_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.INVOCATION_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.INVOCATION_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -624,7 +624,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.INVOCATION_ACTION__ARGUMENT};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.INVOCATION_ACTION__ARGUMENT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/JoinNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/JoinNodeImpl.java
index b2fee19..72628a6 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/JoinNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/JoinNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -139,8 +139,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -170,7 +170,8 @@
 	 * @generated
 	 */
 	public void setIsCombineDuplicate(boolean newIsCombineDuplicate) {
-		boolean oldIsCombineDuplicate = (eFlags & IS_COMBINE_DUPLICATE_EFLAG) != 0;
+		boolean oldIsCombineDuplicate = (eFlags
+			& IS_COMBINE_DUPLICATE_EFLAG) != 0;
 		if (newIsCombineDuplicate)
 			eFlags |= IS_COMBINE_DUPLICATE_EFLAG;
 		else
@@ -203,7 +204,8 @@
 					msgs.dispatch();
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.JOIN_NODE__JOIN_SPEC, oldJoinSpec, joinSpec));
+						UMLPackage.JOIN_NODE__JOIN_SPEC, oldJoinSpec,
+						joinSpec));
 			}
 		}
 		return joinSpec;
@@ -311,11 +313,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.JOIN_NODE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.JOIN_NODE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.JOIN_NODE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.JOIN_NODE__IN_INTERRUPTIBLE_REGION :
@@ -324,14 +326,14 @@
 			case UMLPackage.JOIN_NODE__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.JOIN_NODE__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.JOIN_NODE__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.JOIN_NODE__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.JOIN_NODE__JOIN_SPEC :
 				return basicSetJoinSpec(null, msgs);
 		}
@@ -419,13 +421,13 @@
 		switch (featureID) {
 			case UMLPackage.JOIN_NODE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.JOIN_NODE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.JOIN_NODE__NAME :
 				setName((String) newValue);
@@ -444,32 +446,31 @@
 				return;
 			case UMLPackage.JOIN_NODE__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.JOIN_NODE__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.JOIN_NODE__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.JOIN_NODE__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.JOIN_NODE__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.JOIN_NODE__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.JOIN_NODE__IS_COMBINE_DUPLICATE :
 				setIsCombineDuplicate((Boolean) newValue);
@@ -592,7 +593,8 @@
 			case UMLPackage.JOIN_NODE__IN_PARTITION :
 				return inPartitions != null && !inPartitions.isEmpty();
 			case UMLPackage.JOIN_NODE__IS_COMBINE_DUPLICATE :
-				return ((eFlags & IS_COMBINE_DUPLICATE_EFLAG) != 0) != IS_COMBINE_DUPLICATE_EDEFAULT;
+				return ((eFlags
+					& IS_COMBINE_DUPLICATE_EFLAG) != 0) != IS_COMBINE_DUPLICATE_EDEFAULT;
 			case UMLPackage.JOIN_NODE__JOIN_SPEC :
 				return joinSpec != null;
 		}
@@ -656,7 +658,8 @@
 			case UMLPackage.JOIN_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.JOIN_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.JOIN_NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.JOIN_NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -664,7 +667,8 @@
 			case UMLPackage.JOIN_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.JOIN_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.JOIN_NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -741,8 +745,8 @@
 			case UMLPackage.JOIN_NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.JOIN_NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.JOIN_NODE___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.JOIN_NODE___VALIDATE_ONE_OUTGOING_EDGE__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LifelineImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LifelineImpl.java
index f54a3d7..59ee567 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LifelineImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LifelineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -163,14 +163,13 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
 					ownedElements = new DerivedUnionEObjectEList<Element>(
-						Element.class, this,
-						UMLPackage.LIFELINE__OWNED_ELEMENT,
+						Element.class, this, UMLPackage.LIFELINE__OWNED_ELEMENT,
 						OWNED_ELEMENT_ESUBSETS));
 			}
 			return ownedElements;
@@ -261,7 +260,8 @@
 	 */
 	public void setInteraction(Interaction newInteraction) {
 		if (newInteraction != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.LIFELINE__INTERACTION && newInteraction != null)) {
+			|| (eContainerFeatureID() != UMLPackage.LIFELINE__INTERACTION
+				&& newInteraction != null)) {
 			if (EcoreUtil.isAncestor(this, newInteraction))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -295,8 +295,9 @@
 					EOPPOSITE_FEATURE_BASE - UMLPackage.LIFELINE__SELECTOR,
 					null, null);
 				if (newSelector.eInternalContainer() == null) {
-					msgs = newSelector.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.LIFELINE__SELECTOR, null, msgs);
+					msgs = newSelector.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - UMLPackage.LIFELINE__SELECTOR,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -503,8 +504,8 @@
 	 */
 	public boolean validateSelectorIntOrString(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return LifelineOperations.validateSelectorIntOrString(this,
-			diagnostics, context);
+		return LifelineOperations.validateSelectorIntOrString(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -541,11 +542,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.LIFELINE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LIFELINE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LIFELINE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.LIFELINE__INTERACTION :
@@ -553,8 +554,8 @@
 			case UMLPackage.LIFELINE__SELECTOR :
 				return basicSetSelector(null, msgs);
 			case UMLPackage.LIFELINE__COVERED_BY :
-				return ((InternalEList<?>) getCoveredBys()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCoveredBys())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -642,13 +643,13 @@
 		switch (featureID) {
 			case UMLPackage.LIFELINE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.LIFELINE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.LIFELINE__NAME :
 				setName((String) newValue);
@@ -823,7 +824,8 @@
 			case UMLPackage.LIFELINE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.LIFELINE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LIFELINE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.LIFELINE___GET_STEREOTYPE_APPLICATIONS :
@@ -831,7 +833,8 @@
 			case UMLPackage.LIFELINE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.LIFELINE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LIFELINE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkActionImpl.java
index eeaab8a..79a88d5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -130,8 +130,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -318,8 +318,8 @@
 	 */
 	public boolean validateSamePins(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return LinkActionOperations
-			.validateSamePins(this, diagnostics, context);
+		return LinkActionOperations.validateSamePins(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -341,11 +341,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.LINK_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LINK_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LINK_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.LINK_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -354,14 +354,14 @@
 			case UMLPackage.LINK_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.LINK_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.LINK_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.LINK_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LINK_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -375,8 +375,8 @@
 				return ((InternalEList<?>) getEndData()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.LINK_ACTION__INPUT_VALUE :
-				return ((InternalEList<?>) getInputValues()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInputValues())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -476,13 +476,13 @@
 		switch (featureID) {
 			case UMLPackage.LINK_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.LINK_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.LINK_ACTION__NAME :
 				setName((String) newValue);
@@ -501,60 +501,59 @@
 				return;
 			case UMLPackage.LINK_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.LINK_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.LINK_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.LINK_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.LINK_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.LINK_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.LINK_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.LINK_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.LINK_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.LINK_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.LINK_ACTION__END_DATA :
 				getEndData().clear();
-				getEndData().addAll(
-					(Collection<? extends LinkEndData>) newValue);
+				getEndData()
+					.addAll((Collection<? extends LinkEndData>) newValue);
 				return;
 			case UMLPackage.LINK_ACTION__INPUT_VALUE :
 				getInputValues().clear();
-				getInputValues().addAll(
-					(Collection<? extends InputPin>) newValue);
+				getInputValues()
+					.addAll((Collection<? extends InputPin>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -689,7 +688,8 @@
 			case UMLPackage.LINK_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.LINK_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.LINK_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -763,7 +763,8 @@
 			case UMLPackage.LINK_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.LINK_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LINK_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.LINK_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -771,7 +772,8 @@
 			case UMLPackage.LINK_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.LINK_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LINK_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -848,8 +850,8 @@
 			case UMLPackage.LINK_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.LINK_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.LINK_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.LINK_ACTION___GET_CONTEXT :
@@ -895,7 +897,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.LINK_ACTION__INPUT_VALUE};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.LINK_ACTION__INPUT_VALUE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndCreationDataImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndCreationDataImpl.java
index aa4be0a..0cac133 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndCreationDataImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndCreationDataImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -255,21 +255,21 @@
 		switch (featureID) {
 			case UMLPackage.LINK_END_CREATION_DATA__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.LINK_END_CREATION_DATA__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.LINK_END_CREATION_DATA__END :
 				setEnd((Property) newValue);
 				return;
 			case UMLPackage.LINK_END_CREATION_DATA__QUALIFIER :
 				getQualifiers().clear();
-				getQualifiers().addAll(
-					(Collection<? extends QualifierValue>) newValue);
+				getQualifiers()
+					.addAll((Collection<? extends QualifierValue>) newValue);
 				return;
 			case UMLPackage.LINK_END_CREATION_DATA__VALUE :
 				setValue((InputPin) newValue);
@@ -342,7 +342,8 @@
 			case UMLPackage.LINK_END_CREATION_DATA__INSERT_AT :
 				return insertAt != null;
 			case UMLPackage.LINK_END_CREATION_DATA__IS_REPLACE_ALL :
-				return ((eFlags & IS_REPLACE_ALL_EFLAG) != 0) != IS_REPLACE_ALL_EDEFAULT;
+				return ((eFlags
+					& IS_REPLACE_ALL_EFLAG) != 0) != IS_REPLACE_ALL_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
@@ -404,7 +405,8 @@
 			case UMLPackage.LINK_END_CREATION_DATA___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.LINK_END_CREATION_DATA___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LINK_END_CREATION_DATA___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.LINK_END_CREATION_DATA___GET_STEREOTYPE_APPLICATIONS :
@@ -412,7 +414,8 @@
 			case UMLPackage.LINK_END_CREATION_DATA___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.LINK_END_CREATION_DATA___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LINK_END_CREATION_DATA___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDataImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDataImpl.java
index da590ab..327fdaa 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDataImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDataImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -127,8 +127,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -243,7 +243,8 @@
 	public EList<QualifierValue> getQualifiers() {
 		if (qualifiers == null) {
 			qualifiers = new EObjectContainmentEList.Resolving<QualifierValue>(
-				QualifierValue.class, this, UMLPackage.LINK_END_DATA__QUALIFIER);
+				QualifierValue.class, this,
+				UMLPackage.LINK_END_DATA__QUALIFIER);
 		}
 		return qualifiers;
 	}
@@ -254,7 +255,8 @@
 	 * @generated
 	 */
 	public QualifierValue createQualifier() {
-		QualifierValue newQualifier = (QualifierValue) create(UMLPackage.Literals.QUALIFIER_VALUE);
+		QualifierValue newQualifier = (QualifierValue) create(
+			UMLPackage.Literals.QUALIFIER_VALUE);
 		getQualifiers().add(newQualifier);
 		return newQualifier;
 	}
@@ -264,8 +266,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validatePropertyIsAssociationEnd(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validatePropertyIsAssociationEnd(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return LinkEndDataOperations.validatePropertyIsAssociationEnd(this,
 			diagnostics, context);
 	}
@@ -344,14 +346,14 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.LINK_END_DATA__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LINK_END_DATA__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LINK_END_DATA__QUALIFIER :
-				return ((InternalEList<?>) getQualifiers()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getQualifiers())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -399,21 +401,21 @@
 		switch (featureID) {
 			case UMLPackage.LINK_END_DATA__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.LINK_END_DATA__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.LINK_END_DATA__END :
 				setEnd((Property) newValue);
 				return;
 			case UMLPackage.LINK_END_DATA__QUALIFIER :
 				getQualifiers().clear();
-				getQualifiers().addAll(
-					(Collection<? extends QualifierValue>) newValue);
+				getQualifiers()
+					.addAll((Collection<? extends QualifierValue>) newValue);
 				return;
 			case UMLPackage.LINK_END_DATA__VALUE :
 				setValue((InputPin) newValue);
@@ -532,7 +534,8 @@
 			case UMLPackage.LINK_END_DATA___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.LINK_END_DATA___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LINK_END_DATA___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.LINK_END_DATA___GET_STEREOTYPE_APPLICATIONS :
@@ -540,7 +543,8 @@
 			case UMLPackage.LINK_END_DATA___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.LINK_END_DATA___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LINK_END_DATA___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDestructionDataImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDestructionDataImpl.java
index e8b7c9c..2990ad8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDestructionDataImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LinkEndDestructionDataImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -121,7 +121,8 @@
 	 * @generated
 	 */
 	public void setIsDestroyDuplicates(boolean newIsDestroyDuplicates) {
-		boolean oldIsDestroyDuplicates = (eFlags & IS_DESTROY_DUPLICATES_EFLAG) != 0;
+		boolean oldIsDestroyDuplicates = (eFlags
+			& IS_DESTROY_DUPLICATES_EFLAG) != 0;
 		if (newIsDestroyDuplicates)
 			eFlags |= IS_DESTROY_DUPLICATES_EFLAG;
 		else
@@ -255,21 +256,21 @@
 		switch (featureID) {
 			case UMLPackage.LINK_END_DESTRUCTION_DATA__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.LINK_END_DESTRUCTION_DATA__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.LINK_END_DESTRUCTION_DATA__END :
 				setEnd((Property) newValue);
 				return;
 			case UMLPackage.LINK_END_DESTRUCTION_DATA__QUALIFIER :
 				getQualifiers().clear();
-				getQualifiers().addAll(
-					(Collection<? extends QualifierValue>) newValue);
+				getQualifiers()
+					.addAll((Collection<? extends QualifierValue>) newValue);
 				return;
 			case UMLPackage.LINK_END_DESTRUCTION_DATA__VALUE :
 				setValue((InputPin) newValue);
@@ -342,7 +343,8 @@
 			case UMLPackage.LINK_END_DESTRUCTION_DATA__DESTROY_AT :
 				return destroyAt != null;
 			case UMLPackage.LINK_END_DESTRUCTION_DATA__IS_DESTROY_DUPLICATES :
-				return ((eFlags & IS_DESTROY_DUPLICATES_EFLAG) != 0) != IS_DESTROY_DUPLICATES_EDEFAULT;
+				return ((eFlags
+					& IS_DESTROY_DUPLICATES_EFLAG) != 0) != IS_DESTROY_DUPLICATES_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
@@ -404,7 +406,8 @@
 			case UMLPackage.LINK_END_DESTRUCTION_DATA___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.LINK_END_DESTRUCTION_DATA___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LINK_END_DESTRUCTION_DATA___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.LINK_END_DESTRUCTION_DATA___GET_STEREOTYPE_APPLICATIONS :
@@ -412,7 +415,8 @@
 			case UMLPackage.LINK_END_DESTRUCTION_DATA___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.LINK_END_DESTRUCTION_DATA___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LINK_END_DESTRUCTION_DATA___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralBooleanImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralBooleanImpl.java
index 11b9373..a137eba 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralBooleanImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralBooleanImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -213,13 +213,13 @@
 		switch (featureID) {
 			case UMLPackage.LITERAL_BOOLEAN__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.LITERAL_BOOLEAN__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.LITERAL_BOOLEAN__NAME :
 				setName((String) newValue);
@@ -384,7 +384,8 @@
 			case UMLPackage.LITERAL_BOOLEAN___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.LITERAL_BOOLEAN___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LITERAL_BOOLEAN___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.LITERAL_BOOLEAN___GET_STEREOTYPE_APPLICATIONS :
@@ -392,7 +393,8 @@
 			case UMLPackage.LITERAL_BOOLEAN___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.LITERAL_BOOLEAN___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LITERAL_BOOLEAN___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -455,7 +457,8 @@
 			case UMLPackage.LITERAL_BOOLEAN___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.LITERAL_BOOLEAN___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.LITERAL_BOOLEAN___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.LITERAL_BOOLEAN___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralIntegerImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralIntegerImpl.java
index e1fd309..34fc9f9 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralIntegerImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralIntegerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -209,13 +209,13 @@
 		switch (featureID) {
 			case UMLPackage.LITERAL_INTEGER__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.LITERAL_INTEGER__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.LITERAL_INTEGER__NAME :
 				setName((String) newValue);
@@ -380,7 +380,8 @@
 			case UMLPackage.LITERAL_INTEGER___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.LITERAL_INTEGER___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LITERAL_INTEGER___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.LITERAL_INTEGER___GET_STEREOTYPE_APPLICATIONS :
@@ -388,7 +389,8 @@
 			case UMLPackage.LITERAL_INTEGER___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.LITERAL_INTEGER___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LITERAL_INTEGER___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -451,7 +453,8 @@
 			case UMLPackage.LITERAL_INTEGER___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.LITERAL_INTEGER___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.LITERAL_INTEGER___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.LITERAL_INTEGER___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralNullImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralNullImpl.java
index ca2066f..fce95a1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralNullImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralNullImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -135,7 +135,8 @@
 			case UMLPackage.LITERAL_NULL___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.LITERAL_NULL___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LITERAL_NULL___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.LITERAL_NULL___GET_STEREOTYPE_APPLICATIONS :
@@ -143,7 +144,8 @@
 			case UMLPackage.LITERAL_NULL___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.LITERAL_NULL___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LITERAL_NULL___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -206,7 +208,8 @@
 			case UMLPackage.LITERAL_NULL___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.LITERAL_NULL___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.LITERAL_NULL___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.LITERAL_NULL___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralRealImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralRealImpl.java
index 620b537..8ad6fe8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralRealImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralRealImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015 CEA and others.
+ * Copyright (c) 2011, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -212,13 +212,13 @@
 		switch (featureID) {
 			case UMLPackage.LITERAL_REAL__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.LITERAL_REAL__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.LITERAL_REAL__NAME :
 				setName((String) newValue);
@@ -383,7 +383,8 @@
 			case UMLPackage.LITERAL_REAL___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.LITERAL_REAL___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LITERAL_REAL___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.LITERAL_REAL___GET_STEREOTYPE_APPLICATIONS :
@@ -391,7 +392,8 @@
 			case UMLPackage.LITERAL_REAL___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.LITERAL_REAL___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LITERAL_REAL___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -454,7 +456,8 @@
 			case UMLPackage.LITERAL_REAL___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.LITERAL_REAL___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.LITERAL_REAL___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.LITERAL_REAL___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralStringImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralStringImpl.java
index 9a7c938..8e6185d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralStringImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralStringImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -257,13 +257,13 @@
 		switch (featureID) {
 			case UMLPackage.LITERAL_STRING__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.LITERAL_STRING__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.LITERAL_STRING__NAME :
 				setName((String) newValue);
@@ -428,7 +428,8 @@
 			case UMLPackage.LITERAL_STRING___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.LITERAL_STRING___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LITERAL_STRING___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.LITERAL_STRING___GET_STEREOTYPE_APPLICATIONS :
@@ -436,7 +437,8 @@
 			case UMLPackage.LITERAL_STRING___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.LITERAL_STRING___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LITERAL_STRING___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -499,7 +501,8 @@
 			case UMLPackage.LITERAL_STRING___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.LITERAL_STRING___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.LITERAL_STRING___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.LITERAL_STRING___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralUnlimitedNaturalImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralUnlimitedNaturalImpl.java
index 68cc3dc..01dcc19 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralUnlimitedNaturalImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LiteralUnlimitedNaturalImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -209,13 +209,13 @@
 		switch (featureID) {
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL__NAME :
 				setName((String) newValue);
@@ -380,7 +380,8 @@
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL___GET_STEREOTYPE_APPLICATIONS :
@@ -388,7 +389,8 @@
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -451,7 +453,8 @@
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LoopNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LoopNodeImpl.java
index 05dbe37..c6da4a4 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LoopNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/LoopNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 397139, 397141, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 397139, 397141, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -224,8 +224,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -434,7 +434,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ExecutableNode getTest(String name, boolean ignoreCase, EClass eClass) {
+	public ExecutableNode getTest(String name, boolean ignoreCase,
+			EClass eClass) {
 		testLoop : for (ExecutableNode test : getTests()) {
 			if (eClass != null && !eClass.isInstance(test))
 				continue testLoop;
@@ -466,7 +467,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		getResults().add(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -533,7 +535,8 @@
 	 * @generated
 	 */
 	public OutputPin createLoopVariable(String name, Type type) {
-		OutputPin newLoopVariable = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newLoopVariable = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		getLoopVariables().add(newLoopVariable);
 		if (name != null)
 			newLoopVariable.setName(name);
@@ -556,7 +559,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
-	public OutputPin getLoopVariable(String name, Type type, boolean ignoreCase) {
+	public OutputPin getLoopVariable(String name, Type type,
+			boolean ignoreCase) {
 		return getLoopVariable(name, type, ignoreCase, false);
 	}
 
@@ -565,8 +569,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public OutputPin getLoopVariable(String name, Type type,
-			boolean ignoreCase, boolean createOnDemand) {
+	public OutputPin getLoopVariable(String name, Type type, boolean ignoreCase,
+			boolean createOnDemand) {
 		loopVariableLoop : for (OutputPin loopVariable : getLoopVariables()) {
 			if (name != null && !(ignoreCase
 				? name.equalsIgnoreCase(loopVariable.getName())
@@ -629,7 +633,8 @@
 	public EList<InputPin> getLoopVariableInputs() {
 		if (loopVariableInputs == null) {
 			loopVariableInputs = new EObjectContainmentEList.Resolving<InputPin>(
-				InputPin.class, this, UMLPackage.LOOP_NODE__LOOP_VARIABLE_INPUT);
+				InputPin.class, this,
+				UMLPackage.LOOP_NODE__LOOP_VARIABLE_INPUT);
 		}
 		return loopVariableInputs;
 	}
@@ -708,8 +713,8 @@
 	 */
 	public boolean validateInputEdges(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return LoopNodeOperations
-			.validateInputEdges(this, diagnostics, context);
+		return LoopNodeOperations.validateInputEdges(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -841,11 +846,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.LOOP_NODE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LOOP_NODE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LOOP_NODE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.LOOP_NODE__IN_INTERRUPTIBLE_REGION :
@@ -854,14 +859,14 @@
 			case UMLPackage.LOOP_NODE__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.LOOP_NODE__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.LOOP_NODE__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.LOOP_NODE__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LOOP_NODE__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -872,14 +877,14 @@
 				return ((InternalEList<?>) getLocalPreconditions())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LOOP_NODE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LOOP_NODE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LOOP_NODE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LOOP_NODE__EDGE :
 				return ((InternalEList<?>) getEdges()).basicRemove(otherEnd,
 					msgs);
@@ -890,14 +895,14 @@
 				return ((InternalEList<?>) getStructuredNodeOutputs())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LOOP_NODE__VARIABLE :
-				return ((InternalEList<?>) getVariables()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getVariables()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.LOOP_NODE__NODE :
 				return ((InternalEList<?>) getNodes()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.LOOP_NODE__LOOP_VARIABLE :
-				return ((InternalEList<?>) getLoopVariables()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getLoopVariables())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.LOOP_NODE__LOOP_VARIABLE_INPUT :
 				return ((InternalEList<?>) getLoopVariableInputs())
 					.basicRemove(otherEnd, msgs);
@@ -1057,13 +1062,13 @@
 		switch (featureID) {
 			case UMLPackage.LOOP_NODE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__NAME :
 				setName((String) newValue);
@@ -1082,65 +1087,64 @@
 				return;
 			case UMLPackage.LOOP_NODE__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__IN_ACTIVITY :
 				setInActivity((Activity) newValue);
@@ -1155,13 +1159,13 @@
 				return;
 			case UMLPackage.LOOP_NODE__STRUCTURED_NODE_INPUT :
 				getStructuredNodeInputs().clear();
-				getStructuredNodeInputs().addAll(
-					(Collection<? extends InputPin>) newValue);
+				getStructuredNodeInputs()
+					.addAll((Collection<? extends InputPin>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__STRUCTURED_NODE_OUTPUT :
 				getStructuredNodeOutputs().clear();
-				getStructuredNodeOutputs().addAll(
-					(Collection<? extends OutputPin>) newValue);
+				getStructuredNodeOutputs()
+					.addAll((Collection<? extends OutputPin>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__VARIABLE :
 				getVariables().clear();
@@ -1175,13 +1179,13 @@
 				return;
 			case UMLPackage.LOOP_NODE__BODY_OUTPUT :
 				getBodyOutputs().clear();
-				getBodyOutputs().addAll(
-					(Collection<? extends OutputPin>) newValue);
+				getBodyOutputs()
+					.addAll((Collection<? extends OutputPin>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__BODY_PART :
 				getBodyParts().clear();
-				getBodyParts().addAll(
-					(Collection<? extends ExecutableNode>) newValue);
+				getBodyParts()
+					.addAll((Collection<? extends ExecutableNode>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__DECIDER :
 				setDecider((OutputPin) newValue);
@@ -1191,13 +1195,13 @@
 				return;
 			case UMLPackage.LOOP_NODE__LOOP_VARIABLE :
 				getLoopVariables().clear();
-				getLoopVariables().addAll(
-					(Collection<? extends OutputPin>) newValue);
+				getLoopVariables()
+					.addAll((Collection<? extends OutputPin>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__LOOP_VARIABLE_INPUT :
 				getLoopVariableInputs().clear();
-				getLoopVariableInputs().addAll(
-					(Collection<? extends InputPin>) newValue);
+				getLoopVariableInputs()
+					.addAll((Collection<? extends InputPin>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__RESULT :
 				getResults().clear();
@@ -1205,13 +1209,13 @@
 				return;
 			case UMLPackage.LOOP_NODE__SETUP_PART :
 				getSetupParts().clear();
-				getSetupParts().addAll(
-					(Collection<? extends ExecutableNode>) newValue);
+				getSetupParts()
+					.addAll((Collection<? extends ExecutableNode>) newValue);
 				return;
 			case UMLPackage.LOOP_NODE__TEST :
 				getTests().clear();
-				getTests().addAll(
-					(Collection<? extends ExecutableNode>) newValue);
+				getTests()
+					.addAll((Collection<? extends ExecutableNode>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -1397,7 +1401,8 @@
 			case UMLPackage.LOOP_NODE__INPUT :
 				return isSetInputs();
 			case UMLPackage.LOOP_NODE__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.LOOP_NODE__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -1431,7 +1436,8 @@
 			case UMLPackage.LOOP_NODE__EDGE :
 				return edges != null && !edges.isEmpty();
 			case UMLPackage.LOOP_NODE__MUST_ISOLATE :
-				return ((eFlags & MUST_ISOLATE_EFLAG) != 0) != MUST_ISOLATE_EDEFAULT;
+				return ((eFlags
+					& MUST_ISOLATE_EFLAG) != 0) != MUST_ISOLATE_EDEFAULT;
 			case UMLPackage.LOOP_NODE__STRUCTURED_NODE_INPUT :
 				return isSetStructuredNodeInputs();
 			case UMLPackage.LOOP_NODE__STRUCTURED_NODE_OUTPUT :
@@ -1447,7 +1453,8 @@
 			case UMLPackage.LOOP_NODE__DECIDER :
 				return decider != null;
 			case UMLPackage.LOOP_NODE__IS_TESTED_FIRST :
-				return ((eFlags & IS_TESTED_FIRST_EFLAG) != 0) != IS_TESTED_FIRST_EDEFAULT;
+				return ((eFlags
+					& IS_TESTED_FIRST_EFLAG) != 0) != IS_TESTED_FIRST_EDEFAULT;
 			case UMLPackage.LOOP_NODE__LOOP_VARIABLE :
 				return loopVariables != null && !loopVariables.isEmpty();
 			case UMLPackage.LOOP_NODE__LOOP_VARIABLE_INPUT :
@@ -1519,7 +1526,8 @@
 			case UMLPackage.LOOP_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.LOOP_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LOOP_NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.LOOP_NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -1527,7 +1535,8 @@
 			case UMLPackage.LOOP_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.LOOP_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.LOOP_NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1604,8 +1613,8 @@
 			case UMLPackage.LOOP_NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.LOOP_NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.LOOP_NODE___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.LOOP_NODE___GET_CONTEXT :
@@ -1643,20 +1652,19 @@
 			case UMLPackage.LOOP_NODE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.LOOP_NODE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.LOOP_NODE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.LOOP_NODE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.LOOP_NODE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.LOOP_NODE___MEMBERS_ARE_DISTINGUISHABLE :
 				return membersAreDistinguishable();
 			case UMLPackage.LOOP_NODE___VALIDATE_NODES_AND_EDGES__DIAGNOSTICCHAIN_MAP :
-				return validateNodesAndEdges(
-					(DiagnosticChain) arguments.get(0),
+				return validateNodesAndEdges((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.LOOP_NODE___VALIDATE_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP :
 				return validateNotContained((DiagnosticChain) arguments.get(0),
@@ -1669,8 +1677,7 @@
 				return validateEdges((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.LOOP_NODE___VALIDATE_INPUT_PIN_EDGES__DIAGNOSTICCHAIN_MAP :
-				return validateInputPinEdges(
-					(DiagnosticChain) arguments.get(0),
+				return validateInputPinEdges((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.LOOP_NODE___SOURCE_NODES :
 				return sourceNodes();
@@ -1781,7 +1788,8 @@
 		return false;
 	}
 
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.LOOP_NODE__LOOP_VARIABLE_INPUT};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.LOOP_NODE__LOOP_VARIABLE_INPUT};
 
 	@Override
 	public EList<InputPin> getInputs() {
@@ -1803,7 +1811,8 @@
 			UMLPackage.LOOP_NODE__INPUT, INPUT_ESUBSETS);
 	}
 
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.LOOP_NODE__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.LOOP_NODE__RESULT};
 
 	@Override
 	public EList<OutputPin> getOutputs() {
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ManifestationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ManifestationImpl.java
index 2fcb6a7..f429d59 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ManifestationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ManifestationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -107,7 +107,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SUPPLIER_ESUBSETS = new int[]{UMLPackage.MANIFESTATION__UTILIZED_ELEMENT};
+	protected static final int[] SUPPLIER_ESUBSETS = new int[]{
+		UMLPackage.MANIFESTATION__UTILIZED_ELEMENT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -117,7 +118,8 @@
 	public PackageableElement getUtilizedElement() {
 		if (utilizedElement != null && utilizedElement.eIsProxy()) {
 			InternalEObject oldUtilizedElement = (InternalEObject) utilizedElement;
-			utilizedElement = (PackageableElement) eResolveProxy(oldUtilizedElement);
+			utilizedElement = (PackageableElement) eResolveProxy(
+				oldUtilizedElement);
 			if (utilizedElement != oldUtilizedElement) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -235,13 +237,13 @@
 		switch (featureID) {
 			case UMLPackage.MANIFESTATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.MANIFESTATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.MANIFESTATION__NAME :
 				setName((String) newValue);
@@ -260,13 +262,13 @@
 				return;
 			case UMLPackage.MANIFESTATION__CLIENT :
 				getClients().clear();
-				getClients().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getClients()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.MANIFESTATION__SUPPLIER :
 				getSuppliers().clear();
-				getSuppliers().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getSuppliers()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.MANIFESTATION__MAPPING :
 				setMapping((OpaqueExpression) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MergeNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MergeNodeImpl.java
index 72dd6ae..7b3aa7f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MergeNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MergeNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -138,7 +138,8 @@
 			case UMLPackage.MERGE_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.MERGE_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.MERGE_NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.MERGE_NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -146,7 +147,8 @@
 			case UMLPackage.MERGE_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.MERGE_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.MERGE_NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -223,8 +225,8 @@
 			case UMLPackage.MERGE_NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.MERGE_NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.MERGE_NODE___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.MERGE_NODE___VALIDATE_ONE_OUTGOING_EDGE__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageEndImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageEndImpl.java
index c565985..d98c317 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageEndImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageEndImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -172,7 +172,8 @@
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
 			EList<InteractionFragment> result = (EList<InteractionFragment>) cache
-				.get(this, UMLPackage.Literals.MESSAGE_END___ENCLOSING_FRAGMENT);
+				.get(this,
+					UMLPackage.Literals.MESSAGE_END___ENCLOSING_FRAGMENT);
 			if (result == null) {
 				cache.put(this,
 					UMLPackage.Literals.MESSAGE_END___ENCLOSING_FRAGMENT,
@@ -236,13 +237,13 @@
 		switch (featureID) {
 			case UMLPackage.MESSAGE_END__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.MESSAGE_END__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.MESSAGE_END__NAME :
 				setName((String) newValue);
@@ -383,7 +384,8 @@
 			case UMLPackage.MESSAGE_END___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.MESSAGE_END___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.MESSAGE_END___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.MESSAGE_END___GET_STEREOTYPE_APPLICATIONS :
@@ -391,7 +393,8 @@
 			case UMLPackage.MESSAGE_END___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.MESSAGE_END___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.MESSAGE_END___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageImpl.java
index ecbcd9a..375867c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -237,8 +237,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -267,7 +267,8 @@
 	 * @generated
 	 */
 	public MessageSort getMessageSort() {
-		return MESSAGE_SORT_EFLAG_VALUES[(eFlags & MESSAGE_SORT_EFLAG) >>> MESSAGE_SORT_EFLAG_OFFSET];
+		return MESSAGE_SORT_EFLAG_VALUES[(eFlags
+			& MESSAGE_SORT_EFLAG) >>> MESSAGE_SORT_EFLAG_OFFSET];
 	}
 
 	/**
@@ -276,7 +277,8 @@
 	 * @generated
 	 */
 	public void setMessageSort(MessageSort newMessageSort) {
-		MessageSort oldMessageSort = MESSAGE_SORT_EFLAG_VALUES[(eFlags & MESSAGE_SORT_EFLAG) >>> MESSAGE_SORT_EFLAG_OFFSET];
+		MessageSort oldMessageSort = MESSAGE_SORT_EFLAG_VALUES[(eFlags
+			& MESSAGE_SORT_EFLAG) >>> MESSAGE_SORT_EFLAG_OFFSET];
 		if (newMessageSort == null)
 			newMessageSort = MESSAGE_SORT_EDEFAULT;
 		eFlags = eFlags & ~MESSAGE_SORT_EFLAG
@@ -341,7 +343,8 @@
 			if (sendEvent != oldSendEvent) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.MESSAGE__SEND_EVENT, oldSendEvent, sendEvent));
+						UMLPackage.MESSAGE__SEND_EVENT, oldSendEvent,
+						sendEvent));
 			}
 		}
 		return sendEvent;
@@ -381,7 +384,8 @@
 			if (connector != oldConnector) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.MESSAGE__CONNECTOR, oldConnector, connector));
+						UMLPackage.MESSAGE__CONNECTOR, oldConnector,
+						connector));
 			}
 		}
 		return connector;
@@ -450,7 +454,8 @@
 	 */
 	public void setInteraction(Interaction newInteraction) {
 		if (newInteraction != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.MESSAGE__INTERACTION && newInteraction != null)) {
+			|| (eContainerFeatureID() != UMLPackage.MESSAGE__INTERACTION
+				&& newInteraction != null)) {
 			if (EcoreUtil.isAncestor(this, newInteraction))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -465,7 +470,8 @@
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.MESSAGE__INTERACTION, newInteraction, newInteraction));
+				UMLPackage.MESSAGE__INTERACTION, newInteraction,
+				newInteraction));
 	}
 
 	/**
@@ -541,7 +547,8 @@
 			if (signature != oldSignature) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.MESSAGE__SIGNATURE, oldSignature, signature));
+						UMLPackage.MESSAGE__SIGNATURE, oldSignature,
+						signature));
 			}
 		}
 		return signature;
@@ -660,8 +667,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateOccurrenceSpecifications(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateOccurrenceSpecifications(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return MessageOperations.validateOccurrenceSpecifications(this,
 			diagnostics, context);
 	}
@@ -697,16 +704,16 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.MESSAGE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.MESSAGE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.MESSAGE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.MESSAGE__ARGUMENT :
-				return ((InternalEList<?>) getArguments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getArguments()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.MESSAGE__INTERACTION :
 				return basicSetInteraction(null, msgs);
 		}
@@ -804,13 +811,13 @@
 		switch (featureID) {
 			case UMLPackage.MESSAGE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.MESSAGE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.MESSAGE__NAME :
 				setName((String) newValue);
@@ -935,7 +942,8 @@
 			case UMLPackage.MESSAGE__MESSAGE_KIND :
 				return getMessageKind() != MESSAGE_KIND_EDEFAULT;
 			case UMLPackage.MESSAGE__MESSAGE_SORT :
-				return (eFlags & MESSAGE_SORT_EFLAG) != MESSAGE_SORT_EFLAG_DEFAULT;
+				return (eFlags
+					& MESSAGE_SORT_EFLAG) != MESSAGE_SORT_EFLAG_DEFAULT;
 			case UMLPackage.MESSAGE__RECEIVE_EVENT :
 				return receiveEvent != null;
 			case UMLPackage.MESSAGE__SEND_EVENT :
@@ -1003,7 +1011,8 @@
 			case UMLPackage.MESSAGE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.MESSAGE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.MESSAGE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.MESSAGE___GET_STEREOTYPE_APPLICATIONS :
@@ -1011,7 +1020,8 @@
 			case UMLPackage.MESSAGE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.MESSAGE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.MESSAGE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1122,8 +1132,8 @@
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (messageSort: "); //$NON-NLS-1$
-		result
-			.append(MESSAGE_SORT_EFLAG_VALUES[(eFlags & MESSAGE_SORT_EFLAG) >>> MESSAGE_SORT_EFLAG_OFFSET]);
+		result.append(MESSAGE_SORT_EFLAG_VALUES[(eFlags
+			& MESSAGE_SORT_EFLAG) >>> MESSAGE_SORT_EFLAG_OFFSET]);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageOccurrenceSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageOccurrenceSpecificationImpl.java
index b8d440d..3a87a7e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageOccurrenceSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MessageOccurrenceSpecificationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -179,7 +179,8 @@
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
 			EList<InteractionFragment> result = (EList<InteractionFragment>) cache
-				.get(this, UMLPackage.Literals.MESSAGE_END___ENCLOSING_FRAGMENT);
+				.get(this,
+					UMLPackage.Literals.MESSAGE_END___ENCLOSING_FRAGMENT);
 			if (result == null) {
 				cache.put(this,
 					UMLPackage.Literals.MESSAGE_END___ENCLOSING_FRAGMENT,
@@ -259,13 +260,13 @@
 		switch (featureID) {
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION__NAME :
 				setName((String) newValue);
@@ -288,18 +289,18 @@
 				return;
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION__TO_AFTER :
 				getToAfters().clear();
-				getToAfters().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getToAfters()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION__TO_BEFORE :
 				getToBefores().clear();
-				getToBefores().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getToBefores()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION__MESSAGE :
 				setMessage((Message) newValue);
@@ -410,7 +411,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == MessageEnd.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION__MESSAGE :
@@ -428,7 +430,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == MessageEnd.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.MESSAGE_END__MESSAGE :
@@ -521,7 +524,8 @@
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION___GET_STEREOTYPE_APPLICATIONS :
@@ -529,7 +533,8 @@
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ModelImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ModelImpl.java
index 847ffd1..13e584e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ModelImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ModelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -267,13 +267,13 @@
 		switch (featureID) {
 			case UMLPackage.MODEL__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.MODEL__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.MODEL__NAME :
 				setName((String) newValue);
@@ -286,18 +286,18 @@
 				return;
 			case UMLPackage.MODEL__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.MODEL__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.MODEL__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.MODEL__OWNING_TEMPLATE_PARAMETER :
 				setOwningTemplateParameter((TemplateParameter) newValue);
@@ -307,8 +307,8 @@
 				return;
 			case UMLPackage.MODEL__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.MODEL__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
@@ -318,9 +318,8 @@
 				return;
 			case UMLPackage.MODEL__NESTED_PACKAGE :
 				getNestedPackages().clear();
-				getNestedPackages()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Package>) newValue);
+				getNestedPackages().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Package>) newValue);
 				return;
 			case UMLPackage.MODEL__NESTING_PACKAGE :
 				setNestingPackage((org.eclipse.uml2.uml.Package) newValue);
@@ -331,8 +330,8 @@
 				return;
 			case UMLPackage.MODEL__PACKAGE_MERGE :
 				getPackageMerges().clear();
-				getPackageMerges().addAll(
-					(Collection<? extends PackageMerge>) newValue);
+				getPackageMerges()
+					.addAll((Collection<? extends PackageMerge>) newValue);
 				return;
 			case UMLPackage.MODEL__PACKAGED_ELEMENT :
 				getPackagedElements().clear();
@@ -555,7 +554,8 @@
 			case UMLPackage.MODEL___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.MODEL___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.MODEL___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.MODEL___GET_STEREOTYPE_APPLICATIONS :
@@ -563,7 +563,8 @@
 			case UMLPackage.MODEL___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.MODEL___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.MODEL___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -652,19 +653,20 @@
 			case UMLPackage.MODEL___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.MODEL___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.MODEL___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.MODEL___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.MODEL___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.MODEL___MEMBERS_ARE_DISTINGUISHABLE :
 				return membersAreDistinguishable();
 			case UMLPackage.MODEL___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.MODEL___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.MODEL___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -715,6 +717,8 @@
 				return isProfileApplied((Profile) arguments.get(0));
 			case UMLPackage.MODEL___UNAPPLY_PROFILE__PROFILE :
 				return unapplyProfile((Profile) arguments.get(0));
+			case UMLPackage.MODEL___APPLY_PROFILES__ELIST :
+				return applyProfiles((EList<Profile>) arguments.get(0));
 			case UMLPackage.MODEL___ALL_APPLICABLE_STEREOTYPES :
 				return allApplicableStereotypes();
 			case UMLPackage.MODEL___CONTAINING_PROFILE :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MultiplicityElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MultiplicityElementImpl.java
index fa2c7ca..60e5055 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MultiplicityElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/MultiplicityElementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -181,8 +181,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -299,8 +299,8 @@
 				InternalEObject newUpperValue = (InternalEObject) upperValue;
 				NotificationChain msgs = oldUpperValue.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.MULTIPLICITY_ELEMENT__UPPER_VALUE, null,
-					null);
+						- UMLPackage.MULTIPLICITY_ELEMENT__UPPER_VALUE,
+					null, null);
 				if (newUpperValue.eInternalContainer() == null) {
 					msgs = newUpperValue.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
@@ -359,13 +359,13 @@
 			if (upperValue != null)
 				msgs = ((InternalEObject) upperValue).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.MULTIPLICITY_ELEMENT__UPPER_VALUE, null,
-					msgs);
+						- UMLPackage.MULTIPLICITY_ELEMENT__UPPER_VALUE,
+					null, msgs);
 			if (newUpperValue != null)
 				msgs = ((InternalEObject) newUpperValue).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.MULTIPLICITY_ELEMENT__UPPER_VALUE, null,
-					msgs);
+						- UMLPackage.MULTIPLICITY_ELEMENT__UPPER_VALUE,
+					null, msgs);
 			msgs = basicSetUpperValue(newUpperValue, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -404,8 +404,8 @@
 				InternalEObject newLowerValue = (InternalEObject) lowerValue;
 				NotificationChain msgs = oldLowerValue.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.MULTIPLICITY_ELEMENT__LOWER_VALUE, null,
-					null);
+						- UMLPackage.MULTIPLICITY_ELEMENT__LOWER_VALUE,
+					null, null);
 				if (newLowerValue.eInternalContainer() == null) {
 					msgs = newLowerValue.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
@@ -464,13 +464,13 @@
 			if (lowerValue != null)
 				msgs = ((InternalEObject) lowerValue).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.MULTIPLICITY_ELEMENT__LOWER_VALUE, null,
-					msgs);
+						- UMLPackage.MULTIPLICITY_ELEMENT__LOWER_VALUE,
+					null, msgs);
 			if (newLowerValue != null)
 				msgs = ((InternalEObject) newLowerValue).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.MULTIPLICITY_ELEMENT__LOWER_VALUE, null,
-					msgs);
+						- UMLPackage.MULTIPLICITY_ELEMENT__LOWER_VALUE,
+					null, msgs);
 			msgs = basicSetLowerValue(newLowerValue, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -503,8 +503,8 @@
 	 */
 	public boolean validateLowerGe0(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return MultiplicityElementOperations.validateLowerGe0(this,
-			diagnostics, context);
+		return MultiplicityElementOperations.validateLowerGe0(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -526,7 +526,8 @@
 	public boolean validateValueSpecificationNoSideEffects(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return MultiplicityElementOperations
-			.validateValueSpecificationNoSideEffects(this, diagnostics, context);
+			.validateValueSpecificationNoSideEffects(this, diagnostics,
+				context);
 	}
 
 	/**
@@ -558,8 +559,8 @@
 	 */
 	public boolean validateUpperIsUnlimitedNatural(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return MultiplicityElementOperations.validateUpperIsUnlimitedNatural(
-			this, diagnostics, context);
+		return MultiplicityElementOperations
+			.validateUpperIsUnlimitedNatural(this, diagnostics, context);
 	}
 
 	/**
@@ -626,11 +627,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.MULTIPLICITY_ELEMENT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.MULTIPLICITY_ELEMENT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.MULTIPLICITY_ELEMENT__LOWER_VALUE :
 				return basicSetLowerValue(null, msgs);
 			case UMLPackage.MULTIPLICITY_ELEMENT__UPPER_VALUE :
@@ -688,13 +689,13 @@
 		switch (featureID) {
 			case UMLPackage.MULTIPLICITY_ELEMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.MULTIPLICITY_ELEMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.MULTIPLICITY_ELEMENT__IS_ORDERED :
 				setIsOrdered((Boolean) newValue);
@@ -771,7 +772,8 @@
 			case UMLPackage.MULTIPLICITY_ELEMENT__OWNER :
 				return isSetOwner();
 			case UMLPackage.MULTIPLICITY_ELEMENT__IS_ORDERED :
-				return ((eFlags & IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
+				return ((eFlags
+					& IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
 			case UMLPackage.MULTIPLICITY_ELEMENT__IS_UNIQUE :
 				return ((eFlags & IS_UNIQUE_EFLAG) != 0) != IS_UNIQUE_EDEFAULT;
 			case UMLPackage.MULTIPLICITY_ELEMENT__LOWER :
@@ -843,7 +845,8 @@
 			case UMLPackage.MULTIPLICITY_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.MULTIPLICITY_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.MULTIPLICITY_ELEMENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.MULTIPLICITY_ELEMENT___GET_STEREOTYPE_APPLICATIONS :
@@ -851,7 +854,8 @@
 			case UMLPackage.MULTIPLICITY_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.MULTIPLICITY_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.MULTIPLICITY_ELEMENT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -909,8 +913,8 @@
 			case UMLPackage.MULTIPLICITY_ELEMENT___COMPATIBLE_WITH__MULTIPLICITYELEMENT :
 				return compatibleWith((MultiplicityElement) arguments.get(0));
 			case UMLPackage.MULTIPLICITY_ELEMENT___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT :
-				return includesMultiplicity((MultiplicityElement) arguments
-					.get(0));
+				return includesMultiplicity(
+					(MultiplicityElement) arguments.get(0));
 			case UMLPackage.MULTIPLICITY_ELEMENT___IS__INT_INT :
 				return is((Integer) arguments.get(0),
 					(Integer) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamedElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamedElementImpl.java
index 1bf53f6..3d0e068 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamedElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamedElementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -10,7 +10,7 @@
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Sergey Boyko (Borland) - 282440
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -218,8 +218,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -289,7 +289,8 @@
 	 * @generated
 	 */
 	public VisibilityKind getVisibility() {
-		return VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		return VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 	}
 
 	/**
@@ -298,7 +299,8 @@
 	 * @generated
 	 */
 	public void setVisibility(VisibilityKind newVisibility) {
-		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 		if (newVisibility == null)
 			newVisibility = VISIBILITY_EDEFAULT;
 		eFlags = eFlags & ~VISIBILITY_EFLAG
@@ -317,7 +319,8 @@
 	 * @generated
 	 */
 	public void unsetVisibility() {
-		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 		boolean oldVisibilityESet = (eFlags & VISIBILITY_ESETFLAG) != 0;
 		eFlags = eFlags & ~VISIBILITY_EFLAG | VISIBILITY_EFLAG_DEFAULT;
 		eFlags &= ~VISIBILITY_ESETFLAG;
@@ -357,12 +360,10 @@
 			EList<Dependency> result = (EList<Dependency>) cache.get(this,
 				UMLPackage.Literals.NAMED_ELEMENT__CLIENT_DEPENDENCY);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.NAMED_ELEMENT__CLIENT_DEPENDENCY,
-						result = NamedElementOperations
-							.getClientDependencies(this));
+				cache.put(this,
+					UMLPackage.Literals.NAMED_ELEMENT__CLIENT_DEPENDENCY,
+					result = NamedElementOperations
+						.getClientDependencies(this));
 			}
 			return result;
 		}
@@ -405,17 +406,19 @@
 	public StringExpression getNameExpression() {
 		if (nameExpression != null && nameExpression.eIsProxy()) {
 			InternalEObject oldNameExpression = (InternalEObject) nameExpression;
-			nameExpression = (StringExpression) eResolveProxy(oldNameExpression);
+			nameExpression = (StringExpression) eResolveProxy(
+				oldNameExpression);
 			if (nameExpression != oldNameExpression) {
 				InternalEObject newNameExpression = (InternalEObject) nameExpression;
-				NotificationChain msgs = oldNameExpression
-					.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.NAMED_ELEMENT__NAME_EXPRESSION, null, null);
+				NotificationChain msgs = oldNameExpression.eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.NAMED_ELEMENT__NAME_EXPRESSION,
+					null, null);
 				if (newNameExpression.eInternalContainer() == null) {
 					msgs = newNameExpression.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.NAMED_ELEMENT__NAME_EXPRESSION, null,
-						msgs);
+							- UMLPackage.NAMED_ELEMENT__NAME_EXPRESSION,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -467,13 +470,15 @@
 		if (newNameExpression != nameExpression) {
 			NotificationChain msgs = null;
 			if (nameExpression != null)
-				msgs = ((InternalEObject) nameExpression)
-					.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.NAMED_ELEMENT__NAME_EXPRESSION, null, msgs);
+				msgs = ((InternalEObject) nameExpression).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.NAMED_ELEMENT__NAME_EXPRESSION,
+					null, msgs);
 			if (newNameExpression != null)
-				msgs = ((InternalEObject) newNameExpression)
-					.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.NAMED_ELEMENT__NAME_EXPRESSION, null, msgs);
+				msgs = ((InternalEObject) newNameExpression).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.NAMED_ELEMENT__NAME_EXPRESSION,
+					null, msgs);
 			msgs = basicSetNameExpression(newNameExpression, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -489,7 +494,8 @@
 	 * @generated
 	 */
 	public StringExpression createNameExpression(String name, Type type) {
-		StringExpression newNameExpression = (StringExpression) create(UMLPackage.Literals.STRING_EXPRESSION);
+		StringExpression newNameExpression = (StringExpression) create(
+			UMLPackage.Literals.STRING_EXPRESSION);
 		setNameExpression(newNameExpression);
 		if (name != null)
 			newNameExpression.setName(name);
@@ -525,8 +531,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateVisibilityNeedsOwnership(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateVisibilityNeedsOwnership(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return NamedElementOperations.validateVisibilityNeedsOwnership(this,
 			diagnostics, context);
 	}
@@ -639,11 +645,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.NAMED_ELEMENT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NAMED_ELEMENT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NAMED_ELEMENT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 		}
@@ -699,13 +705,13 @@
 		switch (featureID) {
 			case UMLPackage.NAMED_ELEMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.NAMED_ELEMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.NAMED_ELEMENT__NAME :
 				setName((String) newValue);
@@ -838,7 +844,8 @@
 			case UMLPackage.NAMED_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.NAMED_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.NAMED_ELEMENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.NAMED_ELEMENT___GET_STEREOTYPE_APPLICATIONS :
@@ -846,7 +853,8 @@
 			case UMLPackage.NAMED_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.NAMED_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.NAMED_ELEMENT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -930,8 +938,8 @@
 			result.append("<unset>"); //$NON-NLS-1$
 		result.append(", visibility: "); //$NON-NLS-1$
 		if ((eFlags & VISIBILITY_ESETFLAG) != 0)
-			result
-				.append(VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET]);
+			result.append(VISIBILITY_EFLAG_VALUES[(eFlags
+				& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET]);
 		else
 			result.append("<unset>"); //$NON-NLS-1$
 		result.append(')');
@@ -1085,8 +1093,8 @@
 
 				if (index != -1) {
 					try {
-						count = Integer.parseInt(uriFragmentSegment
-							.substring(index + 1));
+						count = Integer
+							.parseInt(uriFragmentSegment.substring(index + 1));
 					} catch (NumberFormatException exception) {
 						// Interpret it as part of the name.
 						//
@@ -1103,7 +1111,8 @@
 					if (eObject instanceof NamedElement) {
 						NamedElement namedElement = (NamedElement) eObject;
 
-						if (name.equals(namedElement.getName()) && count-- == 0) {
+						if (name.equals(namedElement.getName())
+							&& count-- == 0) {
 							return namedElement;
 						}
 					}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamespaceImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamespaceImpl.java
index e33fa04..f328523 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamespaceImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NamespaceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -133,8 +133,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -185,8 +185,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<NamedElement> members = (EList<NamedElement>) cache.get(
-				eResource, this, UMLPackage.Literals.NAMESPACE__MEMBER);
+			EList<NamedElement> members = (EList<NamedElement>) cache
+				.get(eResource, this, UMLPackage.Literals.NAMESPACE__MEMBER);
 			if (members == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.NAMESPACE__MEMBER,
@@ -208,8 +208,7 @@
 	public EList<ElementImport> getElementImports() {
 		if (elementImports == null) {
 			elementImports = new EObjectContainmentWithInverseEList.Resolving<ElementImport>(
-				ElementImport.class, this,
-				UMLPackage.NAMESPACE__ELEMENT_IMPORT,
+				ElementImport.class, this, UMLPackage.NAMESPACE__ELEMENT_IMPORT,
 				UMLPackage.ELEMENT_IMPORT__IMPORTING_NAMESPACE);
 		}
 		return elementImports;
@@ -220,8 +219,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ElementImport createElementImport(PackageableElement importedElement) {
-		ElementImport newElementImport = (ElementImport) create(UMLPackage.Literals.ELEMENT_IMPORT);
+	public ElementImport createElementImport(
+			PackageableElement importedElement) {
+		ElementImport newElementImport = (ElementImport) create(
+			UMLPackage.Literals.ELEMENT_IMPORT);
 		getElementImports().add(newElementImport);
 		if (importedElement != null)
 			newElementImport.setImportedElement(importedElement);
@@ -263,8 +264,7 @@
 	public EList<PackageImport> getPackageImports() {
 		if (packageImports == null) {
 			packageImports = new EObjectContainmentWithInverseEList.Resolving<PackageImport>(
-				PackageImport.class, this,
-				UMLPackage.NAMESPACE__PACKAGE_IMPORT,
+				PackageImport.class, this, UMLPackage.NAMESPACE__PACKAGE_IMPORT,
 				UMLPackage.PACKAGE_IMPORT__IMPORTING_NAMESPACE);
 		}
 		return packageImports;
@@ -277,7 +277,8 @@
 	 */
 	public PackageImport createPackageImport(
 			org.eclipse.uml2.uml.Package importedPackage) {
-		PackageImport newPackageImport = (PackageImport) create(UMLPackage.Literals.PACKAGE_IMPORT);
+		PackageImport newPackageImport = (PackageImport) create(
+			UMLPackage.Literals.PACKAGE_IMPORT);
 		getPackageImports().add(newPackageImport);
 		if (importedPackage != null)
 			newPackageImport.setImportedPackage(importedPackage);
@@ -300,7 +301,8 @@
 	 * @generated
 	 */
 	public PackageImport getPackageImport(
-			org.eclipse.uml2.uml.Package importedPackage, boolean createOnDemand) {
+			org.eclipse.uml2.uml.Package importedPackage,
+			boolean createOnDemand) {
 		packageImportLoop : for (PackageImport packageImport : getPackageImports()) {
 			if (importedPackage != null
 				&& !importedPackage.equals(packageImport.getImportedPackage()))
@@ -412,8 +414,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PackageableElement getImportedMember(String name,
-			boolean ignoreCase, EClass eClass) {
+	public PackageableElement getImportedMember(String name, boolean ignoreCase,
+			EClass eClass) {
 		importedMemberLoop : for (PackageableElement importedMember : getImportedMembers()) {
 			if (eClass != null && !eClass.isInstance(importedMember))
 				continue importedMemberLoop;
@@ -453,8 +455,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateCannotImportOwnedMembers(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateCannotImportOwnedMembers(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return NamespaceOperations.validateCannotImportOwnedMembers(this,
 			diagnostics, context);
 	}
@@ -599,22 +601,22 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.NAMESPACE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NAMESPACE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NAMESPACE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.NAMESPACE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NAMESPACE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NAMESPACE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -680,13 +682,13 @@
 		switch (featureID) {
 			case UMLPackage.NAMESPACE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.NAMESPACE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.NAMESPACE__NAME :
 				setName((String) newValue);
@@ -699,18 +701,18 @@
 				return;
 			case UMLPackage.NAMESPACE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.NAMESPACE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.NAMESPACE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -855,7 +857,8 @@
 			case UMLPackage.NAMESPACE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.NAMESPACE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.NAMESPACE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.NAMESPACE___GET_STEREOTYPE_APPLICATIONS :
@@ -863,7 +866,8 @@
 			case UMLPackage.NAMESPACE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.NAMESPACE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.NAMESPACE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -952,13 +956,13 @@
 			case UMLPackage.NAMESPACE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.NAMESPACE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.NAMESPACE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.NAMESPACE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.NAMESPACE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.NAMESPACE___MEMBERS_ARE_DISTINGUISHABLE :
@@ -988,7 +992,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_MEMBER_ESUBSETS = new int[]{UMLPackage.NAMESPACE__OWNED_RULE};
+	protected static final int[] OWNED_MEMBER_ESUBSETS = new int[]{
+		UMLPackage.NAMESPACE__OWNED_RULE};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getOwnedElements() <em>Owned Element</em>}' reference list.
@@ -1059,7 +1064,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NamedElement getMember(String name, boolean ignoreCase, EClass eClass) {
+	public NamedElement getMember(String name, boolean ignoreCase,
+			EClass eClass) {
 		memberLoop : for (NamedElement member : getMembers()) {
 			if (eClass != null && !eClass.isInstance(member))
 				continue memberLoop;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NodeImpl.java
index 77933a0..46a2dc0 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/NodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -147,8 +147,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -189,8 +189,7 @@
 				.get(this,
 					UMLPackage.Literals.DEPLOYMENT_TARGET__DEPLOYED_ELEMENT);
 			if (result == null) {
-				cache.put(
-					this,
+				cache.put(this,
 					UMLPackage.Literals.DEPLOYMENT_TARGET__DEPLOYED_ELEMENT,
 					result = DeploymentTargetOperations
 						.getDeployedElements(this));
@@ -245,8 +244,8 @@
 				cache.put(eResource, this,
 					UMLPackage.Literals.NAMESPACE__OWNED_MEMBER,
 					ownedMembers = new DerivedUnionEObjectEList<NamedElement>(
-						NamedElement.class, this,
-						UMLPackage.NODE__OWNED_MEMBER, OWNED_MEMBER_ESUBSETS));
+						NamedElement.class, this, UMLPackage.NODE__OWNED_MEMBER,
+						OWNED_MEMBER_ESUBSETS));
 			}
 			return ownedMembers;
 		}
@@ -395,10 +394,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.NODE__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.NODE__TEMPLATE_BINDING :
@@ -407,9 +406,10 @@
 			case UMLPackage.NODE__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.NODE__OWNED_TEMPLATE_SIGNATURE, null,
-							msgs);
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.NODE__OWNED_TEMPLATE_SIGNATURE,
+							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
 			case UMLPackage.NODE__GENERALIZATION :
@@ -447,76 +447,76 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.NODE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.NODE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.NODE__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.NODE__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.NODE__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.NODE__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__OWNED_CONNECTOR :
-				return ((InternalEList<?>) getOwnedConnectors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedConnectors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__INTERFACE_REALIZATION :
 				return ((InternalEList<?>) getInterfaceRealizations())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__OWNED_BEHAVIOR :
-				return ((InternalEList<?>) getOwnedBehaviors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedBehaviors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__NESTED_CLASSIFIER :
-				return ((InternalEList<?>) getNestedClassifiers()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedClassifiers())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__OWNED_RECEPTION :
-				return ((InternalEList<?>) getOwnedReceptions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedReceptions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__DEPLOYMENT :
-				return ((InternalEList<?>) getDeployments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getDeployments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.NODE__NESTED_NODE :
-				return ((InternalEList<?>) getNestedNodes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedNodes())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -672,13 +672,13 @@
 		switch (featureID) {
 			case UMLPackage.NODE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.NODE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.NODE__NAME :
 				setName((String) newValue);
@@ -691,18 +691,18 @@
 				return;
 			case UMLPackage.NODE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.NODE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.NODE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.NODE__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -718,31 +718,31 @@
 				return;
 			case UMLPackage.NODE__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.NODE__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.NODE__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.NODE__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.NODE__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.NODE__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.NODE__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -752,8 +752,8 @@
 				return;
 			case UMLPackage.NODE__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.NODE__USE_CASE :
 				getUseCases().clear();
@@ -761,26 +761,26 @@
 				return;
 			case UMLPackage.NODE__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.NODE__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.NODE__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.NODE__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.NODE__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.NODE__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -792,37 +792,36 @@
 				return;
 			case UMLPackage.NODE__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.NODE__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 			case UMLPackage.NODE__IS_ACTIVE :
 				setIsActive((Boolean) newValue);
 				return;
 			case UMLPackage.NODE__NESTED_CLASSIFIER :
 				getNestedClassifiers().clear();
-				getNestedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getNestedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.NODE__OWNED_RECEPTION :
 				getOwnedReceptions().clear();
-				getOwnedReceptions().addAll(
-					(Collection<? extends Reception>) newValue);
+				getOwnedReceptions()
+					.addAll((Collection<? extends Reception>) newValue);
 				return;
 			case UMLPackage.NODE__SUPER_CLASS :
 				getSuperClasses().clear();
-				getSuperClasses()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
+				getSuperClasses().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
 				return;
 			case UMLPackage.NODE__DEPLOYMENT :
 				getDeployments().clear();
-				getDeployments().addAll(
-					(Collection<? extends Deployment>) newValue);
+				getDeployments()
+					.addAll((Collection<? extends Deployment>) newValue);
 				return;
 			case UMLPackage.NODE__NESTED_NODE :
 				getNestedNodes().clear();
@@ -1031,7 +1030,8 @@
 			case UMLPackage.NODE__IS_ABSTRACT :
 				return isSetIsAbstract();
 			case UMLPackage.NODE__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.NODE__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.NODE__USE_CASE :
@@ -1089,7 +1089,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == DeploymentTarget.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.NODE__DEPLOYED_ELEMENT :
@@ -1109,7 +1110,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == DeploymentTarget.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.DEPLOYMENT_TARGET__DEPLOYED_ELEMENT :
@@ -1180,7 +1182,8 @@
 			case UMLPackage.NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -1188,7 +1191,8 @@
 			case UMLPackage.NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1277,13 +1281,13 @@
 			case UMLPackage.NODE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.NODE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.NODE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.NODE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.NODE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.NODE___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1303,10 +1307,11 @@
 			case UMLPackage.NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.NODE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.NODE___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.NODE___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1407,8 +1412,7 @@
 			case UMLPackage.NODE___GET_OWNED_PORTS :
 				return getOwnedPorts();
 			case UMLPackage.NODE___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.NODE___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
@@ -1471,7 +1475,8 @@
 	 * @generated
 	 */
 	public Deployment createDeployment(String name) {
-		Deployment newDeployment = (Deployment) create(UMLPackage.Literals.DEPLOYMENT);
+		Deployment newDeployment = (Deployment) create(
+			UMLPackage.Literals.DEPLOYMENT);
 		getDeployments().add(newDeployment);
 		if (name != null)
 			newDeployment.setName(name);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectFlowImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectFlowImpl.java
index 05bbb42..8d74865 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectFlowImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectFlowImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -333,8 +333,8 @@
 	 */
 	public boolean validateNoExecutableNodes(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ObjectFlowOperations.validateNoExecutableNodes(this,
-			diagnostics, context);
+		return ObjectFlowOperations.validateNoExecutableNodes(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -355,8 +355,8 @@
 	 */
 	public boolean validateSelectionBehavior(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ObjectFlowOperations.validateSelectionBehavior(this,
-			diagnostics, context);
+		return ObjectFlowOperations.validateSelectionBehavior(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -471,13 +471,13 @@
 		switch (featureID) {
 			case UMLPackage.OBJECT_FLOW__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.OBJECT_FLOW__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.OBJECT_FLOW__NAME :
 				setName((String) newValue);
@@ -499,8 +499,8 @@
 				return;
 			case UMLPackage.OBJECT_FLOW__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.OBJECT_FLOW__INTERRUPTS :
 				setInterrupts((InterruptibleActivityRegion) newValue);
@@ -516,8 +516,8 @@
 				return;
 			case UMLPackage.OBJECT_FLOW__REDEFINED_EDGE :
 				getRedefinedEdges().clear();
-				getRedefinedEdges().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getRedefinedEdges()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.OBJECT_FLOW__WEIGHT :
 				setWeight((ValueSpecification) newValue);
@@ -664,9 +664,11 @@
 			case UMLPackage.OBJECT_FLOW__IN_GROUP :
 				return isSetInGroups();
 			case UMLPackage.OBJECT_FLOW__IS_MULTICAST :
-				return ((eFlags & IS_MULTICAST_EFLAG) != 0) != IS_MULTICAST_EDEFAULT;
+				return ((eFlags
+					& IS_MULTICAST_EFLAG) != 0) != IS_MULTICAST_EDEFAULT;
 			case UMLPackage.OBJECT_FLOW__IS_MULTIRECEIVE :
-				return ((eFlags & IS_MULTIRECEIVE_EFLAG) != 0) != IS_MULTIRECEIVE_EDEFAULT;
+				return ((eFlags
+					& IS_MULTIRECEIVE_EFLAG) != 0) != IS_MULTIRECEIVE_EDEFAULT;
 			case UMLPackage.OBJECT_FLOW__SELECTION :
 				return selection != null;
 			case UMLPackage.OBJECT_FLOW__TRANSFORMATION :
@@ -732,7 +734,8 @@
 			case UMLPackage.OBJECT_FLOW___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.OBJECT_FLOW___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OBJECT_FLOW___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.OBJECT_FLOW___GET_STEREOTYPE_APPLICATIONS :
@@ -740,7 +743,8 @@
 			case UMLPackage.OBJECT_FLOW___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.OBJECT_FLOW___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OBJECT_FLOW___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -817,8 +821,8 @@
 			case UMLPackage.OBJECT_FLOW___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.OBJECT_FLOW___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.OBJECT_FLOW___VALIDATE_SOURCE_AND_TARGET__DIAGNOSTICCHAIN_MAP :
 				return validateSourceAndTarget(
 					(DiagnosticChain) arguments.get(0),
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectNodeImpl.java
index a7d5edd..344cb3e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ObjectNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -267,8 +267,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -289,7 +289,8 @@
 	 * @generated
 	 */
 	public ObjectNodeOrderingKind getOrdering() {
-		return ORDERING_EFLAG_VALUES[(eFlags & ORDERING_EFLAG) >>> ORDERING_EFLAG_OFFSET];
+		return ORDERING_EFLAG_VALUES[(eFlags
+			& ORDERING_EFLAG) >>> ORDERING_EFLAG_OFFSET];
 	}
 
 	/**
@@ -298,7 +299,8 @@
 	 * @generated
 	 */
 	public void setOrdering(ObjectNodeOrderingKind newOrdering) {
-		ObjectNodeOrderingKind oldOrdering = ORDERING_EFLAG_VALUES[(eFlags & ORDERING_EFLAG) >>> ORDERING_EFLAG_OFFSET];
+		ObjectNodeOrderingKind oldOrdering = ORDERING_EFLAG_VALUES[(eFlags
+			& ORDERING_EFLAG) >>> ORDERING_EFLAG_OFFSET];
 		if (newOrdering == null)
 			newOrdering = ORDERING_EDEFAULT;
 		eFlags = eFlags & ~ORDERING_EFLAG
@@ -347,11 +349,14 @@
 				InternalEObject newUpperBound = (InternalEObject) upperBound;
 				NotificationChain msgs = oldUpperBound.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.OBJECT_NODE__UPPER_BOUND, null, null);
+						- UMLPackage.OBJECT_NODE__UPPER_BOUND,
+					null, null);
 				if (newUpperBound.eInternalContainer() == null) {
-					msgs = newUpperBound.eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.OBJECT_NODE__UPPER_BOUND, null, msgs);
+					msgs = newUpperBound
+						.eInverseAdd(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.OBJECT_NODE__UPPER_BOUND,
+							null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -405,11 +410,13 @@
 			if (upperBound != null)
 				msgs = ((InternalEObject) upperBound).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.OBJECT_NODE__UPPER_BOUND, null, msgs);
+						- UMLPackage.OBJECT_NODE__UPPER_BOUND,
+					null, msgs);
 			if (newUpperBound != null)
 				msgs = ((InternalEObject) newUpperBound).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.OBJECT_NODE__UPPER_BOUND, null, msgs);
+						- UMLPackage.OBJECT_NODE__UPPER_BOUND,
+					null, msgs);
 			msgs = basicSetUpperBound(newUpperBound, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -534,8 +541,8 @@
 	 */
 	public boolean validateSelectionBehavior(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ObjectNodeOperations.validateSelectionBehavior(this,
-			diagnostics, context);
+		return ObjectNodeOperations.validateSelectionBehavior(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -559,11 +566,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.OBJECT_NODE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OBJECT_NODE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OBJECT_NODE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.OBJECT_NODE__IN_INTERRUPTIBLE_REGION :
@@ -572,14 +579,14 @@
 			case UMLPackage.OBJECT_NODE__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.OBJECT_NODE__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.OBJECT_NODE__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.OBJECT_NODE__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OBJECT_NODE__UPPER_BOUND :
 				return basicSetUpperBound(null, msgs);
 		}
@@ -679,13 +686,13 @@
 		switch (featureID) {
 			case UMLPackage.OBJECT_NODE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.OBJECT_NODE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.OBJECT_NODE__NAME :
 				setName((String) newValue);
@@ -704,32 +711,31 @@
 				return;
 			case UMLPackage.OBJECT_NODE__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.OBJECT_NODE__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.OBJECT_NODE__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.OBJECT_NODE__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.OBJECT_NODE__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.OBJECT_NODE__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.OBJECT_NODE__TYPE :
 				setType((Type) newValue);
@@ -881,7 +887,8 @@
 			case UMLPackage.OBJECT_NODE__IN_STATE :
 				return inStates != null && !inStates.isEmpty();
 			case UMLPackage.OBJECT_NODE__IS_CONTROL_TYPE :
-				return ((eFlags & IS_CONTROL_TYPE_EFLAG) != 0) != IS_CONTROL_TYPE_EDEFAULT;
+				return ((eFlags
+					& IS_CONTROL_TYPE_EFLAG) != 0) != IS_CONTROL_TYPE_EDEFAULT;
 			case UMLPackage.OBJECT_NODE__ORDERING :
 				return (eFlags & ORDERING_EFLAG) != ORDERING_EFLAG_DEFAULT;
 			case UMLPackage.OBJECT_NODE__SELECTION :
@@ -898,7 +905,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == TypedElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.OBJECT_NODE__TYPE :
@@ -916,7 +924,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == TypedElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.TYPED_ELEMENT__TYPE :
@@ -985,7 +994,8 @@
 			case UMLPackage.OBJECT_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.OBJECT_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OBJECT_NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.OBJECT_NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -993,7 +1003,8 @@
 			case UMLPackage.OBJECT_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.OBJECT_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OBJECT_NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1070,8 +1081,8 @@
 			case UMLPackage.OBJECT_NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.OBJECT_NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.OBJECT_NODE___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.OBJECT_NODE___VALIDATE_INPUT_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP :
@@ -1104,8 +1115,8 @@
 		result.append(" (isControlType: "); //$NON-NLS-1$
 		result.append((eFlags & IS_CONTROL_TYPE_EFLAG) != 0);
 		result.append(", ordering: "); //$NON-NLS-1$
-		result
-			.append(ORDERING_EFLAG_VALUES[(eFlags & ORDERING_EFLAG) >>> ORDERING_EFLAG_OFFSET]);
+		result.append(ORDERING_EFLAG_VALUES[(eFlags
+			& ORDERING_EFLAG) >>> ORDERING_EFLAG_OFFSET]);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OccurrenceSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OccurrenceSpecificationImpl.java
index 5407be8..c79f810 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OccurrenceSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OccurrenceSpecificationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 297216, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 297216, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -293,11 +293,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.OCCURRENCE_SPECIFICATION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OCCURRENCE_SPECIFICATION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OCCURRENCE_SPECIFICATION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.OCCURRENCE_SPECIFICATION__COVERED :
@@ -308,14 +308,14 @@
 			case UMLPackage.OCCURRENCE_SPECIFICATION__ENCLOSING_INTERACTION :
 				return basicSetEnclosingInteraction(null, msgs);
 			case UMLPackage.OCCURRENCE_SPECIFICATION__GENERAL_ORDERING :
-				return ((InternalEList<?>) getGeneralOrderings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralOrderings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OCCURRENCE_SPECIFICATION__TO_AFTER :
 				return ((InternalEList<?>) getToAfters()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE :
-				return ((InternalEList<?>) getToBefores()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getToBefores()).basicRemove(otherEnd,
+					msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -385,13 +385,13 @@
 		switch (featureID) {
 			case UMLPackage.OCCURRENCE_SPECIFICATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.OCCURRENCE_SPECIFICATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.OCCURRENCE_SPECIFICATION__NAME :
 				setName((String) newValue);
@@ -414,18 +414,18 @@
 				return;
 			case UMLPackage.OCCURRENCE_SPECIFICATION__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.OCCURRENCE_SPECIFICATION__TO_AFTER :
 				getToAfters().clear();
-				getToAfters().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getToAfters()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.OCCURRENCE_SPECIFICATION__TO_BEFORE :
 				getToBefores().clear();
-				getToBefores().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getToBefores()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -579,7 +579,8 @@
 			case UMLPackage.OCCURRENCE_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.OCCURRENCE_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OCCURRENCE_SPECIFICATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.OCCURRENCE_SPECIFICATION___GET_STEREOTYPE_APPLICATIONS :
@@ -587,7 +588,8 @@
 			case UMLPackage.OCCURRENCE_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.OCCURRENCE_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OCCURRENCE_SPECIFICATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueActionImpl.java
index 25f4281..112afcc 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -179,8 +179,8 @@
 			if (outputs == null) {
 				cache.put(eResource, this, UMLPackage.Literals.ACTION__OUTPUT,
 					outputs = new DerivedUnionEObjectEList<OutputPin>(
-						OutputPin.class, this,
-						UMLPackage.OPAQUE_ACTION__OUTPUT, OUTPUT_ESUBSETS));
+						OutputPin.class, this, UMLPackage.OPAQUE_ACTION__OUTPUT,
+						OUTPUT_ESUBSETS));
 			}
 			return outputs;
 		}
@@ -351,7 +351,8 @@
 	 * @generated
 	 */
 	public OutputPin createOutputValue(String name, Type type) {
-		OutputPin newOutputValue = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newOutputValue = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		getOutputValues().add(newOutputValue);
 		if (name != null)
 			newOutputValue.setName(name);
@@ -406,7 +407,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
-	public OutputPin getOutputValue(String name, Type type, boolean ignoreCase) {
+	public OutputPin getOutputValue(String name, Type type,
+			boolean ignoreCase) {
 		return getOutputValue(name, type, ignoreCase, false);
 	}
 
@@ -420,11 +422,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.OPAQUE_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPAQUE_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPAQUE_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.OPAQUE_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -433,14 +435,14 @@
 			case UMLPackage.OPAQUE_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.OPAQUE_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.OPAQUE_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.OPAQUE_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPAQUE_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -451,11 +453,11 @@
 				return ((InternalEList<?>) getLocalPreconditions())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPAQUE_ACTION__INPUT_VALUE :
-				return ((InternalEList<?>) getInputValues()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInputValues())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPAQUE_ACTION__OUTPUT_VALUE :
-				return ((InternalEList<?>) getOutputValues()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutputValues())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -559,13 +561,13 @@
 		switch (featureID) {
 			case UMLPackage.OPAQUE_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.OPAQUE_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.OPAQUE_ACTION__NAME :
 				setName((String) newValue);
@@ -584,50 +586,49 @@
 				return;
 			case UMLPackage.OPAQUE_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.OPAQUE_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.OPAQUE_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.OPAQUE_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.OPAQUE_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.OPAQUE_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.OPAQUE_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.OPAQUE_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.OPAQUE_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.OPAQUE_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.OPAQUE_ACTION__BODY :
 				getBodies().clear();
@@ -635,8 +636,8 @@
 				return;
 			case UMLPackage.OPAQUE_ACTION__INPUT_VALUE :
 				getInputValues().clear();
-				getInputValues().addAll(
-					(Collection<? extends InputPin>) newValue);
+				getInputValues()
+					.addAll((Collection<? extends InputPin>) newValue);
 				return;
 			case UMLPackage.OPAQUE_ACTION__LANGUAGE :
 				getLanguages().clear();
@@ -644,8 +645,8 @@
 				return;
 			case UMLPackage.OPAQUE_ACTION__OUTPUT_VALUE :
 				getOutputValues().clear();
-				getOutputValues().addAll(
-					(Collection<? extends OutputPin>) newValue);
+				getOutputValues()
+					.addAll((Collection<? extends OutputPin>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -786,7 +787,8 @@
 			case UMLPackage.OPAQUE_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.OPAQUE_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.OPAQUE_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -864,7 +866,8 @@
 			case UMLPackage.OPAQUE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.OPAQUE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OPAQUE_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.OPAQUE_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -872,7 +875,8 @@
 			case UMLPackage.OPAQUE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.OPAQUE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OPAQUE_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -949,8 +953,8 @@
 			case UMLPackage.OPAQUE_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.OPAQUE_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.OPAQUE_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.OPAQUE_ACTION___GET_CONTEXT :
@@ -996,7 +1000,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.OPAQUE_ACTION__INPUT_VALUE};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.OPAQUE_ACTION__INPUT_VALUE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1017,7 +1022,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.OPAQUE_ACTION__OUTPUT_VALUE};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.OPAQUE_ACTION__OUTPUT_VALUE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueBehaviorImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueBehaviorImpl.java
index 4bd9eb8..f54a8c8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueBehaviorImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueBehaviorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -339,13 +339,13 @@
 		switch (featureID) {
 			case UMLPackage.OPAQUE_BEHAVIOR__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__NAME :
 				setName((String) newValue);
@@ -358,18 +358,18 @@
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -385,31 +385,31 @@
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -419,8 +419,8 @@
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__USE_CASE :
 				getUseCases().clear();
@@ -428,26 +428,26 @@
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -459,32 +459,31 @@
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__IS_ACTIVE :
 				setIsActive((Boolean) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__NESTED_CLASSIFIER :
 				getNestedClassifiers().clear();
-				getNestedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getNestedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__OWNED_RECEPTION :
 				getOwnedReceptions().clear();
-				getOwnedReceptions().addAll(
-					(Collection<? extends Reception>) newValue);
+				getOwnedReceptions()
+					.addAll((Collection<? extends Reception>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__SUPER_CLASS :
 				getSuperClasses().clear();
-				getSuperClasses()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
+				getSuperClasses().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__SPECIFICATION :
 				setSpecification((BehavioralFeature) newValue);
@@ -494,28 +493,28 @@
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__OWNED_PARAMETER :
 				getOwnedParameters().clear();
-				getOwnedParameters().addAll(
-					(Collection<? extends Parameter>) newValue);
+				getOwnedParameters()
+					.addAll((Collection<? extends Parameter>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__OWNED_PARAMETER_SET :
 				getOwnedParameterSets().clear();
-				getOwnedParameterSets().addAll(
-					(Collection<? extends ParameterSet>) newValue);
+				getOwnedParameterSets()
+					.addAll((Collection<? extends ParameterSet>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__POSTCONDITION :
 				getPostconditions().clear();
-				getPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__PRECONDITION :
 				getPreconditions().clear();
-				getPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__REDEFINED_BEHAVIOR :
 				getRedefinedBehaviors().clear();
-				getRedefinedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getRedefinedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.OPAQUE_BEHAVIOR__BODY :
 				getBodies().clear();
@@ -749,7 +748,8 @@
 			case UMLPackage.OPAQUE_BEHAVIOR__IS_ABSTRACT :
 				return isSetIsAbstract();
 			case UMLPackage.OPAQUE_BEHAVIOR__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.OPAQUE_BEHAVIOR__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.OPAQUE_BEHAVIOR__USE_CASE :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueExpressionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueExpressionImpl.java
index 6234c78..7ed30fb 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueExpressionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OpaqueExpressionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -263,8 +263,8 @@
 	 */
 	public boolean validateOnlyReturnResultParameters(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return OpaqueExpressionOperations.validateOnlyReturnResultParameters(
-			this, diagnostics, context);
+		return OpaqueExpressionOperations
+			.validateOnlyReturnResultParameters(this, diagnostics, context);
 	}
 
 	/**
@@ -272,10 +272,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateOneReturnResultParameter(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return OpaqueExpressionOperations.validateOneReturnResultParameter(
-			this, diagnostics, context);
+	public boolean validateOneReturnResultParameter(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return OpaqueExpressionOperations.validateOneReturnResultParameter(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -397,13 +397,13 @@
 		switch (featureID) {
 			case UMLPackage.OPAQUE_EXPRESSION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.OPAQUE_EXPRESSION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.OPAQUE_EXPRESSION__NAME :
 				setName((String) newValue);
@@ -588,7 +588,8 @@
 			case UMLPackage.OPAQUE_EXPRESSION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.OPAQUE_EXPRESSION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OPAQUE_EXPRESSION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.OPAQUE_EXPRESSION___GET_STEREOTYPE_APPLICATIONS :
@@ -596,7 +597,8 @@
 			case UMLPackage.OPAQUE_EXPRESSION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.OPAQUE_EXPRESSION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OPAQUE_EXPRESSION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -659,7 +661,8 @@
 			case UMLPackage.OPAQUE_EXPRESSION___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.OPAQUE_EXPRESSION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.OPAQUE_EXPRESSION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.OPAQUE_EXPRESSION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationImpl.java
index 429cfe1..8f8d6b8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -289,7 +289,8 @@
 	public TemplateParameter getTemplateParameter() {
 		if (templateParameter != null && templateParameter.eIsProxy()) {
 			InternalEObject oldTemplateParameter = (InternalEObject) templateParameter;
-			templateParameter = (TemplateParameter) eResolveProxy(oldTemplateParameter);
+			templateParameter = (TemplateParameter) eResolveProxy(
+				oldTemplateParameter);
 			if (templateParameter != oldTemplateParameter) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -421,7 +422,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetOwningTemplateParameter(
-			TemplateParameter newOwningTemplateParameter, NotificationChain msgs) {
+			TemplateParameter newOwningTemplateParameter,
+			NotificationChain msgs) {
 		msgs = eBasicSetContainer((InternalEObject) newOwningTemplateParameter,
 			UMLPackage.OPERATION__OWNING_TEMPLATE_PARAMETER, msgs);
 		Resource.Internal eInternalResource = eInternalResource();
@@ -443,7 +445,8 @@
 	public void setOwningTemplateParameter(
 			TemplateParameter newOwningTemplateParameter) {
 		if (newOwningTemplateParameter != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.OPERATION__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
+			|| (eContainerFeatureID() != UMLPackage.OPERATION__OWNING_TEMPLATE_PARAMETER
+				&& newOwningTemplateParameter != null)) {
 			if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -452,8 +455,7 @@
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newOwningTemplateParameter != null)
 				msgs = ((InternalEObject) newOwningTemplateParameter)
-					.eInverseAdd(
-						this,
+					.eInverseAdd(this,
 						UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 						TemplateParameter.class, msgs);
 			msgs = basicSetOwningTemplateParameter(newOwningTemplateParameter,
@@ -477,8 +479,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -514,7 +516,8 @@
 	 * @generated
 	 */
 	public TemplateBinding createTemplateBinding(TemplateSignature signature) {
-		TemplateBinding newTemplateBinding = (TemplateBinding) create(UMLPackage.Literals.TEMPLATE_BINDING);
+		TemplateBinding newTemplateBinding = (TemplateBinding) create(
+			UMLPackage.Literals.TEMPLATE_BINDING);
 		getTemplateBindings().add(newTemplateBinding);
 		if (signature != null)
 			newTemplateBinding.setSignature(signature);
@@ -554,9 +557,11 @@
 	 * @generated
 	 */
 	public TemplateSignature getOwnedTemplateSignature() {
-		if (ownedTemplateSignature != null && ownedTemplateSignature.eIsProxy()) {
+		if (ownedTemplateSignature != null
+			&& ownedTemplateSignature.eIsProxy()) {
 			InternalEObject oldOwnedTemplateSignature = (InternalEObject) ownedTemplateSignature;
-			ownedTemplateSignature = (TemplateSignature) eResolveProxy(oldOwnedTemplateSignature);
+			ownedTemplateSignature = (TemplateSignature) eResolveProxy(
+				oldOwnedTemplateSignature);
 			if (ownedTemplateSignature != oldOwnedTemplateSignature) {
 				InternalEObject newOwnedTemplateSignature = (InternalEObject) ownedTemplateSignature;
 				NotificationChain msgs = oldOwnedTemplateSignature
@@ -594,7 +599,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetOwnedTemplateSignature(
-			TemplateSignature newOwnedTemplateSignature, NotificationChain msgs) {
+			TemplateSignature newOwnedTemplateSignature,
+			NotificationChain msgs) {
 		TemplateSignature oldOwnedTemplateSignature = ownedTemplateSignature;
 		ownedTemplateSignature = newOwnedTemplateSignature;
 		if (eNotificationRequired()) {
@@ -644,7 +650,8 @@
 	 * @generated
 	 */
 	public TemplateSignature createOwnedTemplateSignature(EClass eClass) {
-		TemplateSignature newOwnedTemplateSignature = (TemplateSignature) create(eClass);
+		TemplateSignature newOwnedTemplateSignature = (TemplateSignature) create(
+			eClass);
 		setOwnedTemplateSignature(newOwnedTemplateSignature);
 		return newOwnedTemplateSignature;
 	}
@@ -655,7 +662,8 @@
 	 * @generated
 	 */
 	public TemplateSignature createOwnedTemplateSignature() {
-		return createOwnedTemplateSignature(UMLPackage.Literals.TEMPLATE_SIGNATURE);
+		return createOwnedTemplateSignature(
+			UMLPackage.Literals.TEMPLATE_SIGNATURE);
 	}
 
 	/**
@@ -670,20 +678,15 @@
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
 			EList<Classifier> redefinitionContexts = (EList<Classifier>) cache
-				.get(
-					eResource,
-					this,
+				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 			if (redefinitionContexts == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-						redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class, this,
-							UMLPackage.OPERATION__REDEFINITION_CONTEXT,
-							REDEFINITION_CONTEXT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+					redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.OPERATION__REDEFINITION_CONTEXT,
+						REDEFINITION_CONTEXT_ESUBSETS));
 			}
 			return redefinitionContexts;
 		}
@@ -707,15 +710,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
 			if (featuringClassifiers == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER,
-						featuringClassifiers = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class, this,
-							UMLPackage.OPERATION__FEATURING_CLASSIFIER,
-							FEATURING_CLASSIFIER_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER,
+					featuringClassifiers = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.OPERATION__FEATURING_CLASSIFIER,
+						FEATURING_CLASSIFIER_ESUBSETS));
 			}
 			return featuringClassifiers;
 		}
@@ -739,21 +739,19 @@
 				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT);
 			if (redefinedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
-						redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
-							RedefinableElement.class, this,
-							UMLPackage.OPERATION__REDEFINED_ELEMENT,
-							REDEFINED_ELEMENT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
+					redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
+						RedefinableElement.class, this,
+						UMLPackage.OPERATION__REDEFINED_ELEMENT,
+						REDEFINED_ELEMENT_ESUBSETS));
 			}
 			return redefinedElements;
 		}
 		return new DerivedUnionEObjectEList<RedefinableElement>(
 			RedefinableElement.class, this,
-			UMLPackage.OPERATION__REDEFINED_ELEMENT, REDEFINED_ELEMENT_ESUBSETS);
+			UMLPackage.OPERATION__REDEFINED_ELEMENT,
+			REDEFINED_ELEMENT_ESUBSETS);
 	}
 
 	/**
@@ -859,8 +857,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetClass_(
-			org.eclipse.uml2.uml.Class newClass, NotificationChain msgs) {
+	public NotificationChain basicSetClass_(org.eclipse.uml2.uml.Class newClass,
+			NotificationChain msgs) {
 		msgs = eBasicSetContainer((InternalEObject) newClass,
 			UMLPackage.OPERATION__CLASS, msgs);
 		return msgs;
@@ -873,7 +871,8 @@
 	 */
 	public void setClass_(org.eclipse.uml2.uml.Class newClass) {
 		if (newClass != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.OPERATION__CLASS && newClass != null)) {
+			|| (eContainerFeatureID() != UMLPackage.OPERATION__CLASS
+				&& newClass != null)) {
 			if (EcoreUtil.isAncestor(this, newClass))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -940,7 +939,8 @@
 	 * @generated
 	 */
 	public Operation getRedefinedOperation(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
+			EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
 		return getRedefinedOperation(name, ownedParameterNames,
 			ownedParameterTypes, false);
 	}
@@ -963,20 +963,19 @@
 			int ownedParameterListSize = ownedParameterList.size();
 			if (ownedParameterNames != null
 				&& ownedParameterNames.size() != ownedParameterListSize
-				|| (ownedParameterTypes != null && ownedParameterTypes.size() != ownedParameterListSize))
+				|| (ownedParameterTypes != null
+					&& ownedParameterTypes.size() != ownedParameterListSize))
 				continue redefinedOperationLoop;
 			for (int j = 0; j < ownedParameterListSize; j++) {
 				Parameter ownedParameter = ownedParameterList.get(j);
-				if (ownedParameterNames != null
-					&& !(ignoreCase
-						? (ownedParameterNames.get(j))
-							.equalsIgnoreCase(ownedParameter.getName())
-						: ownedParameterNames.get(j).equals(
-							ownedParameter.getName())))
+				if (ownedParameterNames != null && !(ignoreCase
+					? (ownedParameterNames.get(j))
+						.equalsIgnoreCase(ownedParameter.getName())
+					: ownedParameterNames.get(j)
+						.equals(ownedParameter.getName())))
 					continue redefinedOperationLoop;
-				if (ownedParameterTypes != null
-					&& !ownedParameterTypes.get(j).equals(
-						ownedParameter.getType()))
+				if (ownedParameterTypes != null && !ownedParameterTypes.get(j)
+					.equals(ownedParameter.getType()))
 					continue redefinedOperationLoop;
 			}
 			return redefinedOperation;
@@ -1025,7 +1024,8 @@
 	 */
 	public void setDatatype(DataType newDatatype) {
 		if (newDatatype != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.OPERATION__DATATYPE && newDatatype != null)) {
+			|| (eContainerFeatureID() != UMLPackage.OPERATION__DATATYPE
+				&& newDatatype != null)) {
 			if (EcoreUtil.isAncestor(this, newDatatype))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -1033,9 +1033,9 @@
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newDatatype != null)
-				msgs = ((InternalEObject) newDatatype)
-					.eInverseAdd(this, UMLPackage.DATA_TYPE__OWNED_OPERATION,
-						DataType.class, msgs);
+				msgs = ((InternalEObject) newDatatype).eInverseAdd(this,
+					UMLPackage.DATA_TYPE__OWNED_OPERATION, DataType.class,
+					msgs);
 			msgs = basicSetDatatype(newDatatype, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -1179,7 +1179,8 @@
 	 */
 	public void setInterface(Interface newInterface) {
 		if (newInterface != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.OPERATION__INTERFACE && newInterface != null)) {
+			|| (eContainerFeatureID() != UMLPackage.OPERATION__INTERFACE
+				&& newInterface != null)) {
 			if (EcoreUtil.isAncestor(this, newInterface))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -1218,7 +1219,8 @@
 	 * @generated
 	 */
 	public Parameter createOwnedParameter(String name, Type type) {
-		Parameter newOwnedParameter = (Parameter) create(UMLPackage.Literals.PARAMETER);
+		Parameter newOwnedParameter = (Parameter) create(
+			UMLPackage.Literals.PARAMETER);
 		getOwnedParameters().add(newOwnedParameter);
 		if (name != null)
 			newOwnedParameter.setName(name);
@@ -1274,8 +1276,8 @@
 	@Override
 	public EList<Type> getRaisedExceptions() {
 		if (raisedExceptions == null) {
-			raisedExceptions = new EObjectResolvingEList<Type>(Type.class,
-				this, UMLPackage.OPERATION__RAISED_EXCEPTION);
+			raisedExceptions = new EObjectResolvingEList<Type>(Type.class, this,
+				UMLPackage.OPERATION__RAISED_EXCEPTION);
 		}
 		return raisedExceptions;
 	}
@@ -1345,16 +1347,13 @@
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
 			EList<ParameterableElement> result = (EList<ParameterableElement>) cache
-				.get(
-					this,
+				.get(this,
 					UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS,
-						result = TemplateableElementOperations
-							.parameterableElements(this));
+				cache.put(this,
+					UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS,
+					result = TemplateableElementOperations
+						.parameterableElements(this));
 			}
 			return result;
 		}
@@ -1508,10 +1507,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.OPERATION__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.OPERATION__TEMPLATE_BINDING :
@@ -1520,8 +1519,9 @@
 			case UMLPackage.OPERATION__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.OPERATION__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.OPERATION__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -1552,28 +1552,28 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.OPERATION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPERATION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPERATION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.OPERATION__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPERATION__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPERATION__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPERATION__METHOD :
 				return ((InternalEList<?>) getMethods()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.OPERATION__OWNED_PARAMETER :
-				return ((InternalEList<?>) getOwnedParameters()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedParameters())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPERATION__OWNED_PARAMETER_SET :
 				return ((InternalEList<?>) getOwnedParameterSets())
 					.basicRemove(otherEnd, msgs);
@@ -1582,8 +1582,8 @@
 			case UMLPackage.OPERATION__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.OPERATION__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPERATION__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.OPERATION__CLASS :
@@ -1614,10 +1614,9 @@
 					UMLPackage.CLASS__OWNED_OPERATION,
 					org.eclipse.uml2.uml.Class.class, msgs);
 			case UMLPackage.OPERATION__DATATYPE :
-				return eInternalContainer()
-					.eInverseRemove(this,
-						UMLPackage.DATA_TYPE__OWNED_OPERATION, DataType.class,
-						msgs);
+				return eInternalContainer().eInverseRemove(this,
+					UMLPackage.DATA_TYPE__OWNED_OPERATION, DataType.class,
+					msgs);
 			case UMLPackage.OPERATION__INTERFACE :
 				return eInternalContainer().eInverseRemove(this,
 					UMLPackage.INTERFACE__OWNED_OPERATION, Interface.class,
@@ -1759,13 +1758,13 @@
 		switch (featureID) {
 			case UMLPackage.OPERATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.OPERATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.OPERATION__NAME :
 				setName((String) newValue);
@@ -1778,18 +1777,18 @@
 				return;
 			case UMLPackage.OPERATION__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.OPERATION__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.OPERATION__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.OPERATION__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -1809,18 +1808,18 @@
 				return;
 			case UMLPackage.OPERATION__OWNED_PARAMETER :
 				getOwnedParameters().clear();
-				getOwnedParameters().addAll(
-					(Collection<? extends Parameter>) newValue);
+				getOwnedParameters()
+					.addAll((Collection<? extends Parameter>) newValue);
 				return;
 			case UMLPackage.OPERATION__OWNED_PARAMETER_SET :
 				getOwnedParameterSets().clear();
-				getOwnedParameterSets().addAll(
-					(Collection<? extends ParameterSet>) newValue);
+				getOwnedParameterSets()
+					.addAll((Collection<? extends ParameterSet>) newValue);
 				return;
 			case UMLPackage.OPERATION__RAISED_EXCEPTION :
 				getRaisedExceptions().clear();
-				getRaisedExceptions().addAll(
-					(Collection<? extends Type>) newValue);
+				getRaisedExceptions()
+					.addAll((Collection<? extends Type>) newValue);
 				return;
 			case UMLPackage.OPERATION__OWNING_TEMPLATE_PARAMETER :
 				setOwningTemplateParameter((TemplateParameter) newValue);
@@ -1830,8 +1829,8 @@
 				return;
 			case UMLPackage.OPERATION__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.OPERATION__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
@@ -1853,18 +1852,18 @@
 				return;
 			case UMLPackage.OPERATION__POSTCONDITION :
 				getPostconditions().clear();
-				getPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.OPERATION__PRECONDITION :
 				getPreconditions().clear();
-				getPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.OPERATION__REDEFINED_OPERATION :
 				getRedefinedOperations().clear();
-				getRedefinedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getRedefinedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -2019,9 +2018,11 @@
 			case UMLPackage.OPERATION__IS_STATIC :
 				return ((eFlags & IS_STATIC_EFLAG) != 0) != IS_STATIC_EDEFAULT;
 			case UMLPackage.OPERATION__CONCURRENCY :
-				return (eFlags & CONCURRENCY_EFLAG) != CONCURRENCY_EFLAG_DEFAULT;
+				return (eFlags
+					& CONCURRENCY_EFLAG) != CONCURRENCY_EFLAG_DEFAULT;
 			case UMLPackage.OPERATION__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.OPERATION__METHOD :
 				return methods != null && !methods.isEmpty();
 			case UMLPackage.OPERATION__OWNED_PARAMETER :
@@ -2076,7 +2077,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == ParameterableElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.OPERATION__OWNING_TEMPLATE_PARAMETER :
@@ -2106,7 +2108,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == ParameterableElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER :
@@ -2217,7 +2220,8 @@
 			case UMLPackage.OPERATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.OPERATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OPERATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.OPERATION___GET_STEREOTYPE_APPLICATIONS :
@@ -2225,7 +2229,8 @@
 			case UMLPackage.OPERATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.OPERATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OPERATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -2314,13 +2319,13 @@
 			case UMLPackage.OPERATION___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.OPERATION___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.OPERATION___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.OPERATION___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.OPERATION___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.OPERATION___MEMBERS_ARE_DISTINGUISHABLE :
@@ -2340,8 +2345,8 @@
 			case UMLPackage.OPERATION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.OPERATION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.OPERATION___VALIDATE_ABSTRACT_NO_METHOD__DIAGNOSTICCHAIN_MAP :
 				return validateAbstractNoMethod(
 					(DiagnosticChain) arguments.get(0),
@@ -2354,7 +2359,8 @@
 			case UMLPackage.OPERATION___OUTPUT_PARAMETERS :
 				return outputParameters();
 			case UMLPackage.OPERATION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.OPERATION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.OPERATION___IS_TEMPLATE :
@@ -2578,7 +2584,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{UMLPackage.OPERATION__REDEFINED_OPERATION};
+	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{
+		UMLPackage.OPERATION__REDEFINED_OPERATION};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getOwnedRules() <em>Owned Rule</em>}' containment reference list.
@@ -2590,7 +2597,8 @@
 	 */
 	protected static final int[] OWNED_RULE_ESUBSETS = new int[]{
 		UMLPackage.OPERATION__BODY_CONDITION,
-		UMLPackage.OPERATION__POSTCONDITION, UMLPackage.OPERATION__PRECONDITION};
+		UMLPackage.OPERATION__POSTCONDITION,
+		UMLPackage.OPERATION__PRECONDITION};
 
 	/**
 	 * The array of superset feature identifiers for the '{@link #getPostconditions() <em>Postcondition</em>}' reference list.
@@ -2600,7 +2608,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] POSTCONDITION_ESUPERSETS = new int[]{UMLPackage.OPERATION__OWNED_RULE};
+	protected static final int[] POSTCONDITION_ESUPERSETS = new int[]{
+		UMLPackage.OPERATION__OWNED_RULE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2662,7 +2671,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] PRECONDITION_ESUPERSETS = new int[]{UMLPackage.OPERATION__OWNED_RULE};
+	protected static final int[] PRECONDITION_ESUPERSETS = new int[]{
+		UMLPackage.OPERATION__OWNED_RULE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationTemplateParameterImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationTemplateParameterImpl.java
index 7b108ab..39a1b90 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationTemplateParameterImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OperationTemplateParameterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -82,12 +82,11 @@
 	public ParameterableElement getParameteredElement() {
 		if (parameteredElement != null && parameteredElement.eIsProxy()) {
 			InternalEObject oldParameteredElement = (InternalEObject) parameteredElement;
-			parameteredElement = (ParameterableElement) eResolveProxy(oldParameteredElement);
+			parameteredElement = (ParameterableElement) eResolveProxy(
+				oldParameteredElement);
 			if (parameteredElement != oldParameteredElement) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.OPERATION_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
 						oldParameteredElement, parameteredElement));
 			}
@@ -111,7 +110,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetParameteredElementGen(
-			ParameterableElement newParameteredElement, NotificationChain msgs) {
+			ParameterableElement newParameteredElement,
+			NotificationChain msgs) {
 		if (newParameteredElement != null
 			&& !(newParameteredElement instanceof Operation)) {
 			throw new IllegalArgumentException(
@@ -134,7 +134,8 @@
 
 	@Override
 	public NotificationChain basicSetParameteredElement(
-			ParameterableElement newParameteredElement, NotificationChain msgs) {
+			ParameterableElement newParameteredElement,
+			NotificationChain msgs) {
 		msgs = basicSetParameteredElementGen(newParameteredElement, msgs);
 
 		Resource.Internal eInternalResource = eInternalResource();
@@ -157,7 +158,8 @@
 	 * @generated
 	 */
 	@Override
-	public void setParameteredElement(ParameterableElement newParameteredElement) {
+	public void setParameteredElement(
+			ParameterableElement newParameteredElement) {
 		if (newParameteredElement != null
 			&& !(newParameteredElement instanceof Operation)) {
 			throw new IllegalArgumentException(
@@ -218,8 +220,7 @@
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT :
 				if (parameteredElement != null)
 					msgs = ((InternalEObject) parameteredElement)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							UMLPackage.PARAMETERABLE_ELEMENT__TEMPLATE_PARAMETER,
 							ParameterableElement.class, msgs);
 				return basicSetParameteredElement(
@@ -231,8 +232,7 @@
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT :
 				if (ownedParameteredElement != null)
 					msgs = ((InternalEObject) ownedParameteredElement)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							EOPPOSITE_FEATURE_BASE
 								- UMLPackage.OPERATION_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 							null, msgs);
@@ -252,11 +252,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER__OWNED_DEFAULT :
 				return basicSetOwnedDefault(null, msgs);
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT :
@@ -322,13 +322,13 @@
 		switch (featureID) {
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER__DEFAULT :
 				setDefault((ParameterableElement) newValue);
@@ -469,7 +469,8 @@
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER___GET_STEREOTYPE_APPLICATIONS :
@@ -477,7 +478,8 @@
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OutputPinImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OutputPinImpl.java
index b1fa732..8d20899 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OutputPinImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/OutputPinImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -129,7 +129,8 @@
 			case UMLPackage.OUTPUT_PIN___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.OUTPUT_PIN___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OUTPUT_PIN___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.OUTPUT_PIN___GET_STEREOTYPE_APPLICATIONS :
@@ -137,7 +138,8 @@
 			case UMLPackage.OUTPUT_PIN___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.OUTPUT_PIN___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.OUTPUT_PIN___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -214,8 +216,8 @@
 			case UMLPackage.OUTPUT_PIN___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.OUTPUT_PIN___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.OUTPUT_PIN___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.OUTPUT_PIN___VALIDATE_INPUT_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP :
@@ -261,8 +263,8 @@
 			case UMLPackage.OUTPUT_PIN___COMPATIBLE_WITH__MULTIPLICITYELEMENT :
 				return compatibleWith((MultiplicityElement) arguments.get(0));
 			case UMLPackage.OUTPUT_PIN___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT :
-				return includesMultiplicity((MultiplicityElement) arguments
-					.get(0));
+				return includesMultiplicity(
+					(MultiplicityElement) arguments.get(0));
 			case UMLPackage.OUTPUT_PIN___IS__INT_INT :
 				return is((Integer) arguments.get(0),
 					(Integer) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImpl.java
index d22ebe3..1513a02 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 454400, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 454400, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -225,7 +225,8 @@
 	public TemplateParameter getTemplateParameter() {
 		if (templateParameter != null && templateParameter.eIsProxy()) {
 			InternalEObject oldTemplateParameter = (InternalEObject) templateParameter;
-			templateParameter = (TemplateParameter) eResolveProxy(oldTemplateParameter);
+			templateParameter = (TemplateParameter) eResolveProxy(
+				oldTemplateParameter);
 			if (templateParameter != oldTemplateParameter) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -327,7 +328,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetOwningTemplateParameter(
-			TemplateParameter newOwningTemplateParameter, NotificationChain msgs) {
+			TemplateParameter newOwningTemplateParameter,
+			NotificationChain msgs) {
 		msgs = eBasicSetContainer((InternalEObject) newOwningTemplateParameter,
 			UMLPackage.PACKAGE__OWNING_TEMPLATE_PARAMETER, msgs);
 		Resource.Internal eInternalResource = eInternalResource();
@@ -349,7 +351,8 @@
 	public void setOwningTemplateParameter(
 			TemplateParameter newOwningTemplateParameter) {
 		if (newOwningTemplateParameter != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PACKAGE__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PACKAGE__OWNING_TEMPLATE_PARAMETER
+				&& newOwningTemplateParameter != null)) {
 			if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -358,8 +361,7 @@
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newOwningTemplateParameter != null)
 				msgs = ((InternalEObject) newOwningTemplateParameter)
-					.eInverseAdd(
-						this,
+					.eInverseAdd(this,
 						UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 						TemplateParameter.class, msgs);
 			msgs = basicSetOwningTemplateParameter(newOwningTemplateParameter,
@@ -379,7 +381,8 @@
 	 */
 	@Override
 	public VisibilityKind getVisibility() {
-		return VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		return VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 	}
 
 	/**
@@ -389,7 +392,8 @@
 	 */
 	@Override
 	public void setVisibility(VisibilityKind newVisibility) {
-		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 		if (newVisibility == null)
 			newVisibility = VISIBILITY_EDEFAULT;
 		eFlags = eFlags & ~VISIBILITY_EFLAG
@@ -409,7 +413,8 @@
 	 */
 	@Override
 	public void unsetVisibility() {
-		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 		boolean oldVisibilityESet = (eFlags & VISIBILITY_ESETFLAG) != 0;
 		eFlags = eFlags & ~VISIBILITY_EFLAG | VISIBILITY_EFLAG_DEFAULT;
 		eFlags &= ~VISIBILITY_ESETFLAG;
@@ -440,8 +445,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -476,7 +481,8 @@
 	 * @generated
 	 */
 	public TemplateBinding createTemplateBinding(TemplateSignature signature) {
-		TemplateBinding newTemplateBinding = (TemplateBinding) create(UMLPackage.Literals.TEMPLATE_BINDING);
+		TemplateBinding newTemplateBinding = (TemplateBinding) create(
+			UMLPackage.Literals.TEMPLATE_BINDING);
 		getTemplateBindings().add(newTemplateBinding);
 		if (signature != null)
 			newTemplateBinding.setSignature(signature);
@@ -543,9 +549,11 @@
 	 * @generated
 	 */
 	public TemplateSignature getOwnedTemplateSignature() {
-		if (ownedTemplateSignature != null && ownedTemplateSignature.eIsProxy()) {
+		if (ownedTemplateSignature != null
+			&& ownedTemplateSignature.eIsProxy()) {
 			InternalEObject oldOwnedTemplateSignature = (InternalEObject) ownedTemplateSignature;
-			ownedTemplateSignature = (TemplateSignature) eResolveProxy(oldOwnedTemplateSignature);
+			ownedTemplateSignature = (TemplateSignature) eResolveProxy(
+				oldOwnedTemplateSignature);
 			if (ownedTemplateSignature != oldOwnedTemplateSignature) {
 				InternalEObject newOwnedTemplateSignature = (InternalEObject) ownedTemplateSignature;
 				NotificationChain msgs = oldOwnedTemplateSignature
@@ -583,7 +591,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetOwnedTemplateSignature(
-			TemplateSignature newOwnedTemplateSignature, NotificationChain msgs) {
+			TemplateSignature newOwnedTemplateSignature,
+			NotificationChain msgs) {
 		TemplateSignature oldOwnedTemplateSignature = ownedTemplateSignature;
 		ownedTemplateSignature = newOwnedTemplateSignature;
 		if (eNotificationRequired()) {
@@ -632,7 +641,8 @@
 	 * @generated
 	 */
 	public TemplateSignature createOwnedTemplateSignature(EClass eClass) {
-		TemplateSignature newOwnedTemplateSignature = (TemplateSignature) create(eClass);
+		TemplateSignature newOwnedTemplateSignature = (TemplateSignature) create(
+			eClass);
 		setOwnedTemplateSignature(newOwnedTemplateSignature);
 		return newOwnedTemplateSignature;
 	}
@@ -643,7 +653,8 @@
 	 * @generated
 	 */
 	public TemplateSignature createOwnedTemplateSignature() {
-		return createOwnedTemplateSignature(UMLPackage.Literals.TEMPLATE_SIGNATURE);
+		return createOwnedTemplateSignature(
+			UMLPackage.Literals.TEMPLATE_SIGNATURE);
 	}
 
 	/**
@@ -660,15 +671,12 @@
 			EList<NamedElement> ownedMembers = (EList<NamedElement>) cache.get(
 				eResource, this, UMLPackage.Literals.NAMESPACE__OWNED_MEMBER);
 			if (ownedMembers == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.NAMESPACE__OWNED_MEMBER,
-						ownedMembers = new DerivedUnionEObjectEList<NamedElement>(
-							NamedElement.class, this,
-							UMLPackage.PACKAGE__OWNED_MEMBER,
-							OWNED_MEMBER_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.NAMESPACE__OWNED_MEMBER,
+					ownedMembers = new DerivedUnionEObjectEList<NamedElement>(
+						NamedElement.class, this,
+						UMLPackage.PACKAGE__OWNED_MEMBER,
+						OWNED_MEMBER_ESUBSETS));
 			}
 			return ownedMembers;
 		}
@@ -695,8 +703,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PackageableElement createPackagedElement(String name, EClass eClass) {
-		PackageableElement newPackagedElement = (PackageableElement) create(eClass);
+	public PackageableElement createPackagedElement(String name,
+			EClass eClass) {
+		PackageableElement newPackagedElement = (PackageableElement) create(
+			eClass);
 		getPackagedElements().add(newPackagedElement);
 		if (name != null)
 			newPackagedElement.setName(name);
@@ -776,7 +786,8 @@
 	 */
 	public PackageMerge createPackageMerge(
 			org.eclipse.uml2.uml.Package mergedPackage) {
-		PackageMerge newPackageMerge = (PackageMerge) create(UMLPackage.Literals.PACKAGE_MERGE);
+		PackageMerge newPackageMerge = (PackageMerge) create(
+			UMLPackage.Literals.PACKAGE_MERGE);
 		getPackageMerges().add(newPackageMerge);
 		if (mergedPackage != null)
 			newPackageMerge.setMergedPackage(mergedPackage);
@@ -799,7 +810,8 @@
 	 * @generated
 	 */
 	public PackageMerge getPackageMerge(
-			org.eclipse.uml2.uml.Package mergedPackage, boolean createOnDemand) {
+			org.eclipse.uml2.uml.Package mergedPackage,
+			boolean createOnDemand) {
 		packageMergeLoop : for (PackageMerge packageMerge : getPackageMerges()) {
 			if (mergedPackage != null
 				&& !mergedPackage.equals(packageMerge.getMergedPackage()))
@@ -826,8 +838,8 @@
 			if (ownedTypes == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.PACKAGE__OWNED_TYPE,
-					ownedTypes = new DerivedSubsetEObjectEList<Type>(
-						Type.class, this, UMLPackage.PACKAGE__OWNED_TYPE,
+					ownedTypes = new DerivedSubsetEObjectEList<Type>(Type.class,
+						this, UMLPackage.PACKAGE__OWNED_TYPE,
 						OWNED_TYPE_ESUPERSETS));
 			}
 			return ownedTypes;
@@ -850,15 +862,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.PACKAGE__NESTED_PACKAGE);
 			if (nestedPackages == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.PACKAGE__NESTED_PACKAGE,
-						nestedPackages = new DerivedSubsetEObjectEList<org.eclipse.uml2.uml.Package>(
-							org.eclipse.uml2.uml.Package.class, this,
-							UMLPackage.PACKAGE__NESTED_PACKAGE,
-							NESTED_PACKAGE_ESUPERSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.PACKAGE__NESTED_PACKAGE,
+					nestedPackages = new DerivedSubsetEObjectEList<org.eclipse.uml2.uml.Package>(
+						org.eclipse.uml2.uml.Package.class, this,
+						UMLPackage.PACKAGE__NESTED_PACKAGE,
+						NESTED_PACKAGE_ESUPERSETS));
 			}
 			return nestedPackages;
 		}
@@ -875,7 +884,8 @@
 	public org.eclipse.uml2.uml.Package getNestingPackage() {
 		org.eclipse.uml2.uml.Package nestingPackage = basicGetNestingPackage();
 		return nestingPackage != null && nestingPackage.eIsProxy()
-			? (org.eclipse.uml2.uml.Package) eResolveProxy((InternalEObject) nestingPackage)
+			? (org.eclipse.uml2.uml.Package) eResolveProxy(
+				(InternalEObject) nestingPackage)
 			: nestingPackage;
 	}
 
@@ -896,7 +906,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
-	public void setNestingPackage(org.eclipse.uml2.uml.Package newNestingPackage) {
+	public void setNestingPackage(
+			org.eclipse.uml2.uml.Package newNestingPackage) {
 		if (newNestingPackage != eInternalContainer()) {
 			if (EcoreUtil.isAncestor(this, newNestingPackage))
 				throw new IllegalArgumentException(
@@ -909,7 +920,8 @@
 					.getNestedPackages()).basicAdd(this, msgs);
 			msgs = eBasicSetContainer((InternalEObject) newNestingPackage,
 				InternalEObject.EOPPOSITE_FEATURE_BASE
-					- UMLPackage.PACKAGE__PACKAGED_ELEMENT, msgs);
+					- UMLPackage.PACKAGE__PACKAGED_ELEMENT,
+				msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
@@ -931,21 +943,17 @@
 			EList<Stereotype> ownedStereotypes = (EList<Stereotype>) cache.get(
 				eResource, this, UMLPackage.Literals.PACKAGE__OWNED_STEREOTYPE);
 			if (ownedStereotypes == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.PACKAGE__OWNED_STEREOTYPE,
-						ownedStereotypes = new DerivedSubsetEObjectEList<Stereotype>(
-							Stereotype.class, this,
-							UMLPackage.PACKAGE__OWNED_STEREOTYPE,
-							OWNED_STEREOTYPE_ESUPERSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.PACKAGE__OWNED_STEREOTYPE,
+					ownedStereotypes = new DerivedSubsetEObjectEList<Stereotype>(
+						Stereotype.class, this,
+						UMLPackage.PACKAGE__OWNED_STEREOTYPE,
+						OWNED_STEREOTYPE_ESUPERSETS));
 			}
 			return ownedStereotypes;
 		}
-		return new DerivedSubsetEObjectEList<Stereotype>(Stereotype.class,
-			this, UMLPackage.PACKAGE__OWNED_STEREOTYPE,
-			OWNED_STEREOTYPE_ESUPERSETS);
+		return new DerivedSubsetEObjectEList<Stereotype>(Stereotype.class, this,
+			UMLPackage.PACKAGE__OWNED_STEREOTYPE, OWNED_STEREOTYPE_ESUPERSETS);
 	}
 
 	/**
@@ -969,7 +977,8 @@
 	 * @generated
 	 */
 	public ProfileApplication createProfileApplication() {
-		ProfileApplication newProfileApplication = (ProfileApplication) create(UMLPackage.Literals.PROFILE_APPLICATION);
+		ProfileApplication newProfileApplication = (ProfileApplication) create(
+			UMLPackage.Literals.PROFILE_APPLICATION);
 		getProfileApplications().add(newProfileApplication);
 		return newProfileApplication;
 	}
@@ -997,10 +1006,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateNamespaceNeedsVisibility(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return PackageableElementOperations.validateNamespaceNeedsVisibility(
-			this, diagnostics, context);
+	public boolean validateNamespaceNeedsVisibility(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return PackageableElementOperations
+			.validateNamespaceNeedsVisibility(this, diagnostics, context);
 	}
 
 	/**
@@ -1013,16 +1022,13 @@
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
 			EList<ParameterableElement> result = (EList<ParameterableElement>) cache
-				.get(
-					this,
+				.get(this,
 					UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS,
-						result = TemplateableElementOperations
-							.parameterableElements(this));
+				cache.put(this,
+					UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS,
+					result = TemplateableElementOperations
+						.parameterableElements(this));
 			}
 			return result;
 		}
@@ -1118,6 +1124,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EList<EObject> applyProfiles(EList<Profile> profiles) {
+		return PackageOperations.applyProfiles(this, profiles);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EList<Stereotype> allApplicableStereotypes() {
 		CacheAdapter cache = getCacheAdapter();
 		if (cache != null) {
@@ -1179,8 +1194,8 @@
 	 * @generated
 	 */
 	public Profile getAppliedProfile(String qualifiedName, boolean recurse) {
-		return PackageOperations
-			.getAppliedProfile(this, qualifiedName, recurse);
+		return PackageOperations.getAppliedProfile(this, qualifiedName,
+			recurse);
 	}
 
 	/**
@@ -1331,10 +1346,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.PACKAGE__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.PACKAGE__TEMPLATE_BINDING :
@@ -1343,8 +1358,9 @@
 			case UMLPackage.PACKAGE__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.PACKAGE__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.PACKAGE__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -1368,37 +1384,37 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PACKAGE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.PACKAGE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGE__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.PACKAGE__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.PACKAGE__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGE__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.PACKAGE__PACKAGE_MERGE :
-				return ((InternalEList<?>) getPackageMerges()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageMerges())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGE__PACKAGED_ELEMENT :
-				return ((InternalEList<?>) getPackagedElements()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackagedElements())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGE__PROFILE_APPLICATION :
 				return ((InternalEList<?>) getProfileApplications())
 					.basicRemove(otherEnd, msgs);
@@ -1516,13 +1532,13 @@
 		switch (featureID) {
 			case UMLPackage.PACKAGE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PACKAGE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PACKAGE__NAME :
 				setName((String) newValue);
@@ -1535,18 +1551,18 @@
 				return;
 			case UMLPackage.PACKAGE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.PACKAGE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.PACKAGE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.PACKAGE__OWNING_TEMPLATE_PARAMETER :
 				setOwningTemplateParameter((TemplateParameter) newValue);
@@ -1556,8 +1572,8 @@
 				return;
 			case UMLPackage.PACKAGE__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.PACKAGE__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
@@ -1567,9 +1583,8 @@
 				return;
 			case UMLPackage.PACKAGE__NESTED_PACKAGE :
 				getNestedPackages().clear();
-				getNestedPackages()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Package>) newValue);
+				getNestedPackages().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Package>) newValue);
 				return;
 			case UMLPackage.PACKAGE__NESTING_PACKAGE :
 				setNestingPackage((org.eclipse.uml2.uml.Package) newValue);
@@ -1580,8 +1595,8 @@
 				return;
 			case UMLPackage.PACKAGE__PACKAGE_MERGE :
 				getPackageMerges().clear();
-				getPackageMerges().addAll(
-					(Collection<? extends PackageMerge>) newValue);
+				getPackageMerges()
+					.addAll((Collection<? extends PackageMerge>) newValue);
 				return;
 			case UMLPackage.PACKAGE__PACKAGED_ELEMENT :
 				getPackagedElements().clear();
@@ -1745,7 +1760,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == ParameterableElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.PACKAGE__OWNING_TEMPLATE_PARAMETER :
@@ -1781,7 +1797,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == ParameterableElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER :
@@ -1906,7 +1923,8 @@
 			case UMLPackage.PACKAGE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PACKAGE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PACKAGE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PACKAGE___GET_STEREOTYPE_APPLICATIONS :
@@ -1914,7 +1932,8 @@
 			case UMLPackage.PACKAGE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PACKAGE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PACKAGE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -2003,19 +2022,20 @@
 			case UMLPackage.PACKAGE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.PACKAGE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.PACKAGE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.PACKAGE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.PACKAGE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.PACKAGE___MEMBERS_ARE_DISTINGUISHABLE :
 				return membersAreDistinguishable();
 			case UMLPackage.PACKAGE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.PACKAGE___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.PACKAGE___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -2066,6 +2086,8 @@
 				return isProfileApplied((Profile) arguments.get(0));
 			case UMLPackage.PACKAGE___UNAPPLY_PROFILE__PROFILE :
 				return unapplyProfile((Profile) arguments.get(0));
+			case UMLPackage.PACKAGE___APPLY_PROFILES__ELIST :
+				return applyProfiles((EList<Profile>) arguments.get(0));
 			case UMLPackage.PACKAGE___ALL_APPLICABLE_STEREOTYPES :
 				return allApplicableStereotypes();
 			case UMLPackage.PACKAGE___CONTAINING_PROFILE :
@@ -2186,7 +2208,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] NESTED_PACKAGE_ESUPERSETS = new int[]{UMLPackage.PACKAGE__PACKAGED_ELEMENT};
+	protected static final int[] NESTED_PACKAGE_ESUPERSETS = new int[]{
+		UMLPackage.PACKAGE__PACKAGED_ELEMENT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2195,7 +2218,8 @@
 	 */
 	public org.eclipse.uml2.uml.Package createNestedPackage(String name,
 			EClass eClass) {
-		org.eclipse.uml2.uml.Package newNestedPackage = (org.eclipse.uml2.uml.Package) create(eClass);
+		org.eclipse.uml2.uml.Package newNestedPackage = (org.eclipse.uml2.uml.Package) create(
+			eClass);
 		getNestedPackages().add(newNestedPackage);
 		if (name != null)
 			newNestedPackage.setName(name);
@@ -2249,7 +2273,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_STEREOTYPE_ESUPERSETS = new int[]{UMLPackage.PACKAGE__PACKAGED_ELEMENT};
+	protected static final int[] OWNED_STEREOTYPE_ESUPERSETS = new int[]{
+		UMLPackage.PACKAGE__PACKAGED_ELEMENT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2284,7 +2309,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_TYPE_ESUPERSETS = new int[]{UMLPackage.PACKAGE__PACKAGED_ELEMENT};
+	protected static final int[] OWNED_TYPE_ESUPERSETS = new int[]{
+		UMLPackage.PACKAGE__PACKAGED_ELEMENT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImportImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImportImpl.java
index 23906aa..51779ae 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImportImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageImportImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -160,8 +160,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> targets = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
+			EList<Element> targets = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
 			if (targets == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET,
@@ -186,8 +186,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> sources = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
+			EList<Element> sources = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
 			if (sources == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE,
@@ -207,7 +207,8 @@
 	 * @generated
 	 */
 	public VisibilityKind getVisibility() {
-		return VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		return VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 	}
 
 	/**
@@ -216,7 +217,8 @@
 	 * @generated
 	 */
 	public void setVisibility(VisibilityKind newVisibility) {
-		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 		if (newVisibility == null)
 			newVisibility = VISIBILITY_EDEFAULT;
 		eFlags = eFlags & ~VISIBILITY_EFLAG
@@ -235,7 +237,8 @@
 	public org.eclipse.uml2.uml.Package getImportedPackage() {
 		if (importedPackage != null && importedPackage.eIsProxy()) {
 			InternalEObject oldImportedPackage = (InternalEObject) importedPackage;
-			importedPackage = (org.eclipse.uml2.uml.Package) eResolveProxy(oldImportedPackage);
+			importedPackage = (org.eclipse.uml2.uml.Package) eResolveProxy(
+				oldImportedPackage);
 			if (importedPackage != oldImportedPackage) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -266,8 +269,8 @@
 		importedPackage = newImportedPackage;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.PACKAGE_IMPORT__IMPORTED_PACKAGE,
-				oldImportedPackage, importedPackage));
+				UMLPackage.PACKAGE_IMPORT__IMPORTED_PACKAGE, oldImportedPackage,
+				importedPackage));
 	}
 
 	/**
@@ -311,7 +314,8 @@
 	 */
 	public void setImportingNamespace(Namespace newImportingNamespace) {
 		if (newImportingNamespace != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PACKAGE_IMPORT__IMPORTING_NAMESPACE && newImportingNamespace != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PACKAGE_IMPORT__IMPORTING_NAMESPACE
+				&& newImportingNamespace != null)) {
 			if (EcoreUtil.isAncestor(this, newImportingNamespace))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -320,8 +324,8 @@
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newImportingNamespace != null)
 				msgs = ((InternalEObject) newImportingNamespace).eInverseAdd(
-					this, UMLPackage.NAMESPACE__PACKAGE_IMPORT,
-					Namespace.class, msgs);
+					this, UMLPackage.NAMESPACE__PACKAGE_IMPORT, Namespace.class,
+					msgs);
 			msgs = basicSetImportingNamespace(newImportingNamespace, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -373,11 +377,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PACKAGE_IMPORT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGE_IMPORT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGE_IMPORT__IMPORTING_NAMESPACE :
 				return basicSetImportingNamespace(null, msgs);
 		}
@@ -394,9 +398,9 @@
 			NotificationChain msgs) {
 		switch (eContainerFeatureID()) {
 			case UMLPackage.PACKAGE_IMPORT__IMPORTING_NAMESPACE :
-				return eInternalContainer()
-					.eInverseRemove(this, UMLPackage.NAMESPACE__PACKAGE_IMPORT,
-						Namespace.class, msgs);
+				return eInternalContainer().eInverseRemove(this,
+					UMLPackage.NAMESPACE__PACKAGE_IMPORT, Namespace.class,
+					msgs);
 		}
 		return eDynamicBasicRemoveFromContainer(msgs);
 	}
@@ -450,13 +454,13 @@
 		switch (featureID) {
 			case UMLPackage.PACKAGE_IMPORT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PACKAGE_IMPORT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PACKAGE_IMPORT__IMPORTED_PACKAGE :
 				setImportedPackage((org.eclipse.uml2.uml.Package) newValue);
@@ -587,7 +591,8 @@
 			case UMLPackage.PACKAGE_IMPORT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PACKAGE_IMPORT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PACKAGE_IMPORT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PACKAGE_IMPORT___GET_STEREOTYPE_APPLICATIONS :
@@ -595,7 +600,8 @@
 			case UMLPackage.PACKAGE_IMPORT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PACKAGE_IMPORT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PACKAGE_IMPORT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -642,8 +648,8 @@
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (visibility: "); //$NON-NLS-1$
-		result
-			.append(VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET]);
+		result.append(VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET]);
 		result.append(')');
 		return result.toString();
 	}
@@ -656,7 +662,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] TARGET_ESUBSETS = new int[]{UMLPackage.PACKAGE_IMPORT__IMPORTED_PACKAGE};
+	protected static final int[] TARGET_ESUBSETS = new int[]{
+		UMLPackage.PACKAGE_IMPORT__IMPORTED_PACKAGE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -677,7 +684,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SOURCE_ESUBSETS = new int[]{UMLPackage.PACKAGE_IMPORT__IMPORTING_NAMESPACE};
+	protected static final int[] SOURCE_ESUBSETS = new int[]{
+		UMLPackage.PACKAGE_IMPORT__IMPORTING_NAMESPACE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageMergeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageMergeImpl.java
index 45ab474..05619a7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageMergeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageMergeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -98,8 +98,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> targets = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
+			EList<Element> targets = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
 			if (targets == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET,
@@ -124,8 +124,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> sources = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
+			EList<Element> sources = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
 			if (sources == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE,
@@ -147,7 +147,8 @@
 	public org.eclipse.uml2.uml.Package getMergedPackage() {
 		if (mergedPackage != null && mergedPackage.eIsProxy()) {
 			InternalEObject oldMergedPackage = (InternalEObject) mergedPackage;
-			mergedPackage = (org.eclipse.uml2.uml.Package) eResolveProxy(oldMergedPackage);
+			mergedPackage = (org.eclipse.uml2.uml.Package) eResolveProxy(
+				oldMergedPackage);
 			if (mergedPackage != oldMergedPackage) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -172,7 +173,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setMergedPackage(org.eclipse.uml2.uml.Package newMergedPackage) {
+	public void setMergedPackage(
+			org.eclipse.uml2.uml.Package newMergedPackage) {
 		org.eclipse.uml2.uml.Package oldMergedPackage = mergedPackage;
 		mergedPackage = newMergedPackage;
 		if (eNotificationRequired())
@@ -224,7 +226,8 @@
 	public void setReceivingPackage(
 			org.eclipse.uml2.uml.Package newReceivingPackage) {
 		if (newReceivingPackage != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PACKAGE_MERGE__RECEIVING_PACKAGE && newReceivingPackage != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PACKAGE_MERGE__RECEIVING_PACKAGE
+				&& newReceivingPackage != null)) {
 			if (EcoreUtil.isAncestor(this, newReceivingPackage))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -232,8 +235,8 @@
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newReceivingPackage != null)
-				msgs = ((InternalEObject) newReceivingPackage).eInverseAdd(
-					this, UMLPackage.PACKAGE__PACKAGE_MERGE,
+				msgs = ((InternalEObject) newReceivingPackage).eInverseAdd(this,
+					UMLPackage.PACKAGE__PACKAGE_MERGE,
 					org.eclipse.uml2.uml.Package.class, msgs);
 			msgs = basicSetReceivingPackage(newReceivingPackage, msgs);
 			if (msgs != null)
@@ -276,11 +279,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PACKAGE_MERGE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGE_MERGE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGE_MERGE__RECEIVING_PACKAGE :
 				return basicSetReceivingPackage(null, msgs);
 		}
@@ -351,13 +354,13 @@
 		switch (featureID) {
 			case UMLPackage.PACKAGE_MERGE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PACKAGE_MERGE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PACKAGE_MERGE__MERGED_PACKAGE :
 				setMergedPackage((org.eclipse.uml2.uml.Package) newValue);
@@ -431,7 +434,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] TARGET_ESUBSETS = new int[]{UMLPackage.PACKAGE_MERGE__MERGED_PACKAGE};
+	protected static final int[] TARGET_ESUBSETS = new int[]{
+		UMLPackage.PACKAGE_MERGE__MERGED_PACKAGE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -452,7 +456,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SOURCE_ESUBSETS = new int[]{UMLPackage.PACKAGE_MERGE__RECEIVING_PACKAGE};
+	protected static final int[] SOURCE_ESUBSETS = new int[]{
+		UMLPackage.PACKAGE_MERGE__RECEIVING_PACKAGE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageableElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageableElementImpl.java
index 287f4ae..667811e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageableElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PackageableElementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 454400, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 454400, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -118,7 +118,8 @@
 	public TemplateParameter getTemplateParameter() {
 		if (templateParameter != null && templateParameter.eIsProxy()) {
 			InternalEObject oldTemplateParameter = (InternalEObject) templateParameter;
-			templateParameter = (TemplateParameter) eResolveProxy(oldTemplateParameter);
+			templateParameter = (TemplateParameter) eResolveProxy(
+				oldTemplateParameter);
 			if (templateParameter != oldTemplateParameter) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -221,7 +222,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetOwningTemplateParameter(
-			TemplateParameter newOwningTemplateParameter, NotificationChain msgs) {
+			TemplateParameter newOwningTemplateParameter,
+			NotificationChain msgs) {
 		msgs = eBasicSetContainer((InternalEObject) newOwningTemplateParameter,
 			UMLPackage.PACKAGEABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER, msgs);
 		Resource.Internal eInternalResource = eInternalResource();
@@ -243,7 +245,8 @@
 	public void setOwningTemplateParameter(
 			TemplateParameter newOwningTemplateParameter) {
 		if (newOwningTemplateParameter != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PACKAGEABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PACKAGEABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER
+				&& newOwningTemplateParameter != null)) {
 			if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -252,8 +255,7 @@
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newOwningTemplateParameter != null)
 				msgs = ((InternalEObject) newOwningTemplateParameter)
-					.eInverseAdd(
-						this,
+					.eInverseAdd(this,
 						UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 						TemplateParameter.class, msgs);
 			msgs = basicSetOwningTemplateParameter(newOwningTemplateParameter,
@@ -273,7 +275,8 @@
 	 */
 	@Override
 	public VisibilityKind getVisibility() {
-		return VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		return VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 	}
 
 	/**
@@ -283,7 +286,8 @@
 	 */
 	@Override
 	public void setVisibility(VisibilityKind newVisibility) {
-		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 		if (newVisibility == null)
 			newVisibility = VISIBILITY_EDEFAULT;
 		eFlags = eFlags & ~VISIBILITY_EFLAG
@@ -303,7 +307,8 @@
 	 */
 	@Override
 	public void unsetVisibility() {
-		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags & VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
+		VisibilityKind oldVisibility = VISIBILITY_EFLAG_VALUES[(eFlags
+			& VISIBILITY_EFLAG) >>> VISIBILITY_EFLAG_OFFSET];
 		boolean oldVisibilityESet = (eFlags & VISIBILITY_ESETFLAG) != 0;
 		eFlags = eFlags & ~VISIBILITY_EFLAG | VISIBILITY_EFLAG_DEFAULT;
 		eFlags &= ~VISIBILITY_ESETFLAG;
@@ -346,10 +351,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateNamespaceNeedsVisibility(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return PackageableElementOperations.validateNamespaceNeedsVisibility(
-			this, diagnostics, context);
+	public boolean validateNamespaceNeedsVisibility(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return PackageableElementOperations
+			.validateNamespaceNeedsVisibility(this, diagnostics, context);
 	}
 
 	/**
@@ -372,10 +377,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.PACKAGEABLE_ELEMENT__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 		}
@@ -392,11 +397,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PACKAGEABLE_ELEMENT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGEABLE_ELEMENT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PACKAGEABLE_ELEMENT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.PACKAGEABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER :
@@ -481,13 +486,13 @@
 		switch (featureID) {
 			case UMLPackage.PACKAGEABLE_ELEMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PACKAGEABLE_ELEMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PACKAGEABLE_ELEMENT__NAME :
 				setName((String) newValue);
@@ -585,7 +590,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == ParameterableElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.PACKAGEABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER :
@@ -605,7 +611,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == ParameterableElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER :
@@ -696,7 +703,8 @@
 			case UMLPackage.PACKAGEABLE_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PACKAGEABLE_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PACKAGEABLE_ELEMENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PACKAGEABLE_ELEMENT___GET_STEREOTYPE_APPLICATIONS :
@@ -704,7 +712,8 @@
 			case UMLPackage.PACKAGEABLE_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PACKAGEABLE_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PACKAGEABLE_ELEMENT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -767,7 +776,8 @@
 			case UMLPackage.PACKAGEABLE_ELEMENT___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.PACKAGEABLE_ELEMENT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.PACKAGEABLE_ELEMENT___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.PACKAGEABLE_ELEMENT___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -799,8 +809,8 @@
 	 */
 	@Override
 	public boolean isSetOwner() {
-		return super.isSetOwner()
-			|| eIsSet(UMLPackage.PACKAGEABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER);
+		return super.isSetOwner() || eIsSet(
+			UMLPackage.PACKAGEABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER);
 	}
 
 } //PackageableElementImpl
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterImpl.java
index aefaa2b..6647652 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -269,7 +269,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int EFFECT_EFLAG_DEFAULT = EFFECT_EDEFAULT.ordinal() << EFFECT_EFLAG_OFFSET;
+	protected static final int EFFECT_EFLAG_DEFAULT = EFFECT_EDEFAULT
+		.ordinal() << EFFECT_EFLAG_OFFSET;
 
 	/**
 	 * The array of enumeration values for '{@link ParameterEffectKind Parameter Effect Kind}'
@@ -381,8 +382,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -498,9 +499,11 @@
 					EOPPOSITE_FEATURE_BASE - UMLPackage.PARAMETER__UPPER_VALUE,
 					null, null);
 				if (newUpperValue.eInternalContainer() == null) {
-					msgs = newUpperValue.eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.PARAMETER__UPPER_VALUE, null, msgs);
+					msgs = newUpperValue
+						.eInverseAdd(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.PARAMETER__UPPER_VALUE,
+							null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -564,7 +567,8 @@
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.PARAMETER__UPPER_VALUE, newUpperValue, newUpperValue));
+				UMLPackage.PARAMETER__UPPER_VALUE, newUpperValue,
+				newUpperValue));
 	}
 
 	/**
@@ -625,9 +629,11 @@
 					EOPPOSITE_FEATURE_BASE - UMLPackage.PARAMETER__LOWER_VALUE,
 					null, null);
 				if (newLowerValue.eInternalContainer() == null) {
-					msgs = newLowerValue.eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.PARAMETER__LOWER_VALUE, null, msgs);
+					msgs = newLowerValue
+						.eInverseAdd(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.PARAMETER__LOWER_VALUE,
+							null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -691,7 +697,8 @@
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.PARAMETER__LOWER_VALUE, newLowerValue, newLowerValue));
+				UMLPackage.PARAMETER__LOWER_VALUE, newLowerValue,
+				newLowerValue));
 	}
 
 	/**
@@ -791,7 +798,8 @@
 					.getOwnedParameters()).basicAdd(this, msgs);
 			msgs = eBasicSetContainer((InternalEObject) newOperation,
 				InternalEObject.EOPPOSITE_FEATURE_BASE
-					- UMLPackage.OPERATION__OWNED_PARAMETER, msgs);
+					- UMLPackage.OPERATION__OWNED_PARAMETER,
+				msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
@@ -805,7 +813,8 @@
 	 * @generated
 	 */
 	public ParameterDirectionKind getDirection() {
-		return DIRECTION_EFLAG_VALUES[(eFlags & DIRECTION_EFLAG) >>> DIRECTION_EFLAG_OFFSET];
+		return DIRECTION_EFLAG_VALUES[(eFlags
+			& DIRECTION_EFLAG) >>> DIRECTION_EFLAG_OFFSET];
 	}
 
 	/**
@@ -814,7 +823,8 @@
 	 * @generated
 	 */
 	public void setDirection(ParameterDirectionKind newDirection) {
-		ParameterDirectionKind oldDirection = DIRECTION_EFLAG_VALUES[(eFlags & DIRECTION_EFLAG) >>> DIRECTION_EFLAG_OFFSET];
+		ParameterDirectionKind oldDirection = DIRECTION_EFLAG_VALUES[(eFlags
+			& DIRECTION_EFLAG) >>> DIRECTION_EFLAG_OFFSET];
 		if (newDirection == null)
 			newDirection = DIRECTION_EDEFAULT;
 		eFlags = eFlags & ~DIRECTION_EFLAG
@@ -873,11 +883,14 @@
 				InternalEObject newDefaultValue = (InternalEObject) defaultValue;
 				NotificationChain msgs = oldDefaultValue.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.PARAMETER__DEFAULT_VALUE, null, null);
+						- UMLPackage.PARAMETER__DEFAULT_VALUE,
+					null, null);
 				if (newDefaultValue.eInternalContainer() == null) {
-					msgs = newDefaultValue.eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.PARAMETER__DEFAULT_VALUE, null, msgs);
+					msgs = newDefaultValue
+						.eInverseAdd(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.PARAMETER__DEFAULT_VALUE,
+							null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -931,11 +944,13 @@
 			if (defaultValue != null)
 				msgs = ((InternalEObject) defaultValue).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.PARAMETER__DEFAULT_VALUE, null, msgs);
+						- UMLPackage.PARAMETER__DEFAULT_VALUE,
+					null, msgs);
 			if (newDefaultValue != null)
 				msgs = ((InternalEObject) newDefaultValue).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.PARAMETER__DEFAULT_VALUE, null, msgs);
+						- UMLPackage.PARAMETER__DEFAULT_VALUE,
+					null, msgs);
 			msgs = basicSetDefaultValue(newDefaultValue, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -952,7 +967,8 @@
 	 */
 	public ValueSpecification createDefaultValue(String name, Type type,
 			EClass eClass) {
-		ValueSpecification newDefaultValue = (ValueSpecification) create(eClass);
+		ValueSpecification newDefaultValue = (ValueSpecification) create(
+			eClass);
 		setDefaultValue(newDefaultValue);
 		if (name != null)
 			newDefaultValue.setName(name);
@@ -1018,7 +1034,8 @@
 	 * @generated
 	 */
 	public ParameterEffectKind getEffect() {
-		return EFFECT_EFLAG_VALUES[(eFlags & EFFECT_EFLAG) >>> EFFECT_EFLAG_OFFSET];
+		return EFFECT_EFLAG_VALUES[(eFlags
+			& EFFECT_EFLAG) >>> EFFECT_EFLAG_OFFSET];
 	}
 
 	/**
@@ -1027,7 +1044,8 @@
 	 * @generated
 	 */
 	public void setEffect(ParameterEffectKind newEffect) {
-		ParameterEffectKind oldEffect = EFFECT_EFLAG_VALUES[(eFlags & EFFECT_EFLAG) >>> EFFECT_EFLAG_OFFSET];
+		ParameterEffectKind oldEffect = EFFECT_EFLAG_VALUES[(eFlags
+			& EFFECT_EFLAG) >>> EFFECT_EFLAG_OFFSET];
 		if (newEffect == null)
 			newEffect = EFFECT_EDEFAULT;
 		eFlags = eFlags & ~EFFECT_EFLAG
@@ -1046,7 +1064,8 @@
 	 * @generated
 	 */
 	public void unsetEffect() {
-		ParameterEffectKind oldEffect = EFFECT_EFLAG_VALUES[(eFlags & EFFECT_EFLAG) >>> EFFECT_EFLAG_OFFSET];
+		ParameterEffectKind oldEffect = EFFECT_EFLAG_VALUES[(eFlags
+			& EFFECT_EFLAG) >>> EFFECT_EFLAG_OFFSET];
 		boolean oldEffectESet = (eFlags & EFFECT_ESETFLAG) != 0;
 		eFlags = eFlags & ~EFFECT_EFLAG | EFFECT_EFLAG_DEFAULT;
 		eFlags &= ~EFFECT_ESETFLAG;
@@ -1072,8 +1091,8 @@
 	 */
 	public boolean validateLowerGe0(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return MultiplicityElementOperations.validateLowerGe0(this,
-			diagnostics, context);
+		return MultiplicityElementOperations.validateLowerGe0(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -1095,7 +1114,8 @@
 	public boolean validateValueSpecificationNoSideEffects(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return MultiplicityElementOperations
-			.validateValueSpecificationNoSideEffects(this, diagnostics, context);
+			.validateValueSpecificationNoSideEffects(this, diagnostics,
+				context);
 	}
 
 	/**
@@ -1127,8 +1147,8 @@
 	 */
 	public boolean validateUpperIsUnlimitedNatural(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return MultiplicityElementOperations.validateUpperIsUnlimitedNatural(
-			this, diagnostics, context);
+		return MultiplicityElementOperations
+			.validateUpperIsUnlimitedNatural(this, diagnostics, context);
 	}
 
 	/**
@@ -1203,8 +1223,8 @@
 	 */
 	public boolean validateStreamAndException(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ParameterOperations.validateStreamAndException(this,
-			diagnostics, context);
+		return ParameterOperations.validateStreamAndException(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -1236,8 +1256,8 @@
 	 */
 	public boolean validateReentrantBehaviors(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ParameterOperations.validateReentrantBehaviors(this,
-			diagnostics, context);
+		return ParameterOperations.validateReentrantBehaviors(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -1324,10 +1344,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.PARAMETER__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.PARAMETER__PARAMETER_SET :
@@ -1347,11 +1367,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PARAMETER__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PARAMETER__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PARAMETER__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.PARAMETER__OWNING_TEMPLATE_PARAMETER :
@@ -1365,8 +1385,8 @@
 			case UMLPackage.PARAMETER__DEFAULT_VALUE :
 				return basicSetDefaultValue(null, msgs);
 			case UMLPackage.PARAMETER__PARAMETER_SET :
-				return ((InternalEList<?>) getParameterSets()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getParameterSets())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -1470,13 +1490,13 @@
 		switch (featureID) {
 			case UMLPackage.PARAMETER__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PARAMETER__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PARAMETER__NAME :
 				setName((String) newValue);
@@ -1534,8 +1554,8 @@
 				return;
 			case UMLPackage.PARAMETER__PARAMETER_SET :
 				getParameterSets().clear();
-				getParameterSets().addAll(
-					(Collection<? extends ParameterSet>) newValue);
+				getParameterSets()
+					.addAll((Collection<? extends ParameterSet>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -1666,7 +1686,8 @@
 			case UMLPackage.PARAMETER__END :
 				return !getEnds().isEmpty();
 			case UMLPackage.PARAMETER__IS_ORDERED :
-				return ((eFlags & IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
+				return ((eFlags
+					& IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
 			case UMLPackage.PARAMETER__IS_UNIQUE :
 				return ((eFlags & IS_UNIQUE_EFLAG) != 0) != IS_UNIQUE_EDEFAULT;
 			case UMLPackage.PARAMETER__LOWER :
@@ -1686,7 +1707,8 @@
 			case UMLPackage.PARAMETER__EFFECT :
 				return isSetEffect();
 			case UMLPackage.PARAMETER__IS_EXCEPTION :
-				return ((eFlags & IS_EXCEPTION_EFLAG) != 0) != IS_EXCEPTION_EDEFAULT;
+				return ((eFlags
+					& IS_EXCEPTION_EFLAG) != 0) != IS_EXCEPTION_EDEFAULT;
 			case UMLPackage.PARAMETER__IS_STREAM :
 				return ((eFlags & IS_STREAM_EFLAG) != 0) != IS_STREAM_EDEFAULT;
 			case UMLPackage.PARAMETER__OPERATION :
@@ -1703,7 +1725,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == MultiplicityElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.PARAMETER__IS_ORDERED :
@@ -1731,7 +1754,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == MultiplicityElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.MULTIPLICITY_ELEMENT__IS_ORDERED :
@@ -1858,7 +1882,8 @@
 			case UMLPackage.PARAMETER___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PARAMETER___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PARAMETER___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PARAMETER___GET_STEREOTYPE_APPLICATIONS :
@@ -1866,7 +1891,8 @@
 			case UMLPackage.PARAMETER___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PARAMETER___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PARAMETER___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1929,7 +1955,8 @@
 			case UMLPackage.PARAMETER___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.PARAMETER___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.PARAMETER___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.PARAMETER___GET_ENDS :
@@ -1965,8 +1992,8 @@
 			case UMLPackage.PARAMETER___COMPATIBLE_WITH__MULTIPLICITYELEMENT :
 				return compatibleWith((MultiplicityElement) arguments.get(0));
 			case UMLPackage.PARAMETER___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT :
-				return includesMultiplicity((MultiplicityElement) arguments
-					.get(0));
+				return includesMultiplicity(
+					(MultiplicityElement) arguments.get(0));
 			case UMLPackage.PARAMETER___IS__INT_INT :
 				return is((Integer) arguments.get(0),
 					(Integer) arguments.get(1));
@@ -2048,12 +2075,12 @@
 		result.append(", isUnique: "); //$NON-NLS-1$
 		result.append((eFlags & IS_UNIQUE_EFLAG) != 0);
 		result.append(", direction: "); //$NON-NLS-1$
-		result
-			.append(DIRECTION_EFLAG_VALUES[(eFlags & DIRECTION_EFLAG) >>> DIRECTION_EFLAG_OFFSET]);
+		result.append(DIRECTION_EFLAG_VALUES[(eFlags
+			& DIRECTION_EFLAG) >>> DIRECTION_EFLAG_OFFSET]);
 		result.append(", effect: "); //$NON-NLS-1$
 		if ((eFlags & EFFECT_ESETFLAG) != 0)
-			result
-				.append(EFFECT_EFLAG_VALUES[(eFlags & EFFECT_EFLAG) >>> EFFECT_EFLAG_OFFSET]);
+			result.append(EFFECT_EFLAG_VALUES[(eFlags
+				& EFFECT_EFLAG) >>> EFFECT_EFLAG_OFFSET]);
 		else
 			result.append("<unset>"); //$NON-NLS-1$
 		result.append(", isException: "); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterSetImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterSetImpl.java
index c1140fa..e3ca83b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterSetImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterSetImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -120,8 +120,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -304,19 +304,19 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PARAMETER_SET__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PARAMETER_SET__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PARAMETER_SET__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.PARAMETER_SET__CONDITION :
-				return ((InternalEList<?>) getConditions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getConditions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PARAMETER_SET__PARAMETER :
-				return ((InternalEList<?>) getParameters()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getParameters())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -374,13 +374,13 @@
 		switch (featureID) {
 			case UMLPackage.PARAMETER_SET__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PARAMETER_SET__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PARAMETER_SET__NAME :
 				setName((String) newValue);
@@ -393,13 +393,13 @@
 				return;
 			case UMLPackage.PARAMETER_SET__CONDITION :
 				getConditions().clear();
-				getConditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getConditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.PARAMETER_SET__PARAMETER :
 				getParameters().clear();
-				getParameters().addAll(
-					(Collection<? extends Parameter>) newValue);
+				getParameters()
+					.addAll((Collection<? extends Parameter>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -533,7 +533,8 @@
 			case UMLPackage.PARAMETER_SET___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PARAMETER_SET___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PARAMETER_SET___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PARAMETER_SET___GET_STEREOTYPE_APPLICATIONS :
@@ -541,7 +542,8 @@
 			case UMLPackage.PARAMETER_SET___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PARAMETER_SET___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PARAMETER_SET___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterableElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterableElementImpl.java
index d254d67..093167c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterableElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ParameterableElementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 451350
+ *   Kenn Hussey (CEA) - 327039, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -110,7 +110,8 @@
 	public TemplateParameter getTemplateParameter() {
 		if (templateParameter != null && templateParameter.eIsProxy()) {
 			InternalEObject oldTemplateParameter = (InternalEObject) templateParameter;
-			templateParameter = (TemplateParameter) eResolveProxy(oldTemplateParameter);
+			templateParameter = (TemplateParameter) eResolveProxy(
+				oldTemplateParameter);
 			if (templateParameter != oldTemplateParameter) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -213,7 +214,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetOwningTemplateParameter(
-			TemplateParameter newOwningTemplateParameter, NotificationChain msgs) {
+			TemplateParameter newOwningTemplateParameter,
+			NotificationChain msgs) {
 		msgs = eBasicSetContainer((InternalEObject) newOwningTemplateParameter,
 			UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER, msgs);
 		Resource.Internal eInternalResource = eInternalResource();
@@ -235,7 +237,8 @@
 	public void setOwningTemplateParameter(
 			TemplateParameter newOwningTemplateParameter) {
 		if (newOwningTemplateParameter != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER
+				&& newOwningTemplateParameter != null)) {
 			if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -244,8 +247,7 @@
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newOwningTemplateParameter != null)
 				msgs = ((InternalEObject) newOwningTemplateParameter)
-					.eInverseAdd(
-						this,
+					.eInverseAdd(this,
 						UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 						TemplateParameter.class, msgs);
 			msgs = basicSetOwningTemplateParameter(newOwningTemplateParameter,
@@ -296,10 +298,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.PARAMETERABLE_ELEMENT__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 		}
@@ -316,11 +318,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PARAMETERABLE_ELEMENT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PARAMETERABLE_ELEMENT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.PARAMETERABLE_ELEMENT__TEMPLATE_PARAMETER :
@@ -387,13 +389,13 @@
 		switch (featureID) {
 			case UMLPackage.PARAMETERABLE_ELEMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PARAMETERABLE_ELEMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER :
 				setOwningTemplateParameter((TemplateParameter) newValue);
@@ -510,7 +512,8 @@
 			case UMLPackage.PARAMETERABLE_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PARAMETERABLE_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PARAMETERABLE_ELEMENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PARAMETERABLE_ELEMENT___GET_STEREOTYPE_APPLICATIONS :
@@ -518,7 +521,8 @@
 			case UMLPackage.PARAMETERABLE_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PARAMETERABLE_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PARAMETERABLE_ELEMENT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -546,7 +550,8 @@
 			case UMLPackage.PARAMETERABLE_ELEMENT___MUST_BE_OWNED :
 				return mustBeOwned();
 			case UMLPackage.PARAMETERABLE_ELEMENT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.PARAMETERABLE_ELEMENT___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 		}
@@ -574,8 +579,8 @@
 	 */
 	@Override
 	public boolean isSetOwner() {
-		return super.isSetOwner()
-			|| eIsSet(UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER);
+		return super.isSetOwner() || eIsSet(
+			UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER);
 	}
 
 } //ParameterableElementImpl
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PartDecompositionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PartDecompositionImpl.java
index 74a56db..132533d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PartDecompositionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PartDecompositionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -66,8 +66,8 @@
 	 */
 	public boolean validatePartsOfInternalStructures(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return PartDecompositionOperations.validatePartsOfInternalStructures(
-			this, diagnostics, context);
+		return PartDecompositionOperations
+			.validatePartsOfInternalStructures(this, diagnostics, context);
 	}
 
 	/**
@@ -149,7 +149,8 @@
 			case UMLPackage.PART_DECOMPOSITION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PART_DECOMPOSITION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PART_DECOMPOSITION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PART_DECOMPOSITION___GET_STEREOTYPE_APPLICATIONS :
@@ -157,7 +158,8 @@
 			case UMLPackage.PART_DECOMPOSITION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PART_DECOMPOSITION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PART_DECOMPOSITION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PinImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PinImpl.java
index 55bcdf4..643c092 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PinImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PinImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -220,8 +220,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -344,7 +344,8 @@
 					msgs.dispatch();
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.PIN__UPPER_VALUE, oldUpperValue, upperValue));
+						UMLPackage.PIN__UPPER_VALUE, oldUpperValue,
+						upperValue));
 			}
 		}
 		return upperValue;
@@ -443,7 +444,8 @@
 					msgs.dispatch();
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.PIN__LOWER_VALUE, oldLowerValue, lowerValue));
+						UMLPackage.PIN__LOWER_VALUE, oldLowerValue,
+						lowerValue));
 			}
 		}
 		return lowerValue;
@@ -551,8 +553,8 @@
 	 */
 	public boolean validateLowerGe0(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return MultiplicityElementOperations.validateLowerGe0(this,
-			diagnostics, context);
+		return MultiplicityElementOperations.validateLowerGe0(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -574,7 +576,8 @@
 	public boolean validateValueSpecificationNoSideEffects(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return MultiplicityElementOperations
-			.validateValueSpecificationNoSideEffects(this, diagnostics, context);
+			.validateValueSpecificationNoSideEffects(this, diagnostics,
+				context);
 	}
 
 	/**
@@ -606,8 +609,8 @@
 	 */
 	public boolean validateUpperIsUnlimitedNatural(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return MultiplicityElementOperations.validateUpperIsUnlimitedNatural(
-			this, diagnostics, context);
+		return MultiplicityElementOperations
+			.validateUpperIsUnlimitedNatural(this, diagnostics, context);
 	}
 
 	/**
@@ -694,11 +697,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PIN__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PIN__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PIN__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.PIN__IN_INTERRUPTIBLE_REGION :
@@ -707,14 +710,14 @@
 			case UMLPackage.PIN__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.PIN__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.PIN__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.PIN__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PIN__UPPER_BOUND :
 				return basicSetUpperBound(null, msgs);
 			case UMLPackage.PIN__LOWER_VALUE :
@@ -836,13 +839,13 @@
 		switch (featureID) {
 			case UMLPackage.PIN__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PIN__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PIN__NAME :
 				setName((String) newValue);
@@ -861,32 +864,31 @@
 				return;
 			case UMLPackage.PIN__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.PIN__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.PIN__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.PIN__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.PIN__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.PIN__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.PIN__TYPE :
 				setType((Type) newValue);
@@ -1080,7 +1082,8 @@
 			case UMLPackage.PIN__IN_STATE :
 				return inStates != null && !inStates.isEmpty();
 			case UMLPackage.PIN__IS_CONTROL_TYPE :
-				return ((eFlags & IS_CONTROL_TYPE_EFLAG) != 0) != IS_CONTROL_TYPE_EDEFAULT;
+				return ((eFlags
+					& IS_CONTROL_TYPE_EFLAG) != 0) != IS_CONTROL_TYPE_EDEFAULT;
 			case UMLPackage.PIN__ORDERING :
 				return (eFlags & ORDERING_EFLAG) != ORDERING_EFLAG_DEFAULT;
 			case UMLPackage.PIN__SELECTION :
@@ -1088,7 +1091,8 @@
 			case UMLPackage.PIN__UPPER_BOUND :
 				return upperBound != null;
 			case UMLPackage.PIN__IS_ORDERED :
-				return ((eFlags & IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
+				return ((eFlags
+					& IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
 			case UMLPackage.PIN__IS_UNIQUE :
 				return ((eFlags & IS_UNIQUE_EFLAG) != 0) != IS_UNIQUE_EDEFAULT;
 			case UMLPackage.PIN__LOWER :
@@ -1100,7 +1104,8 @@
 			case UMLPackage.PIN__UPPER_VALUE :
 				return upperValue != null;
 			case UMLPackage.PIN__IS_CONTROL :
-				return ((eFlags & IS_CONTROL_EFLAG) != 0) != IS_CONTROL_EDEFAULT;
+				return ((eFlags
+					& IS_CONTROL_EFLAG) != 0) != IS_CONTROL_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
@@ -1111,7 +1116,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == MultiplicityElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.PIN__IS_ORDERED :
@@ -1139,7 +1145,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == MultiplicityElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.MULTIPLICITY_ELEMENT__IS_ORDERED :
@@ -1266,7 +1273,8 @@
 			case UMLPackage.PIN___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PIN___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PIN___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PIN___GET_STEREOTYPE_APPLICATIONS :
@@ -1274,7 +1282,8 @@
 			case UMLPackage.PIN___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PIN___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PIN___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1351,8 +1360,8 @@
 			case UMLPackage.PIN___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.PIN___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.PIN___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.PIN___VALIDATE_INPUT_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP :
@@ -1398,8 +1407,8 @@
 			case UMLPackage.PIN___COMPATIBLE_WITH__MULTIPLICITYELEMENT :
 				return compatibleWith((MultiplicityElement) arguments.get(0));
 			case UMLPackage.PIN___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT :
-				return includesMultiplicity((MultiplicityElement) arguments
-					.get(0));
+				return includesMultiplicity(
+					(MultiplicityElement) arguments.get(0));
 			case UMLPackage.PIN___IS__INT_INT :
 				return is((Integer) arguments.get(0),
 					(Integer) arguments.get(1));
@@ -1464,8 +1473,7 @@
 	 */
 	@Override
 	public boolean isSetOwnedElements() {
-		return super.isSetOwnedElements()
-			|| eIsSet(UMLPackage.PIN__LOWER_VALUE)
+		return super.isSetOwnedElements() || eIsSet(UMLPackage.PIN__LOWER_VALUE)
 			|| eIsSet(UMLPackage.PIN__UPPER_VALUE);
 	}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PortImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PortImpl.java
index 172cad5..a93026d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PortImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PortImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -190,8 +190,8 @@
 	public EList<Property> getRedefinedProperties() {
 		if (redefinedProperties == null) {
 			redefinedProperties = new SubsetSupersetEObjectResolvingEList<Property>(
-				Property.class, this, UMLPackage.PORT__REDEFINED_PROPERTY,
-				null, REDEFINED_PROPERTY_ESUBSETS);
+				Property.class, this, UMLPackage.PORT__REDEFINED_PROPERTY, null,
+				REDEFINED_PROPERTY_ESUBSETS);
 		}
 		return redefinedProperties;
 	}
@@ -204,7 +204,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_PROPERTY_ESUBSETS = new int[]{UMLPackage.PORT__REDEFINED_PORT};
+	protected static final int[] REDEFINED_PROPERTY_ESUBSETS = new int[]{
+		UMLPackage.PORT__REDEFINED_PORT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -349,7 +350,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_PORT_ESUPERSETS = new int[]{UMLPackage.PORT__REDEFINED_PROPERTY};
+	protected static final int[] REDEFINED_PORT_ESUPERSETS = new int[]{
+		UMLPackage.PORT__REDEFINED_PROPERTY};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -696,13 +698,13 @@
 		switch (featureID) {
 			case UMLPackage.PORT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PORT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PORT__NAME :
 				setName((String) newValue);
@@ -751,8 +753,8 @@
 				return;
 			case UMLPackage.PORT__DEPLOYMENT :
 				getDeployments().clear();
-				getDeployments().addAll(
-					(Collection<? extends Deployment>) newValue);
+				getDeployments()
+					.addAll((Collection<? extends Deployment>) newValue);
 				return;
 			case UMLPackage.PORT__DATATYPE :
 				setDatatype((DataType) newValue);
@@ -771,8 +773,8 @@
 				return;
 			case UMLPackage.PORT__QUALIFIER :
 				getQualifiers().clear();
-				getQualifiers().addAll(
-					(Collection<? extends Property>) newValue);
+				getQualifiers()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.PORT__DEFAULT_VALUE :
 				setDefaultValue((ValueSpecification) newValue);
@@ -797,13 +799,13 @@
 				return;
 			case UMLPackage.PORT__REDEFINED_PROPERTY :
 				getRedefinedProperties().clear();
-				getRedefinedProperties().addAll(
-					(Collection<? extends Property>) newValue);
+				getRedefinedProperties()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.PORT__SUBSETTED_PROPERTY :
 				getSubsettedProperties().clear();
-				getSubsettedProperties().addAll(
-					(Collection<? extends Property>) newValue);
+				getSubsettedProperties()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.PORT__ASSOCIATION :
 				setAssociation((Association) newValue);
@@ -822,8 +824,8 @@
 				return;
 			case UMLPackage.PORT__REDEFINED_PORT :
 				getRedefinedPorts().clear();
-				getRedefinedPorts().addAll(
-					(Collection<? extends Port>) newValue);
+				getRedefinedPorts()
+					.addAll((Collection<? extends Port>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -1012,7 +1014,8 @@
 			case UMLPackage.PORT__TYPE :
 				return type != null;
 			case UMLPackage.PORT__IS_ORDERED :
-				return ((eFlags & IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
+				return ((eFlags
+					& IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
 			case UMLPackage.PORT__IS_UNIQUE :
 				return ((eFlags & IS_UNIQUE_EFLAG) != 0) != IS_UNIQUE_EDEFAULT;
 			case UMLPackage.PORT__LOWER :
@@ -1024,7 +1027,8 @@
 			case UMLPackage.PORT__UPPER_VALUE :
 				return upperValue != null;
 			case UMLPackage.PORT__IS_READ_ONLY :
-				return ((eFlags & IS_READ_ONLY_EFLAG) != 0) != IS_READ_ONLY_EDEFAULT;
+				return ((eFlags
+					& IS_READ_ONLY_EFLAG) != 0) != IS_READ_ONLY_EDEFAULT;
 			case UMLPackage.PORT__OWNING_TEMPLATE_PARAMETER :
 				return basicGetOwningTemplateParameter() != null;
 			case UMLPackage.PORT__TEMPLATE_PARAMETER :
@@ -1042,7 +1046,8 @@
 			case UMLPackage.PORT__DEFAULT :
 				return isSetDefault();
 			case UMLPackage.PORT__AGGREGATION :
-				return (eFlags & AGGREGATION_EFLAG) != AGGREGATION_EFLAG_DEFAULT;
+				return (eFlags
+					& AGGREGATION_EFLAG) != AGGREGATION_EFLAG_DEFAULT;
 			case UMLPackage.PORT__ASSOCIATION_END :
 				return basicGetAssociationEnd() != null;
 			case UMLPackage.PORT__QUALIFIER :
@@ -1054,9 +1059,11 @@
 			case UMLPackage.PORT__IS_COMPOSITE :
 				return isComposite() != IS_COMPOSITE_EDEFAULT;
 			case UMLPackage.PORT__IS_DERIVED :
-				return ((eFlags & IS_DERIVED_EFLAG) != 0) != IS_DERIVED_EDEFAULT;
+				return ((eFlags
+					& IS_DERIVED_EFLAG) != 0) != IS_DERIVED_EDEFAULT;
 			case UMLPackage.PORT__IS_DERIVED_UNION :
-				return ((eFlags & IS_DERIVED_UNION_EFLAG) != 0) != IS_DERIVED_UNION_EDEFAULT;
+				return ((eFlags
+					& IS_DERIVED_UNION_EFLAG) != 0) != IS_DERIVED_UNION_EDEFAULT;
 			case UMLPackage.PORT__IS_ID :
 				return ((eFlags & IS_ID_EFLAG) != 0) != IS_ID_EDEFAULT;
 			case UMLPackage.PORT__OPPOSITE :
@@ -1072,11 +1079,14 @@
 			case UMLPackage.PORT__ASSOCIATION :
 				return association != null;
 			case UMLPackage.PORT__IS_BEHAVIOR :
-				return ((eFlags & IS_BEHAVIOR_EFLAG) != 0) != IS_BEHAVIOR_EDEFAULT;
+				return ((eFlags
+					& IS_BEHAVIOR_EFLAG) != 0) != IS_BEHAVIOR_EDEFAULT;
 			case UMLPackage.PORT__IS_CONJUGATED :
-				return ((eFlags & IS_CONJUGATED_EFLAG) != 0) != IS_CONJUGATED_EDEFAULT;
+				return ((eFlags
+					& IS_CONJUGATED_EFLAG) != 0) != IS_CONJUGATED_EDEFAULT;
 			case UMLPackage.PORT__IS_SERVICE :
-				return ((eFlags & IS_SERVICE_EFLAG) != 0) != IS_SERVICE_EDEFAULT;
+				return ((eFlags
+					& IS_SERVICE_EFLAG) != 0) != IS_SERVICE_EDEFAULT;
 			case UMLPackage.PORT__PROTOCOL :
 				return protocol != null;
 			case UMLPackage.PORT__PROVIDED :
@@ -1146,7 +1156,8 @@
 			case UMLPackage.PORT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PORT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PORT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PORT___GET_STEREOTYPE_APPLICATIONS :
@@ -1154,7 +1165,8 @@
 			case UMLPackage.PORT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PORT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PORT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1231,8 +1243,8 @@
 			case UMLPackage.PORT___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.PORT___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.PORT___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP :
 				return validateUpperGeLower((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
@@ -1264,8 +1276,8 @@
 			case UMLPackage.PORT___COMPATIBLE_WITH__MULTIPLICITYELEMENT :
 				return compatibleWith((MultiplicityElement) arguments.get(0));
 			case UMLPackage.PORT___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT :
-				return includesMultiplicity((MultiplicityElement) arguments
-					.get(0));
+				return includesMultiplicity(
+					(MultiplicityElement) arguments.get(0));
 			case UMLPackage.PORT___IS__INT_INT :
 				return is((Integer) arguments.get(0),
 					(Integer) arguments.get(1));
@@ -1280,7 +1292,8 @@
 			case UMLPackage.PORT___UPPER_BOUND :
 				return upperBound();
 			case UMLPackage.PORT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.PORT___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.PORT___GET_ENDS :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileApplicationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileApplicationImpl.java
index 321220e..4017343 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileApplicationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileApplicationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -131,16 +131,15 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> targets = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
+			EList<Element> targets = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
 			if (targets == null) {
-				cache
-					.put(eResource, this,
-						UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET,
-						targets = new DerivedUnionEObjectEList<Element>(
-							Element.class, this,
-							UMLPackage.PROFILE_APPLICATION__TARGET,
-							TARGET_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET,
+					targets = new DerivedUnionEObjectEList<Element>(
+						Element.class, this,
+						UMLPackage.PROFILE_APPLICATION__TARGET,
+						TARGET_ESUBSETS));
 			}
 			return targets;
 		}
@@ -159,16 +158,15 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> sources = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
+			EList<Element> sources = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
 			if (sources == null) {
-				cache
-					.put(eResource, this,
-						UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE,
-						sources = new DerivedUnionEObjectEList<Element>(
-							Element.class, this,
-							UMLPackage.PROFILE_APPLICATION__SOURCE,
-							SOURCE_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE,
+					sources = new DerivedUnionEObjectEList<Element>(
+						Element.class, this,
+						UMLPackage.PROFILE_APPLICATION__SOURCE,
+						SOURCE_ESUBSETS));
 			}
 			return sources;
 		}
@@ -287,7 +285,8 @@
 	public void setApplyingPackage(
 			org.eclipse.uml2.uml.Package newApplyingPackage) {
 		if (newApplyingPackage != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PROFILE_APPLICATION__APPLYING_PACKAGE && newApplyingPackage != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PROFILE_APPLICATION__APPLYING_PACKAGE
+				&& newApplyingPackage != null)) {
 			if (EcoreUtil.isAncestor(this, newApplyingPackage))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -358,11 +357,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PROFILE_APPLICATION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROFILE_APPLICATION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROFILE_APPLICATION__APPLYING_PACKAGE :
 				return basicSetApplyingPackage(null, msgs);
 		}
@@ -435,13 +434,13 @@
 		switch (featureID) {
 			case UMLPackage.PROFILE_APPLICATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PROFILE_APPLICATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PROFILE_APPLICATION__APPLIED_PROFILE :
 				setAppliedProfile((Profile) newValue);
@@ -572,7 +571,8 @@
 			case UMLPackage.PROFILE_APPLICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PROFILE_APPLICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PROFILE_APPLICATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PROFILE_APPLICATION___GET_STEREOTYPE_APPLICATIONS :
@@ -580,7 +580,8 @@
 			case UMLPackage.PROFILE_APPLICATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PROFILE_APPLICATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PROFILE_APPLICATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -640,7 +641,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] TARGET_ESUBSETS = new int[]{UMLPackage.PROFILE_APPLICATION__APPLIED_PROFILE};
+	protected static final int[] TARGET_ESUBSETS = new int[]{
+		UMLPackage.PROFILE_APPLICATION__APPLIED_PROFILE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -661,7 +663,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SOURCE_ESUBSETS = new int[]{UMLPackage.PROFILE_APPLICATION__APPLYING_PACKAGE};
+	protected static final int[] SOURCE_ESUBSETS = new int[]{
+		UMLPackage.PROFILE_APPLICATION__APPLYING_PACKAGE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileImpl.java
index d7177f9..3923d51 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -144,7 +144,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] ELEMENT_IMPORT_ESUBSETS = new int[]{UMLPackage.PROFILE__METACLASS_REFERENCE};
+	protected static final int[] ELEMENT_IMPORT_ESUBSETS = new int[]{
+		UMLPackage.PROFILE__METACLASS_REFERENCE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -170,7 +171,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] PACKAGE_IMPORT_ESUBSETS = new int[]{UMLPackage.PROFILE__METAMODEL_REFERENCE};
+	protected static final int[] PACKAGE_IMPORT_ESUBSETS = new int[]{
+		UMLPackage.PROFILE__METAMODEL_REFERENCE};
 
 	/**
 	 * The array of superset feature identifiers for the '{@link #getMetaclassReferences() <em>Metaclass Reference</em>}' reference list.
@@ -180,7 +182,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] METACLASS_REFERENCE_ESUPERSETS = new int[]{UMLPackage.PROFILE__ELEMENT_IMPORT};
+	protected static final int[] METACLASS_REFERENCE_ESUPERSETS = new int[]{
+		UMLPackage.PROFILE__ELEMENT_IMPORT};
 
 	/**
 	 * The array of superset feature identifiers for the '{@link #getMetamodelReferences() <em>Metamodel Reference</em>}' reference list.
@@ -190,7 +193,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] METAMODEL_REFERENCE_ESUPERSETS = new int[]{UMLPackage.PROFILE__PACKAGE_IMPORT};
+	protected static final int[] METAMODEL_REFERENCE_ESUPERSETS = new int[]{
+		UMLPackage.PROFILE__PACKAGE_IMPORT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -214,7 +218,8 @@
 	 */
 	public ElementImport createMetaclassReference(
 			PackageableElement importedElement) {
-		ElementImport newMetaclassReference = (ElementImport) create(UMLPackage.Literals.ELEMENT_IMPORT);
+		ElementImport newMetaclassReference = (ElementImport) create(
+			UMLPackage.Literals.ELEMENT_IMPORT);
 		getMetaclassReferences().add(newMetaclassReference);
 		if (importedElement != null)
 			newMetaclassReference.setImportedElement(importedElement);
@@ -239,9 +244,8 @@
 	public ElementImport getMetaclassReference(
 			PackageableElement importedElement, boolean createOnDemand) {
 		metaclassReferenceLoop : for (ElementImport metaclassReference : getMetaclassReferences()) {
-			if (importedElement != null
-				&& !importedElement.equals(metaclassReference
-					.getImportedElement()))
+			if (importedElement != null && !importedElement
+				.equals(metaclassReference.getImportedElement()))
 				continue metaclassReferenceLoop;
 			return metaclassReference;
 		}
@@ -272,7 +276,8 @@
 	 */
 	public PackageImport createMetamodelReference(
 			org.eclipse.uml2.uml.Package importedPackage) {
-		PackageImport newMetamodelReference = (PackageImport) create(UMLPackage.Literals.PACKAGE_IMPORT);
+		PackageImport newMetamodelReference = (PackageImport) create(
+			UMLPackage.Literals.PACKAGE_IMPORT);
 		getMetamodelReferences().add(newMetamodelReference);
 		if (importedPackage != null)
 			newMetamodelReference.setImportedPackage(importedPackage);
@@ -295,11 +300,11 @@
 	 * @generated
 	 */
 	public PackageImport getMetamodelReference(
-			org.eclipse.uml2.uml.Package importedPackage, boolean createOnDemand) {
+			org.eclipse.uml2.uml.Package importedPackage,
+			boolean createOnDemand) {
 		metamodelReferenceLoop : for (PackageImport metamodelReference : getMetamodelReferences()) {
-			if (importedPackage != null
-				&& !importedPackage.equals(metamodelReference
-					.getImportedPackage()))
+			if (importedPackage != null && !importedPackage
+				.equals(metamodelReference.getImportedPackage()))
 				continue metamodelReferenceLoop;
 			return metamodelReference;
 		}
@@ -467,10 +472,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.PROFILE__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.PROFILE__TEMPLATE_BINDING :
@@ -479,8 +484,9 @@
 			case UMLPackage.PROFILE__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.PROFILE__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.PROFILE__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -504,37 +510,37 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PROFILE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROFILE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROFILE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.PROFILE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROFILE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROFILE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROFILE__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.PROFILE__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.PROFILE__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROFILE__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.PROFILE__PACKAGE_MERGE :
-				return ((InternalEList<?>) getPackageMerges()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageMerges())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROFILE__PACKAGED_ELEMENT :
-				return ((InternalEList<?>) getPackagedElements()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackagedElements())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROFILE__PROFILE_APPLICATION :
 				return ((InternalEList<?>) getProfileApplications())
 					.basicRemove(otherEnd, msgs);
@@ -639,13 +645,13 @@
 		switch (featureID) {
 			case UMLPackage.PROFILE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PROFILE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PROFILE__NAME :
 				setName((String) newValue);
@@ -658,18 +664,18 @@
 				return;
 			case UMLPackage.PROFILE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.PROFILE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.PROFILE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.PROFILE__OWNING_TEMPLATE_PARAMETER :
 				setOwningTemplateParameter((TemplateParameter) newValue);
@@ -679,8 +685,8 @@
 				return;
 			case UMLPackage.PROFILE__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.PROFILE__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
@@ -690,9 +696,8 @@
 				return;
 			case UMLPackage.PROFILE__NESTED_PACKAGE :
 				getNestedPackages().clear();
-				getNestedPackages()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Package>) newValue);
+				getNestedPackages().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Package>) newValue);
 				return;
 			case UMLPackage.PROFILE__NESTING_PACKAGE :
 				setNestingPackage((org.eclipse.uml2.uml.Package) newValue);
@@ -703,8 +708,8 @@
 				return;
 			case UMLPackage.PROFILE__PACKAGE_MERGE :
 				getPackageMerges().clear();
-				getPackageMerges().addAll(
-					(Collection<? extends PackageMerge>) newValue);
+				getPackageMerges()
+					.addAll((Collection<? extends PackageMerge>) newValue);
 				return;
 			case UMLPackage.PROFILE__PACKAGED_ELEMENT :
 				getPackagedElements().clear();
@@ -718,13 +723,13 @@
 				return;
 			case UMLPackage.PROFILE__METACLASS_REFERENCE :
 				getMetaclassReferences().clear();
-				getMetaclassReferences().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getMetaclassReferences()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.PROFILE__METAMODEL_REFERENCE :
 				getMetamodelReferences().clear();
-				getMetamodelReferences().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getMetamodelReferences()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -941,7 +946,8 @@
 			case UMLPackage.PROFILE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PROFILE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PROFILE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PROFILE___GET_STEREOTYPE_APPLICATIONS :
@@ -949,7 +955,8 @@
 			case UMLPackage.PROFILE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PROFILE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PROFILE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1038,19 +1045,20 @@
 			case UMLPackage.PROFILE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.PROFILE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.PROFILE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.PROFILE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.PROFILE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.PROFILE___MEMBERS_ARE_DISTINGUISHABLE :
 				return membersAreDistinguishable();
 			case UMLPackage.PROFILE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.PROFILE___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.PROFILE___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1101,6 +1109,8 @@
 				return isProfileApplied((Profile) arguments.get(0));
 			case UMLPackage.PROFILE___UNAPPLY_PROFILE__PROFILE :
 				return unapplyProfile((Profile) arguments.get(0));
+			case UMLPackage.PROFILE___APPLY_PROFILES__ELIST :
+				return applyProfiles((EList<Profile>) arguments.get(0));
 			case UMLPackage.PROFILE___ALL_APPLICABLE_STEREOTYPES :
 				return allApplicableStereotypes();
 			case UMLPackage.PROFILE___CONTAINING_PROFILE :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PropertyImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PropertyImpl.java
index 53a4663..e5a3e54 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PropertyImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PropertyImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 208353, 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -356,7 +356,8 @@
 	public TemplateParameter getTemplateParameter() {
 		if (templateParameter != null && templateParameter.eIsProxy()) {
 			InternalEObject oldTemplateParameter = (InternalEObject) templateParameter;
-			templateParameter = (TemplateParameter) eResolveProxy(oldTemplateParameter);
+			templateParameter = (TemplateParameter) eResolveProxy(
+				oldTemplateParameter);
 			if (templateParameter != oldTemplateParameter) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -488,7 +489,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetOwningTemplateParameter(
-			TemplateParameter newOwningTemplateParameter, NotificationChain msgs) {
+			TemplateParameter newOwningTemplateParameter,
+			NotificationChain msgs) {
 		msgs = eBasicSetContainer((InternalEObject) newOwningTemplateParameter,
 			UMLPackage.PROPERTY__OWNING_TEMPLATE_PARAMETER, msgs);
 		Resource.Internal eInternalResource = eInternalResource();
@@ -510,7 +512,8 @@
 	public void setOwningTemplateParameter(
 			TemplateParameter newOwningTemplateParameter) {
 		if (newOwningTemplateParameter != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PROPERTY__OWNING_TEMPLATE_PARAMETER && newOwningTemplateParameter != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PROPERTY__OWNING_TEMPLATE_PARAMETER
+				&& newOwningTemplateParameter != null)) {
 			if (EcoreUtil.isAncestor(this, newOwningTemplateParameter))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -519,8 +522,7 @@
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newOwningTemplateParameter != null)
 				msgs = ((InternalEObject) newOwningTemplateParameter)
-					.eInverseAdd(
-						this,
+					.eInverseAdd(this,
 						UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 						TemplateParameter.class, msgs);
 			msgs = basicSetOwningTemplateParameter(newOwningTemplateParameter,
@@ -553,14 +555,13 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
 					ownedElements = new DerivedUnionEObjectEList<Element>(
-						Element.class, this,
-						UMLPackage.PROPERTY__OWNED_ELEMENT,
+						Element.class, this, UMLPackage.PROPERTY__OWNED_ELEMENT,
 						OWNED_ELEMENT_ESUBSETS));
 			}
 			return ownedElements;
@@ -596,8 +597,7 @@
 				.get(this,
 					UMLPackage.Literals.DEPLOYMENT_TARGET__DEPLOYED_ELEMENT);
 			if (result == null) {
-				cache.put(
-					this,
+				cache.put(this,
 					UMLPackage.Literals.DEPLOYMENT_TARGET__DEPLOYED_ELEMENT,
 					result = DeploymentTargetOperations
 						.getDeployedElements(this));
@@ -663,15 +663,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
 			if (featuringClassifiers == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER,
-						featuringClassifiers = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class, this,
-							UMLPackage.PROPERTY__FEATURING_CLASSIFIER,
-							FEATURING_CLASSIFIER_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER,
+					featuringClassifiers = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.PROPERTY__FEATURING_CLASSIFIER,
+						FEATURING_CLASSIFIER_ESUBSETS));
 			}
 			return featuringClassifiers;
 		}
@@ -695,15 +692,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT);
 			if (redefinedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
-						redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
-							RedefinableElement.class, this,
-							UMLPackage.PROPERTY__REDEFINED_ELEMENT,
-							REDEFINED_ELEMENT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
+					redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
+						RedefinableElement.class, this,
+						UMLPackage.PROPERTY__REDEFINED_ELEMENT,
+						REDEFINED_ELEMENT_ESUBSETS));
 			}
 			return redefinedElements;
 		}
@@ -778,13 +772,13 @@
 		if (newAssociation != association) {
 			NotificationChain msgs = null;
 			if (association != null)
-				msgs = ((InternalEObject) association)
-					.eInverseRemove(this, UMLPackage.ASSOCIATION__MEMBER_END,
-						Association.class, msgs);
+				msgs = ((InternalEObject) association).eInverseRemove(this,
+					UMLPackage.ASSOCIATION__MEMBER_END, Association.class,
+					msgs);
 			if (newAssociation != null)
-				msgs = ((InternalEObject) newAssociation)
-					.eInverseAdd(this, UMLPackage.ASSOCIATION__MEMBER_END,
-						Association.class, msgs);
+				msgs = ((InternalEObject) newAssociation).eInverseAdd(this,
+					UMLPackage.ASSOCIATION__MEMBER_END, Association.class,
+					msgs);
 			msgs = basicSetAssociation(newAssociation, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -835,7 +829,8 @@
 	 */
 	public void setDatatype(DataType newDatatype) {
 		if (newDatatype != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PROPERTY__DATATYPE && newDatatype != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PROPERTY__DATATYPE
+				&& newDatatype != null)) {
 			if (EcoreUtil.isAncestor(this, newDatatype))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -843,9 +838,9 @@
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newDatatype != null)
-				msgs = ((InternalEObject) newDatatype)
-					.eInverseAdd(this, UMLPackage.DATA_TYPE__OWNED_ATTRIBUTE,
-						DataType.class, msgs);
+				msgs = ((InternalEObject) newDatatype).eInverseAdd(this,
+					UMLPackage.DATA_TYPE__OWNED_ATTRIBUTE, DataType.class,
+					msgs);
 			msgs = basicSetDatatype(newDatatype, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -895,7 +890,8 @@
 	 */
 	public void setInterface(Interface newInterface) {
 		if (newInterface != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PROPERTY__INTERFACE && newInterface != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PROPERTY__INTERFACE
+				&& newInterface != null)) {
 			if (EcoreUtil.isAncestor(this, newInterface))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -1014,7 +1010,8 @@
 	 * @generated
 	 */
 	public AggregationKind getAggregation() {
-		return AGGREGATION_EFLAG_VALUES[(eFlags & AGGREGATION_EFLAG) >>> AGGREGATION_EFLAG_OFFSET];
+		return AGGREGATION_EFLAG_VALUES[(eFlags
+			& AGGREGATION_EFLAG) >>> AGGREGATION_EFLAG_OFFSET];
 	}
 
 	/**
@@ -1023,7 +1020,8 @@
 	 * @generated
 	 */
 	public void setAggregation(AggregationKind newAggregation) {
-		AggregationKind oldAggregation = AGGREGATION_EFLAG_VALUES[(eFlags & AGGREGATION_EFLAG) >>> AGGREGATION_EFLAG_OFFSET];
+		AggregationKind oldAggregation = AGGREGATION_EFLAG_VALUES[(eFlags
+			& AGGREGATION_EFLAG) >>> AGGREGATION_EFLAG_OFFSET];
 		if (newAggregation == null)
 			newAggregation = AGGREGATION_EDEFAULT;
 		eFlags = eFlags & ~AGGREGATION_EFLAG
@@ -1060,7 +1058,8 @@
 	public org.eclipse.uml2.uml.Class getClass_() {
 		org.eclipse.uml2.uml.Class class_ = basicGetClass_();
 		return class_ != null && class_.eIsProxy()
-			? (org.eclipse.uml2.uml.Class) eResolveProxy((InternalEObject) class_)
+			? (org.eclipse.uml2.uml.Class) eResolveProxy(
+				(InternalEObject) class_)
 			: class_;
 	}
 
@@ -1094,7 +1093,8 @@
 					.basicAdd(this, msgs);
 			msgs = eBasicSetContainer((InternalEObject) newClass,
 				InternalEObject.EOPPOSITE_FEATURE_BASE
-					- UMLPackage.CLASS__OWNED_ATTRIBUTE, msgs);
+					- UMLPackage.CLASS__OWNED_ATTRIBUTE,
+				msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
@@ -1194,7 +1194,8 @@
 	 */
 	public void setOwningAssociation(Association newOwningAssociation) {
 		if (newOwningAssociation != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PROPERTY__OWNING_ASSOCIATION && newOwningAssociation != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PROPERTY__OWNING_ASSOCIATION
+				&& newOwningAssociation != null)) {
 			if (EcoreUtil.isAncestor(this, newOwningAssociation))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -1225,13 +1226,15 @@
 			defaultValue = (ValueSpecification) eResolveProxy(oldDefaultValue);
 			if (defaultValue != oldDefaultValue) {
 				InternalEObject newDefaultValue = (InternalEObject) defaultValue;
-				NotificationChain msgs = oldDefaultValue
-					.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.PROPERTY__DEFAULT_VALUE, null, null);
+				NotificationChain msgs = oldDefaultValue.eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - UMLPackage.PROPERTY__DEFAULT_VALUE,
+					null, null);
 				if (newDefaultValue.eInternalContainer() == null) {
-					msgs = newDefaultValue.eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.PROPERTY__DEFAULT_VALUE, null, msgs);
+					msgs = newDefaultValue
+						.eInverseAdd(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.PROPERTY__DEFAULT_VALUE,
+							null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -1283,13 +1286,13 @@
 		if (newDefaultValue != defaultValue) {
 			NotificationChain msgs = null;
 			if (defaultValue != null)
-				msgs = ((InternalEObject) defaultValue)
-					.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.PROPERTY__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) defaultValue).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - UMLPackage.PROPERTY__DEFAULT_VALUE,
+					null, msgs);
 			if (newDefaultValue != null)
-				msgs = ((InternalEObject) newDefaultValue)
-					.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.PROPERTY__DEFAULT_VALUE, null, msgs);
+				msgs = ((InternalEObject) newDefaultValue).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE - UMLPackage.PROPERTY__DEFAULT_VALUE,
+					null, msgs);
 			msgs = basicSetDefaultValue(newDefaultValue, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -1306,7 +1309,8 @@
 	 */
 	public ValueSpecification createDefaultValue(String name, Type type,
 			EClass eClass) {
-		ValueSpecification newDefaultValue = (ValueSpecification) create(eClass);
+		ValueSpecification newDefaultValue = (ValueSpecification) create(
+			eClass);
 		setDefaultValue(newDefaultValue);
 		if (name != null)
 			newDefaultValue.setName(name);
@@ -1499,7 +1503,8 @@
 	 */
 	public void setAssociationEnd(Property newAssociationEnd) {
 		if (newAssociationEnd != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PROPERTY__ASSOCIATION_END && newAssociationEnd != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PROPERTY__ASSOCIATION_END
+				&& newAssociationEnd != null)) {
 			if (EcoreUtil.isAncestor(this, newAssociationEnd))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -1816,10 +1821,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.PROPERTY__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.PROPERTY__DEPLOYMENT :
@@ -1864,11 +1869,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PROPERTY__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROPERTY__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROPERTY__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.PROPERTY__LOWER_VALUE :
@@ -1880,8 +1885,8 @@
 			case UMLPackage.PROPERTY__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.PROPERTY__DEPLOYMENT :
-				return ((InternalEList<?>) getDeployments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getDeployments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROPERTY__DATATYPE :
 				return basicSetDatatype(null, msgs);
 			case UMLPackage.PROPERTY__INTERFACE :
@@ -1889,8 +1894,8 @@
 			case UMLPackage.PROPERTY__ASSOCIATION_END :
 				return basicSetAssociationEnd(null, msgs);
 			case UMLPackage.PROPERTY__QUALIFIER :
-				return ((InternalEList<?>) getQualifiers()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getQualifiers())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROPERTY__DEFAULT_VALUE :
 				return basicSetDefaultValue(null, msgs);
 			case UMLPackage.PROPERTY__OWNING_ASSOCIATION :
@@ -1915,10 +1920,9 @@
 					UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 					TemplateParameter.class, msgs);
 			case UMLPackage.PROPERTY__DATATYPE :
-				return eInternalContainer()
-					.eInverseRemove(this,
-						UMLPackage.DATA_TYPE__OWNED_ATTRIBUTE, DataType.class,
-						msgs);
+				return eInternalContainer().eInverseRemove(this,
+					UMLPackage.DATA_TYPE__OWNED_ATTRIBUTE, DataType.class,
+					msgs);
 			case UMLPackage.PROPERTY__INTERFACE :
 				return eInternalContainer().eInverseRemove(this,
 					UMLPackage.INTERFACE__OWNED_ATTRIBUTE, Interface.class,
@@ -2078,13 +2082,13 @@
 		switch (featureID) {
 			case UMLPackage.PROPERTY__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PROPERTY__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PROPERTY__NAME :
 				setName((String) newValue);
@@ -2133,8 +2137,8 @@
 				return;
 			case UMLPackage.PROPERTY__DEPLOYMENT :
 				getDeployments().clear();
-				getDeployments().addAll(
-					(Collection<? extends Deployment>) newValue);
+				getDeployments()
+					.addAll((Collection<? extends Deployment>) newValue);
 				return;
 			case UMLPackage.PROPERTY__DATATYPE :
 				setDatatype((DataType) newValue);
@@ -2153,8 +2157,8 @@
 				return;
 			case UMLPackage.PROPERTY__QUALIFIER :
 				getQualifiers().clear();
-				getQualifiers().addAll(
-					(Collection<? extends Property>) newValue);
+				getQualifiers()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.PROPERTY__DEFAULT_VALUE :
 				setDefaultValue((ValueSpecification) newValue);
@@ -2179,13 +2183,13 @@
 				return;
 			case UMLPackage.PROPERTY__REDEFINED_PROPERTY :
 				getRedefinedProperties().clear();
-				getRedefinedProperties().addAll(
-					(Collection<? extends Property>) newValue);
+				getRedefinedProperties()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.PROPERTY__SUBSETTED_PROPERTY :
 				getSubsettedProperties().clear();
-				getSubsettedProperties().addAll(
-					(Collection<? extends Property>) newValue);
+				getSubsettedProperties()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.PROPERTY__ASSOCIATION :
 				setAssociation((Association) newValue);
@@ -2362,7 +2366,8 @@
 			case UMLPackage.PROPERTY__TYPE :
 				return type != null;
 			case UMLPackage.PROPERTY__IS_ORDERED :
-				return ((eFlags & IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
+				return ((eFlags
+					& IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
 			case UMLPackage.PROPERTY__IS_UNIQUE :
 				return ((eFlags & IS_UNIQUE_EFLAG) != 0) != IS_UNIQUE_EDEFAULT;
 			case UMLPackage.PROPERTY__LOWER :
@@ -2374,7 +2379,8 @@
 			case UMLPackage.PROPERTY__UPPER_VALUE :
 				return upperValue != null;
 			case UMLPackage.PROPERTY__IS_READ_ONLY :
-				return ((eFlags & IS_READ_ONLY_EFLAG) != 0) != IS_READ_ONLY_EDEFAULT;
+				return ((eFlags
+					& IS_READ_ONLY_EFLAG) != 0) != IS_READ_ONLY_EDEFAULT;
 			case UMLPackage.PROPERTY__OWNING_TEMPLATE_PARAMETER :
 				return basicGetOwningTemplateParameter() != null;
 			case UMLPackage.PROPERTY__TEMPLATE_PARAMETER :
@@ -2392,7 +2398,8 @@
 			case UMLPackage.PROPERTY__DEFAULT :
 				return isSetDefault();
 			case UMLPackage.PROPERTY__AGGREGATION :
-				return (eFlags & AGGREGATION_EFLAG) != AGGREGATION_EFLAG_DEFAULT;
+				return (eFlags
+					& AGGREGATION_EFLAG) != AGGREGATION_EFLAG_DEFAULT;
 			case UMLPackage.PROPERTY__ASSOCIATION_END :
 				return basicGetAssociationEnd() != null;
 			case UMLPackage.PROPERTY__QUALIFIER :
@@ -2404,9 +2411,11 @@
 			case UMLPackage.PROPERTY__IS_COMPOSITE :
 				return isComposite() != IS_COMPOSITE_EDEFAULT;
 			case UMLPackage.PROPERTY__IS_DERIVED :
-				return ((eFlags & IS_DERIVED_EFLAG) != 0) != IS_DERIVED_EDEFAULT;
+				return ((eFlags
+					& IS_DERIVED_EFLAG) != 0) != IS_DERIVED_EDEFAULT;
 			case UMLPackage.PROPERTY__IS_DERIVED_UNION :
-				return ((eFlags & IS_DERIVED_UNION_EFLAG) != 0) != IS_DERIVED_UNION_EDEFAULT;
+				return ((eFlags
+					& IS_DERIVED_UNION_EFLAG) != 0) != IS_DERIVED_UNION_EDEFAULT;
 			case UMLPackage.PROPERTY__IS_ID :
 				return ((eFlags & IS_ID_EFLAG) != 0) != IS_ID_EDEFAULT;
 			case UMLPackage.PROPERTY__OPPOSITE :
@@ -2431,7 +2440,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == ParameterableElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.PROPERTY__OWNING_TEMPLATE_PARAMETER :
@@ -2469,7 +2479,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == ParameterableElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER :
@@ -2594,7 +2605,8 @@
 			case UMLPackage.PROPERTY___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PROPERTY___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PROPERTY___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PROPERTY___GET_STEREOTYPE_APPLICATIONS :
@@ -2602,7 +2614,8 @@
 			case UMLPackage.PROPERTY___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PROPERTY___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PROPERTY___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -2679,8 +2692,8 @@
 			case UMLPackage.PROPERTY___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.PROPERTY___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.PROPERTY___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP :
 				return validateUpperGeLower((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
@@ -2712,8 +2725,8 @@
 			case UMLPackage.PROPERTY___COMPATIBLE_WITH__MULTIPLICITYELEMENT :
 				return compatibleWith((MultiplicityElement) arguments.get(0));
 			case UMLPackage.PROPERTY___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT :
-				return includesMultiplicity((MultiplicityElement) arguments
-					.get(0));
+				return includesMultiplicity(
+					(MultiplicityElement) arguments.get(0));
 			case UMLPackage.PROPERTY___IS__INT_INT :
 				return is((Integer) arguments.get(0),
 					(Integer) arguments.get(1));
@@ -2728,7 +2741,8 @@
 			case UMLPackage.PROPERTY___UPPER_BOUND :
 				return upperBound();
 			case UMLPackage.PROPERTY___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.PROPERTY___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.PROPERTY___GET_ENDS :
@@ -2844,8 +2858,8 @@
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (aggregation: "); //$NON-NLS-1$
-		result
-			.append(AGGREGATION_EFLAG_VALUES[(eFlags & AGGREGATION_EFLAG) >>> AGGREGATION_EFLAG_OFFSET]);
+		result.append(AGGREGATION_EFLAG_VALUES[(eFlags
+			& AGGREGATION_EFLAG) >>> AGGREGATION_EFLAG_OFFSET]);
 		result.append(", isDerived: "); //$NON-NLS-1$
 		result.append((eFlags & IS_DERIVED_EFLAG) != 0);
 		result.append(", isDerivedUnion: "); //$NON-NLS-1$
@@ -2906,7 +2920,8 @@
 	 * @generated
 	 */
 	public Deployment createDeployment(String name) {
-		Deployment newDeployment = (Deployment) create(UMLPackage.Literals.DEPLOYMENT);
+		Deployment newDeployment = (Deployment) create(
+			UMLPackage.Literals.DEPLOYMENT);
 		getDeployments().add(newDeployment);
 		if (name != null)
 			newDeployment.setName(name);
@@ -3017,20 +3032,15 @@
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
 			EList<Classifier> redefinitionContexts = (EList<Classifier>) cache
-				.get(
-					eResource,
-					this,
+				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 			if (redefinitionContexts == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-						redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class, this,
-							UMLPackage.PROPERTY__REDEFINITION_CONTEXT,
-							REDEFINITION_CONTEXT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+					redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.PROPERTY__REDEFINITION_CONTEXT,
+						REDEFINITION_CONTEXT_ESUBSETS));
 			}
 			return redefinitionContexts;
 		}
@@ -3087,7 +3097,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{UMLPackage.PROPERTY__REDEFINED_PROPERTY};
+	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{
+		UMLPackage.PROPERTY__REDEFINED_PROPERTY};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolConformanceImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolConformanceImpl.java
index 71bd453..ae9fe3f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolConformanceImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolConformanceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -99,8 +99,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> targets = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
+			EList<Element> targets = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
 			if (targets == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET,
@@ -126,8 +126,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> sources = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
+			EList<Element> sources = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
 			if (sources == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE,
@@ -150,7 +150,8 @@
 	public ProtocolStateMachine getGeneralMachine() {
 		if (generalMachine != null && generalMachine.eIsProxy()) {
 			InternalEObject oldGeneralMachine = (InternalEObject) generalMachine;
-			generalMachine = (ProtocolStateMachine) eResolveProxy(oldGeneralMachine);
+			generalMachine = (ProtocolStateMachine) eResolveProxy(
+				oldGeneralMachine);
 			if (generalMachine != oldGeneralMachine) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -225,7 +226,8 @@
 	 */
 	public void setSpecificMachine(ProtocolStateMachine newSpecificMachine) {
 		if (newSpecificMachine != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PROTOCOL_CONFORMANCE__SPECIFIC_MACHINE && newSpecificMachine != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PROTOCOL_CONFORMANCE__SPECIFIC_MACHINE
+				&& newSpecificMachine != null)) {
 			if (EcoreUtil.isAncestor(this, newSpecificMachine))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -277,11 +279,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PROTOCOL_CONFORMANCE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_CONFORMANCE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_CONFORMANCE__SPECIFIC_MACHINE :
 				return basicSetSpecificMachine(null, msgs);
 		}
@@ -352,13 +354,13 @@
 		switch (featureID) {
 			case UMLPackage.PROTOCOL_CONFORMANCE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_CONFORMANCE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_CONFORMANCE__GENERAL_MACHINE :
 				setGeneralMachine((ProtocolStateMachine) newValue);
@@ -432,7 +434,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] TARGET_ESUBSETS = new int[]{UMLPackage.PROTOCOL_CONFORMANCE__GENERAL_MACHINE};
+	protected static final int[] TARGET_ESUBSETS = new int[]{
+		UMLPackage.PROTOCOL_CONFORMANCE__GENERAL_MACHINE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -453,7 +456,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SOURCE_ESUBSETS = new int[]{UMLPackage.PROTOCOL_CONFORMANCE__SPECIFIC_MACHINE};
+	protected static final int[] SOURCE_ESUBSETS = new int[]{
+		UMLPackage.PROTOCOL_CONFORMANCE__SPECIFIC_MACHINE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolStateMachineImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolStateMachineImpl.java
index 37b9d6a..ecbe2cf 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolStateMachineImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolStateMachineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -137,8 +137,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -176,7 +176,8 @@
 	 */
 	public ProtocolConformance createConformance(
 			ProtocolStateMachine generalMachine) {
-		ProtocolConformance newConformance = (ProtocolConformance) create(UMLPackage.Literals.PROTOCOL_CONFORMANCE);
+		ProtocolConformance newConformance = (ProtocolConformance) create(
+			UMLPackage.Literals.PROTOCOL_CONFORMANCE);
 		getConformances().add(newConformance);
 		if (generalMachine != null)
 			newConformance.setGeneralMachine(generalMachine);
@@ -240,8 +241,8 @@
 	 */
 	public boolean validateDeepOrShallowHistory(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ProtocolStateMachineOperations.validateDeepOrShallowHistory(
-			this, diagnostics, context);
+		return ProtocolStateMachineOperations.validateDeepOrShallowHistory(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -285,10 +286,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__TEMPLATE_BINDING :
@@ -297,8 +298,7 @@
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							EOPPOSITE_FEATURE_BASE
 								- UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
@@ -327,7 +327,8 @@
 					msgs = ((InternalEObject) specification).eInverseRemove(
 						this, UMLPackage.BEHAVIORAL_FEATURE__METHOD,
 						BehavioralFeature.class, msgs);
-				return basicSetSpecification((BehavioralFeature) otherEnd, msgs);
+				return basicSetSpecification((BehavioralFeature) otherEnd,
+					msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__CONNECTION_POINT :
 				return ((InternalEList<InternalEObject>) (InternalEList<?>) getConnectionPoints())
 					.basicAdd(otherEnd, msgs);
@@ -354,90 +355,90 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PROTOCOL_STATE_MACHINE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_CONNECTOR :
-				return ((InternalEList<?>) getOwnedConnectors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedConnectors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__INTERFACE_REALIZATION :
 				return ((InternalEList<?>) getInterfaceRealizations())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_BEHAVIOR :
-				return ((InternalEList<?>) getOwnedBehaviors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedBehaviors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__NESTED_CLASSIFIER :
-				return ((InternalEList<?>) getNestedClassifiers()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedClassifiers())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_RECEPTION :
-				return ((InternalEList<?>) getOwnedReceptions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedReceptions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__SPECIFICATION :
 				return basicSetSpecification(null, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_PARAMETER :
-				return ((InternalEList<?>) getOwnedParameters()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedParameters())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_PARAMETER_SET :
 				return ((InternalEList<?>) getOwnedParameterSets())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__CONNECTION_POINT :
-				return ((InternalEList<?>) getConnectionPoints()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getConnectionPoints())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__SUBMACHINE_STATE :
-				return ((InternalEList<?>) getSubmachineStates()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubmachineStates())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__REGION :
 				return ((InternalEList<?>) getRegions()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.PROTOCOL_STATE_MACHINE__CONFORMANCE :
-				return ((InternalEList<?>) getConformances()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getConformances())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -617,13 +618,13 @@
 		switch (featureID) {
 			case UMLPackage.PROTOCOL_STATE_MACHINE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__NAME :
 				setName((String) newValue);
@@ -636,18 +637,18 @@
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -663,31 +664,31 @@
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -697,8 +698,8 @@
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__USE_CASE :
 				getUseCases().clear();
@@ -706,26 +707,26 @@
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -737,32 +738,31 @@
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__IS_ACTIVE :
 				setIsActive((Boolean) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__NESTED_CLASSIFIER :
 				getNestedClassifiers().clear();
-				getNestedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getNestedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_RECEPTION :
 				getOwnedReceptions().clear();
-				getOwnedReceptions().addAll(
-					(Collection<? extends Reception>) newValue);
+				getOwnedReceptions()
+					.addAll((Collection<? extends Reception>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__SUPER_CLASS :
 				getSuperClasses().clear();
-				getSuperClasses()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
+				getSuperClasses().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__SPECIFICATION :
 				setSpecification((BehavioralFeature) newValue);
@@ -772,38 +772,38 @@
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_PARAMETER :
 				getOwnedParameters().clear();
-				getOwnedParameters().addAll(
-					(Collection<? extends Parameter>) newValue);
+				getOwnedParameters()
+					.addAll((Collection<? extends Parameter>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_PARAMETER_SET :
 				getOwnedParameterSets().clear();
-				getOwnedParameterSets().addAll(
-					(Collection<? extends ParameterSet>) newValue);
+				getOwnedParameterSets()
+					.addAll((Collection<? extends ParameterSet>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__POSTCONDITION :
 				getPostconditions().clear();
-				getPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__PRECONDITION :
 				getPreconditions().clear();
-				getPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__REDEFINED_BEHAVIOR :
 				getRedefinedBehaviors().clear();
-				getRedefinedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getRedefinedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__CONNECTION_POINT :
 				getConnectionPoints().clear();
-				getConnectionPoints().addAll(
-					(Collection<? extends Pseudostate>) newValue);
+				getConnectionPoints()
+					.addAll((Collection<? extends Pseudostate>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__SUBMACHINE_STATE :
 				getSubmachineStates().clear();
-				getSubmachineStates().addAll(
-					(Collection<? extends State>) newValue);
+				getSubmachineStates()
+					.addAll((Collection<? extends State>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__REGION :
 				getRegions().clear();
@@ -811,8 +811,8 @@
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__EXTENDED_STATE_MACHINE :
 				getExtendedStateMachines().clear();
-				getExtendedStateMachines().addAll(
-					(Collection<? extends StateMachine>) newValue);
+				getExtendedStateMachines()
+					.addAll((Collection<? extends StateMachine>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__CONFORMANCE :
 				getConformances().clear();
@@ -1052,7 +1052,8 @@
 			case UMLPackage.PROTOCOL_STATE_MACHINE__IS_ABSTRACT :
 				return isSetIsAbstract();
 			case UMLPackage.PROTOCOL_STATE_MACHINE__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.PROTOCOL_STATE_MACHINE__USE_CASE :
@@ -1182,7 +1183,8 @@
 			case UMLPackage.PROTOCOL_STATE_MACHINE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PROTOCOL_STATE_MACHINE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PROTOCOL_STATE_MACHINE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PROTOCOL_STATE_MACHINE___GET_STEREOTYPE_APPLICATIONS :
@@ -1190,7 +1192,8 @@
 			case UMLPackage.PROTOCOL_STATE_MACHINE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PROTOCOL_STATE_MACHINE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PROTOCOL_STATE_MACHINE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1279,13 +1282,13 @@
 			case UMLPackage.PROTOCOL_STATE_MACHINE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.PROTOCOL_STATE_MACHINE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.PROTOCOL_STATE_MACHINE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.PROTOCOL_STATE_MACHINE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.PROTOCOL_STATE_MACHINE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.PROTOCOL_STATE_MACHINE___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1305,10 +1308,11 @@
 			case UMLPackage.PROTOCOL_STATE_MACHINE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.PROTOCOL_STATE_MACHINE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.PROTOCOL_STATE_MACHINE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.PROTOCOL_STATE_MACHINE___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.PROTOCOL_STATE_MACHINE___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1409,8 +1413,7 @@
 			case UMLPackage.PROTOCOL_STATE_MACHINE___GET_OWNED_PORTS :
 				return getOwnedPorts();
 			case UMLPackage.PROTOCOL_STATE_MACHINE___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.PROTOCOL_STATE_MACHINE___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
@@ -1465,7 +1468,8 @@
 					(DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.PROTOCOL_STATE_MACHINE___LCA__VERTEX_VERTEX :
-				return LCA((Vertex) arguments.get(0), (Vertex) arguments.get(1));
+				return LCA((Vertex) arguments.get(0),
+					(Vertex) arguments.get(1));
 			case UMLPackage.PROTOCOL_STATE_MACHINE___ANCESTOR__VERTEX_VERTEX :
 				return ancestor((Vertex) arguments.get(0),
 					(Vertex) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java
index 035d7e6..396b429 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -171,7 +171,8 @@
 			if (guard != oldGuard) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.PROTOCOL_TRANSITION__GUARD, oldGuard, guard));
+						UMLPackage.PROTOCOL_TRANSITION__GUARD, oldGuard,
+						guard));
 			}
 		}
 		return guard;
@@ -325,7 +326,8 @@
 	 * The array of superset feature identifiers for the '{@link #getReferreds() <em>Referred</em>}' reference list.
 	 * @see #getReferreds()
 	 */
-	protected static final int[] REFERRED_ESUPERSETS = new int[]{UMLPackage.PROTOCOL_TRANSITION__TRIGGER};
+	protected static final int[] REFERRED_ESUPERSETS = new int[]{
+		UMLPackage.PROTOCOL_TRANSITION__TRIGGER};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -337,9 +339,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Operation> referreds = (EList<Operation>) cache.get(
-				eResource, this,
-				UMLPackage.Literals.PROTOCOL_TRANSITION__REFERRED);
+			EList<Operation> referreds = (EList<Operation>) cache.get(eResource,
+				this, UMLPackage.Literals.PROTOCOL_TRANSITION__REFERRED);
 			if (referreds == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.PROTOCOL_TRANSITION__REFERRED,
@@ -358,8 +359,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Operation getReferred(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes) {
+	public Operation getReferred(String name, EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes) {
 		return getReferred(name, ownedParameterNames, ownedParameterTypes,
 			false);
 	}
@@ -369,9 +370,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Operation getReferred(String name,
-			EList<String> ownedParameterNames, EList<Type> ownedParameterTypes,
-			boolean ignoreCase) {
+	public Operation getReferred(String name, EList<String> ownedParameterNames,
+			EList<Type> ownedParameterTypes, boolean ignoreCase) {
 		referredLoop : for (Operation referred : getReferreds()) {
 			if (name != null && !(ignoreCase
 				? name.equalsIgnoreCase(referred.getName())
@@ -381,20 +381,19 @@
 			int ownedParameterListSize = ownedParameterList.size();
 			if (ownedParameterNames != null
 				&& ownedParameterNames.size() != ownedParameterListSize
-				|| (ownedParameterTypes != null && ownedParameterTypes.size() != ownedParameterListSize))
+				|| (ownedParameterTypes != null
+					&& ownedParameterTypes.size() != ownedParameterListSize))
 				continue referredLoop;
 			for (int j = 0; j < ownedParameterListSize; j++) {
 				Parameter ownedParameter = ownedParameterList.get(j);
-				if (ownedParameterNames != null
-					&& !(ignoreCase
-						? (ownedParameterNames.get(j))
-							.equalsIgnoreCase(ownedParameter.getName())
-						: ownedParameterNames.get(j).equals(
-							ownedParameter.getName())))
+				if (ownedParameterNames != null && !(ignoreCase
+					? (ownedParameterNames.get(j))
+						.equalsIgnoreCase(ownedParameter.getName())
+					: ownedParameterNames.get(j)
+						.equals(ownedParameter.getName())))
 					continue referredLoop;
-				if (ownedParameterTypes != null
-					&& !ownedParameterTypes.get(j).equals(
-						ownedParameter.getType()))
+				if (ownedParameterTypes != null && !ownedParameterTypes.get(j)
+					.equals(ownedParameter.getType()))
 					continue referredLoop;
 			}
 			return referred;
@@ -525,22 +524,22 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PROTOCOL_TRANSITION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_TRANSITION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_TRANSITION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.PROTOCOL_TRANSITION__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_TRANSITION__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_TRANSITION__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PROTOCOL_TRANSITION__EFFECT :
 				return basicSetEffect(null, msgs);
 			case UMLPackage.PROTOCOL_TRANSITION__TRIGGER :
@@ -657,13 +656,13 @@
 		switch (featureID) {
 			case UMLPackage.PROTOCOL_TRANSITION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_TRANSITION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_TRANSITION__NAME :
 				setName((String) newValue);
@@ -676,18 +675,18 @@
 				return;
 			case UMLPackage.PROTOCOL_TRANSITION__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_TRANSITION__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_TRANSITION__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.PROTOCOL_TRANSITION__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -927,7 +926,8 @@
 			case UMLPackage.PROTOCOL_TRANSITION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PROTOCOL_TRANSITION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PROTOCOL_TRANSITION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PROTOCOL_TRANSITION___GET_STEREOTYPE_APPLICATIONS :
@@ -935,7 +935,8 @@
 			case UMLPackage.PROTOCOL_TRANSITION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PROTOCOL_TRANSITION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PROTOCOL_TRANSITION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1024,13 +1025,13 @@
 			case UMLPackage.PROTOCOL_TRANSITION___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.PROTOCOL_TRANSITION___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.PROTOCOL_TRANSITION___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.PROTOCOL_TRANSITION___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.PROTOCOL_TRANSITION___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.PROTOCOL_TRANSITION___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1050,8 +1051,8 @@
 			case UMLPackage.PROTOCOL_TRANSITION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.PROTOCOL_TRANSITION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.PROTOCOL_TRANSITION___VALIDATE_STATE_IS_EXTERNAL__DIAGNOSTICCHAIN_MAP :
 				return validateStateIsExternal(
 					(DiagnosticChain) arguments.get(0),
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PseudostateImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PseudostateImpl.java
index 987c3ba..526d116 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PseudostateImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PseudostateImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -94,7 +94,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int KIND_EFLAG_DEFAULT = KIND_EDEFAULT.ordinal() << KIND_EFLAG_OFFSET;
+	protected static final int KIND_EFLAG_DEFAULT = KIND_EDEFAULT
+		.ordinal() << KIND_EFLAG_OFFSET;
 
 	/**
 	 * The array of enumeration values for '{@link PseudostateKind Pseudostate Kind}'
@@ -163,7 +164,8 @@
 	 * @generated
 	 */
 	public void setKind(PseudostateKind newKind) {
-		PseudostateKind oldKind = KIND_EFLAG_VALUES[(eFlags & KIND_EFLAG) >>> KIND_EFLAG_OFFSET];
+		PseudostateKind oldKind = KIND_EFLAG_VALUES[(eFlags
+			& KIND_EFLAG) >>> KIND_EFLAG_OFFSET];
 		if (newKind == null)
 			newKind = KIND_EDEFAULT;
 		eFlags = eFlags & ~KIND_EFLAG | newKind.ordinal() << KIND_EFLAG_OFFSET;
@@ -213,7 +215,8 @@
 	 */
 	public void setStateMachine(StateMachine newStateMachine) {
 		if (newStateMachine != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PSEUDOSTATE__STATE_MACHINE && newStateMachine != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PSEUDOSTATE__STATE_MACHINE
+				&& newStateMachine != null)) {
 			if (EcoreUtil.isAncestor(this, newStateMachine))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -274,7 +277,8 @@
 	 */
 	public void setState(State newState) {
 		if (newState != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.PSEUDOSTATE__STATE && newState != null)) {
+			|| (eContainerFeatureID() != UMLPackage.PSEUDOSTATE__STATE
+				&& newState != null)) {
 			if (EcoreUtil.isAncestor(this, newState))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -430,11 +434,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.PSEUDOSTATE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PSEUDOSTATE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.PSEUDOSTATE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.PSEUDOSTATE__CONTAINER :
@@ -537,13 +541,13 @@
 		switch (featureID) {
 			case UMLPackage.PSEUDOSTATE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.PSEUDOSTATE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.PSEUDOSTATE__NAME :
 				setName((String) newValue);
@@ -712,7 +716,8 @@
 			case UMLPackage.PSEUDOSTATE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.PSEUDOSTATE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PSEUDOSTATE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.PSEUDOSTATE___GET_STEREOTYPE_APPLICATIONS :
@@ -720,7 +725,8 @@
 			case UMLPackage.PSEUDOSTATE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.PSEUDOSTATE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.PSEUDOSTATE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -815,8 +821,7 @@
 					(DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.PSEUDOSTATE___VALIDATE_INITIAL_VERTEX__DIAGNOSTICCHAIN_MAP :
-				return validateInitialVertex(
-					(DiagnosticChain) arguments.get(0),
+				return validateInitialVertex((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.PSEUDOSTATE___VALIDATE_FORK_VERTEX__DIAGNOSTICCHAIN_MAP :
 				return validateForkVertex((DiagnosticChain) arguments.get(0),
@@ -841,8 +846,8 @@
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (kind: "); //$NON-NLS-1$
-		result
-			.append(KIND_EFLAG_VALUES[(eFlags & KIND_EFLAG) >>> KIND_EFLAG_OFFSET]);
+		result.append(
+			KIND_EFLAG_VALUES[(eFlags & KIND_EFLAG) >>> KIND_EFLAG_OFFSET]);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/QualifierValueImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/QualifierValueImpl.java
index 216ef03..71725f3 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/QualifierValueImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/QualifierValueImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -132,7 +132,8 @@
 		qualifier = newQualifier;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.QUALIFIER_VALUE__QUALIFIER, oldQualifier, qualifier));
+				UMLPackage.QUALIFIER_VALUE__QUALIFIER, oldQualifier,
+				qualifier));
 	}
 
 	/**
@@ -249,13 +250,13 @@
 		switch (featureID) {
 			case UMLPackage.QUALIFIER_VALUE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.QUALIFIER_VALUE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.QUALIFIER_VALUE__QUALIFIER :
 				setQualifier((Property) newValue);
@@ -372,7 +373,8 @@
 			case UMLPackage.QUALIFIER_VALUE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.QUALIFIER_VALUE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.QUALIFIER_VALUE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.QUALIFIER_VALUE___GET_STEREOTYPE_APPLICATIONS :
@@ -380,7 +382,8 @@
 			case UMLPackage.QUALIFIER_VALUE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.QUALIFIER_VALUE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.QUALIFIER_VALUE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RaiseExceptionActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RaiseExceptionActionImpl.java
index 80972ed..2b55b88 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RaiseExceptionActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RaiseExceptionActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -133,8 +133,8 @@
 				InternalEObject newException = (InternalEObject) exception;
 				NotificationChain msgs = oldException.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.RAISE_EXCEPTION_ACTION__EXCEPTION, null,
-					null);
+						- UMLPackage.RAISE_EXCEPTION_ACTION__EXCEPTION,
+					null, null);
 				if (newException.eInternalContainer() == null) {
 					msgs = newException.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
@@ -193,13 +193,13 @@
 			if (exception != null)
 				msgs = ((InternalEObject) exception).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.RAISE_EXCEPTION_ACTION__EXCEPTION, null,
-					msgs);
+						- UMLPackage.RAISE_EXCEPTION_ACTION__EXCEPTION,
+					null, msgs);
 			if (newException != null)
 				msgs = ((InternalEObject) newException).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.RAISE_EXCEPTION_ACTION__EXCEPTION, null,
-					msgs);
+						- UMLPackage.RAISE_EXCEPTION_ACTION__EXCEPTION,
+					null, msgs);
 			msgs = basicSetException(newException, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -243,11 +243,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.RAISE_EXCEPTION_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.RAISE_EXCEPTION_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.RAISE_EXCEPTION_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.RAISE_EXCEPTION_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -256,14 +256,14 @@
 			case UMLPackage.RAISE_EXCEPTION_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.RAISE_EXCEPTION_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.RAISE_EXCEPTION_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.RAISE_EXCEPTION_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.RAISE_EXCEPTION_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -374,13 +374,13 @@
 		switch (featureID) {
 			case UMLPackage.RAISE_EXCEPTION_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__NAME :
 				setName((String) newValue);
@@ -399,50 +399,49 @@
 				return;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__EXCEPTION :
 				setException((InputPin) newValue);
@@ -577,7 +576,8 @@
 			case UMLPackage.RAISE_EXCEPTION_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.RAISE_EXCEPTION_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.RAISE_EXCEPTION_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -600,7 +600,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.RAISE_EXCEPTION_ACTION__EXCEPTION};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.RAISE_EXCEPTION_ACTION__EXCEPTION};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadExtentActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadExtentActionImpl.java
index 8e5eca3..20ca425 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadExtentActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadExtentActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -132,12 +132,11 @@
 			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.READ_EXTENT_ACTION__OUTPUT,
-							OUTPUT_ESUBSETS));
+				cache.put(eResource, this, UMLPackage.Literals.ACTION__OUTPUT,
+					outputs = new DerivedUnionEObjectEList<OutputPin>(
+						OutputPin.class, this,
+						UMLPackage.READ_EXTENT_ACTION__OUTPUT,
+						OUTPUT_ESUBSETS));
 			}
 			return outputs;
 		}
@@ -156,12 +155,16 @@
 			result = (OutputPin) eResolveProxy(oldResult);
 			if (result != oldResult) {
 				InternalEObject newResult = (InternalEObject) result;
-				NotificationChain msgs = oldResult.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_EXTENT_ACTION__RESULT, null, null);
+				NotificationChain msgs = oldResult
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.READ_EXTENT_ACTION__RESULT,
+						null, null);
 				if (newResult.eInternalContainer() == null) {
-					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_EXTENT_ACTION__RESULT, null, msgs);
+					msgs = newResult.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.READ_EXTENT_ACTION__RESULT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -213,13 +216,17 @@
 		if (newResult != result) {
 			NotificationChain msgs = null;
 			if (result != null)
-				msgs = ((InternalEObject) result).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_EXTENT_ACTION__RESULT, null, msgs);
+				msgs = ((InternalEObject) result)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.READ_EXTENT_ACTION__RESULT,
+						null, msgs);
 			if (newResult != null)
-				msgs = ((InternalEObject) newResult).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_EXTENT_ACTION__RESULT, null, msgs);
+				msgs = ((InternalEObject) newResult)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.READ_EXTENT_ACTION__RESULT,
+						null, msgs);
 			msgs = basicSetResult(newResult, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -234,7 +241,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -317,11 +325,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.READ_EXTENT_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_EXTENT_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_EXTENT_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.READ_EXTENT_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -330,14 +338,14 @@
 			case UMLPackage.READ_EXTENT_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.READ_EXTENT_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_EXTENT_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_EXTENT_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_EXTENT_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -452,13 +460,13 @@
 		switch (featureID) {
 			case UMLPackage.READ_EXTENT_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.READ_EXTENT_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.READ_EXTENT_ACTION__NAME :
 				setName((String) newValue);
@@ -477,50 +485,49 @@
 				return;
 			case UMLPackage.READ_EXTENT_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.READ_EXTENT_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.READ_EXTENT_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_EXTENT_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_EXTENT_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.READ_EXTENT_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.READ_EXTENT_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.READ_EXTENT_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.READ_EXTENT_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_EXTENT_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_EXTENT_ACTION__CLASSIFIER :
 				setClassifier((Classifier) newValue);
@@ -661,7 +668,8 @@
 			case UMLPackage.READ_EXTENT_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.READ_EXTENT_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.READ_EXTENT_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -735,7 +743,8 @@
 			case UMLPackage.READ_EXTENT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.READ_EXTENT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_EXTENT_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.READ_EXTENT_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -743,7 +752,8 @@
 			case UMLPackage.READ_EXTENT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.READ_EXTENT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_EXTENT_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -820,8 +830,8 @@
 			case UMLPackage.READ_EXTENT_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_EXTENT_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_EXTENT_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.READ_EXTENT_ACTION___GET_CONTEXT :
@@ -852,7 +862,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.READ_EXTENT_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.READ_EXTENT_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadIsClassifiedObjectActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadIsClassifiedObjectActionImpl.java
index 2485543..47885c2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadIsClassifiedObjectActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadIsClassifiedObjectActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -243,9 +243,7 @@
 			classifier = (Classifier) eResolveProxy(oldClassifier);
 			if (classifier != oldClassifier) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__CLASSIFIER,
 						oldClassifier, classifier));
 			}
@@ -292,8 +290,9 @@
 						- UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__RESULT,
 					null, null);
 				if (newResult.eInternalContainer() == null) {
-					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__RESULT,
+					msgs = newResult.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__RESULT,
 						null, msgs);
 				}
 				if (msgs != null)
@@ -371,7 +370,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -396,8 +396,9 @@
 						- UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__OBJECT,
 					null, null);
 				if (newObject.eInternalContainer() == null) {
-					msgs = newObject.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__OBJECT,
+					msgs = newObject.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__OBJECT,
 						null, msgs);
 				}
 				if (msgs != null)
@@ -533,8 +534,8 @@
 	 */
 	public boolean validateBooleanResult(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ReadIsClassifiedObjectActionOperations.validateBooleanResult(
-			this, diagnostics, context);
+		return ReadIsClassifiedObjectActionOperations
+			.validateBooleanResult(this, diagnostics, context);
 	}
 
 	/**
@@ -547,11 +548,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -560,14 +561,14 @@
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -690,13 +691,13 @@
 		switch (featureID) {
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__NAME :
 				setName((String) newValue);
@@ -715,50 +716,49 @@
 				return;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__CLASSIFIER :
 				setClassifier((Classifier) newValue);
@@ -911,7 +911,8 @@
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -989,7 +990,8 @@
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -997,7 +999,8 @@
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1074,8 +1077,8 @@
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION___GET_CONTEXT :
@@ -1094,8 +1097,7 @@
 					(DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION___VALIDATE_BOOLEAN_RESULT__DIAGNOSTICCHAIN_MAP :
-				return validateBooleanResult(
-					(DiagnosticChain) arguments.get(0),
+				return validateBooleanResult((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION___VALIDATE_MULTIPLICITY_OF_INPUT__DIAGNOSTICCHAIN_MAP :
 				return validateMultiplicityOfInput(
@@ -1141,7 +1143,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__OBJECT};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__OBJECT};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getOutputs() <em>Output</em>}' reference list.
@@ -1151,7 +1154,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkActionImpl.java
index d117afb..c63864c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -147,16 +147,21 @@
 				InternalEObject newResult = (InternalEObject) result;
 				NotificationChain msgs = oldResult.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_LINK_ACTION__RESULT, null, null);
+						- UMLPackage.READ_LINK_ACTION__RESULT,
+					null, null);
 				if (newResult.eInternalContainer() == null) {
-					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_LINK_ACTION__RESULT, null, msgs);
+					msgs = newResult
+						.eInverseAdd(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.READ_LINK_ACTION__RESULT,
+							null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.READ_LINK_ACTION__RESULT, oldResult, result));
+						UMLPackage.READ_LINK_ACTION__RESULT, oldResult,
+						result));
 			}
 		}
 		return result;
@@ -203,11 +208,13 @@
 			if (result != null)
 				msgs = ((InternalEObject) result).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_LINK_ACTION__RESULT, null, msgs);
+						- UMLPackage.READ_LINK_ACTION__RESULT,
+					null, msgs);
 			if (newResult != null)
 				msgs = ((InternalEObject) newResult).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_LINK_ACTION__RESULT, null, msgs);
+						- UMLPackage.READ_LINK_ACTION__RESULT,
+					null, msgs);
 			msgs = basicSetResult(newResult, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -222,7 +229,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -305,11 +313,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.READ_LINK_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_LINK_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_LINK_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.READ_LINK_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -318,14 +326,14 @@
 			case UMLPackage.READ_LINK_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.READ_LINK_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_LINK_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_LINK_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_LINK_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -339,8 +347,8 @@
 				return ((InternalEList<?>) getEndData()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.READ_LINK_ACTION__INPUT_VALUE :
-				return ((InternalEList<?>) getInputValues()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInputValues())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_LINK_ACTION__RESULT :
 				return basicSetResult(null, msgs);
 		}
@@ -446,13 +454,13 @@
 		switch (featureID) {
 			case UMLPackage.READ_LINK_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__NAME :
 				setName((String) newValue);
@@ -471,60 +479,59 @@
 				return;
 			case UMLPackage.READ_LINK_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__END_DATA :
 				getEndData().clear();
-				getEndData().addAll(
-					(Collection<? extends LinkEndData>) newValue);
+				getEndData()
+					.addAll((Collection<? extends LinkEndData>) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__INPUT_VALUE :
 				getInputValues().clear();
-				getInputValues().addAll(
-					(Collection<? extends InputPin>) newValue);
+				getInputValues()
+					.addAll((Collection<? extends InputPin>) newValue);
 				return;
 			case UMLPackage.READ_LINK_ACTION__RESULT :
 				setResult((OutputPin) newValue);
@@ -665,7 +672,8 @@
 			case UMLPackage.READ_LINK_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.READ_LINK_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.READ_LINK_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -741,7 +749,8 @@
 			case UMLPackage.READ_LINK_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.READ_LINK_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_LINK_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.READ_LINK_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -749,7 +758,8 @@
 			case UMLPackage.READ_LINK_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.READ_LINK_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_LINK_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -826,8 +836,8 @@
 			case UMLPackage.READ_LINK_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_LINK_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_LINK_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.READ_LINK_ACTION___GET_CONTEXT :
@@ -882,7 +892,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.READ_LINK_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.READ_LINK_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndActionImpl.java
index d22c20f..6f83318 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -196,12 +196,13 @@
 				InternalEObject newObject = (InternalEObject) object;
 				NotificationChain msgs = oldObject.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_LINK_OBJECT_END_ACTION__OBJECT, null,
-					null);
+						- UMLPackage.READ_LINK_OBJECT_END_ACTION__OBJECT,
+					null, null);
 				if (newObject.eInternalContainer() == null) {
-					msgs = newObject.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_LINK_OBJECT_END_ACTION__OBJECT, null,
-						msgs);
+					msgs = newObject.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.READ_LINK_OBJECT_END_ACTION__OBJECT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -256,13 +257,13 @@
 			if (object != null)
 				msgs = ((InternalEObject) object).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_LINK_OBJECT_END_ACTION__OBJECT, null,
-					msgs);
+						- UMLPackage.READ_LINK_OBJECT_END_ACTION__OBJECT,
+					null, msgs);
 			if (newObject != null)
 				msgs = ((InternalEObject) newObject).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_LINK_OBJECT_END_ACTION__OBJECT, null,
-					msgs);
+						- UMLPackage.READ_LINK_OBJECT_END_ACTION__OBJECT,
+					null, msgs);
 			msgs = basicSetObject(newObject, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -350,12 +351,13 @@
 				InternalEObject newResult = (InternalEObject) result;
 				NotificationChain msgs = oldResult.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_LINK_OBJECT_END_ACTION__RESULT, null,
-					null);
+						- UMLPackage.READ_LINK_OBJECT_END_ACTION__RESULT,
+					null, null);
 				if (newResult.eInternalContainer() == null) {
-					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_LINK_OBJECT_END_ACTION__RESULT, null,
-						msgs);
+					msgs = newResult.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.READ_LINK_OBJECT_END_ACTION__RESULT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -410,13 +412,13 @@
 			if (result != null)
 				msgs = ((InternalEObject) result).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_LINK_OBJECT_END_ACTION__RESULT, null,
-					msgs);
+						- UMLPackage.READ_LINK_OBJECT_END_ACTION__RESULT,
+					null, msgs);
 			if (newResult != null)
 				msgs = ((InternalEObject) newResult).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_LINK_OBJECT_END_ACTION__RESULT, null,
-					msgs);
+						- UMLPackage.READ_LINK_OBJECT_END_ACTION__RESULT,
+					null, msgs);
 			msgs = basicSetResult(newResult, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -432,7 +434,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -457,8 +460,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateAssociationOfAssociation(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateAssociationOfAssociation(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return ReadLinkObjectEndActionOperations
 			.validateAssociationOfAssociation(this, diagnostics, context);
 	}
@@ -470,8 +473,8 @@
 	 */
 	public boolean validateEndsOfAssociation(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ReadLinkObjectEndActionOperations.validateEndsOfAssociation(
-			this, diagnostics, context);
+		return ReadLinkObjectEndActionOperations.validateEndsOfAssociation(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -492,8 +495,8 @@
 	 */
 	public boolean validateMultiplicityOfObject(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ReadLinkObjectEndActionOperations.validateMultiplicityOfObject(
-			this, diagnostics, context);
+		return ReadLinkObjectEndActionOperations
+			.validateMultiplicityOfObject(this, diagnostics, context);
 	}
 
 	/**
@@ -514,8 +517,8 @@
 	 */
 	public boolean validateMultiplicityOfResult(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ReadLinkObjectEndActionOperations.validateMultiplicityOfResult(
-			this, diagnostics, context);
+		return ReadLinkObjectEndActionOperations
+			.validateMultiplicityOfResult(this, diagnostics, context);
 	}
 
 	/**
@@ -528,11 +531,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -541,14 +544,14 @@
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -669,13 +672,13 @@
 		switch (featureID) {
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__NAME :
 				setName((String) newValue);
@@ -694,50 +697,49 @@
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__END :
 				setEnd((Property) newValue);
@@ -884,7 +886,8 @@
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -960,7 +963,8 @@
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -968,7 +972,8 @@
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1045,8 +1050,8 @@
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.READ_LINK_OBJECT_END_ACTION___GET_CONTEXT :
@@ -1094,7 +1099,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.READ_LINK_OBJECT_END_ACTION__OBJECT};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.READ_LINK_OBJECT_END_ACTION__OBJECT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1115,7 +1121,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.READ_LINK_OBJECT_END_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.READ_LINK_OBJECT_END_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndQualifierActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndQualifierActionImpl.java
index 3a178b6..b31cb00 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndQualifierActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadLinkObjectEndQualifierActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -145,16 +145,11 @@
 			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.READ_LINK_OBJECT_END_QUALIFIER_ACTION__INPUT,
-							INPUT_ESUBSETS));
+				cache.put(eResource, this, UMLPackage.Literals.ACTION__INPUT,
+					inputs = new DerivedUnionEObjectEList<InputPin>(
+						InputPin.class, this,
+						UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__INPUT,
+						INPUT_ESUBSETS));
 			}
 			return inputs;
 		}
@@ -177,16 +172,11 @@
 			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.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OUTPUT,
-							OUTPUT_ESUBSETS));
+				cache.put(eResource, this, UMLPackage.Literals.ACTION__OUTPUT,
+					outputs = new DerivedUnionEObjectEList<OutputPin>(
+						OutputPin.class, this,
+						UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OUTPUT,
+						OUTPUT_ESUBSETS));
 			}
 			return outputs;
 		}
@@ -206,26 +196,20 @@
 			object = (InputPin) eResolveProxy(oldObject);
 			if (object != oldObject) {
 				InternalEObject newObject = (InternalEObject) object;
-				NotificationChain msgs = oldObject
-					.eInverseRemove(
-						this,
+				NotificationChain msgs = oldObject.eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT,
+					null, null);
+				if (newObject.eInternalContainer() == null) {
+					msgs = newObject.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
 							- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT,
-						null, null);
-				if (newObject.eInternalContainer() == null) {
-					msgs = newObject
-						.eInverseAdd(
-							this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT,
-							null, msgs);
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT,
 						oldObject, object));
 			}
@@ -273,19 +257,15 @@
 		if (newObject != object) {
 			NotificationChain msgs = null;
 			if (object != null)
-				msgs = ((InternalEObject) object)
-					.eInverseRemove(
-						this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT,
-						null, msgs);
+				msgs = ((InternalEObject) object).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT,
+					null, msgs);
 			if (newObject != null)
-				msgs = ((InternalEObject) newObject)
-					.eInverseAdd(
-						this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT,
-						null, msgs);
+				msgs = ((InternalEObject) newObject).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT,
+					null, msgs);
 			msgs = basicSetObject(newObject, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -330,26 +310,20 @@
 			result = (OutputPin) eResolveProxy(oldResult);
 			if (result != oldResult) {
 				InternalEObject newResult = (InternalEObject) result;
-				NotificationChain msgs = oldResult
-					.eInverseRemove(
-						this,
+				NotificationChain msgs = oldResult.eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__RESULT,
+					null, null);
+				if (newResult.eInternalContainer() == null) {
+					msgs = newResult.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
 							- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__RESULT,
-						null, null);
-				if (newResult.eInternalContainer() == null) {
-					msgs = newResult
-						.eInverseAdd(
-							this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__RESULT,
-							null, msgs);
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__RESULT,
 						oldResult, result));
 			}
@@ -397,19 +371,15 @@
 		if (newResult != result) {
 			NotificationChain msgs = null;
 			if (result != null)
-				msgs = ((InternalEObject) result)
-					.eInverseRemove(
-						this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__RESULT,
-						null, msgs);
+				msgs = ((InternalEObject) result).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__RESULT,
+					null, msgs);
 			if (newResult != null)
-				msgs = ((InternalEObject) newResult)
-					.eInverseAdd(
-						this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__RESULT,
-						null, msgs);
+				msgs = ((InternalEObject) newResult).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__RESULT,
+					null, msgs);
 			msgs = basicSetResult(newResult, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -425,7 +395,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -445,9 +416,7 @@
 			qualifier = (Property) eResolveProxy(oldQualifier);
 			if (qualifier != oldQualifier) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__QUALIFIER,
 						oldQualifier, qualifier));
 			}
@@ -494,8 +463,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateAssociationOfAssociation(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateAssociationOfAssociation(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return ReadLinkObjectEndQualifierActionOperations
 			.validateAssociationOfAssociation(this, diagnostics, context);
 	}
@@ -518,8 +487,8 @@
 	 */
 	public boolean validateTypeOfObject(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ReadLinkObjectEndQualifierActionOperations.validateTypeOfObject(
-			this, diagnostics, context);
+		return ReadLinkObjectEndQualifierActionOperations
+			.validateTypeOfObject(this, diagnostics, context);
 	}
 
 	/**
@@ -551,8 +520,8 @@
 	 */
 	public boolean validateSameType(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ReadLinkObjectEndQualifierActionOperations.validateSameType(
-			this, diagnostics, context);
+		return ReadLinkObjectEndQualifierActionOperations.validateSameType(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -576,11 +545,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -589,14 +558,14 @@
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -717,13 +686,13 @@
 		switch (featureID) {
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__NAME :
 				setName((String) newValue);
@@ -742,50 +711,49 @@
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT :
 				setObject((InputPin) newValue);
@@ -932,7 +900,8 @@
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -1008,7 +977,8 @@
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -1016,7 +986,8 @@
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1093,8 +1064,8 @@
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION___GET_CONTEXT :
@@ -1147,7 +1118,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1168,7 +1140,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadSelfActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadSelfActionImpl.java
index 1cba120..e9b006b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadSelfActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadSelfActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -144,16 +144,21 @@
 				InternalEObject newResult = (InternalEObject) result;
 				NotificationChain msgs = oldResult.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_SELF_ACTION__RESULT, null, null);
+						- UMLPackage.READ_SELF_ACTION__RESULT,
+					null, null);
 				if (newResult.eInternalContainer() == null) {
-					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_SELF_ACTION__RESULT, null, msgs);
+					msgs = newResult
+						.eInverseAdd(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.READ_SELF_ACTION__RESULT,
+							null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.READ_SELF_ACTION__RESULT, oldResult, result));
+						UMLPackage.READ_SELF_ACTION__RESULT, oldResult,
+						result));
 			}
 		}
 		return result;
@@ -200,11 +205,13 @@
 			if (result != null)
 				msgs = ((InternalEObject) result).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_SELF_ACTION__RESULT, null, msgs);
+						- UMLPackage.READ_SELF_ACTION__RESULT,
+					null, msgs);
 			if (newResult != null)
 				msgs = ((InternalEObject) newResult).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_SELF_ACTION__RESULT, null, msgs);
+						- UMLPackage.READ_SELF_ACTION__RESULT,
+					null, msgs);
 			msgs = basicSetResult(newResult, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -219,7 +226,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -257,8 +265,8 @@
 	 */
 	public boolean validateType(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ReadSelfActionOperations
-			.validateType(this, diagnostics, context);
+		return ReadSelfActionOperations.validateType(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -282,11 +290,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.READ_SELF_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_SELF_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_SELF_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.READ_SELF_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -295,14 +303,14 @@
 			case UMLPackage.READ_SELF_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.READ_SELF_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_SELF_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_SELF_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_SELF_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -413,13 +421,13 @@
 		switch (featureID) {
 			case UMLPackage.READ_SELF_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.READ_SELF_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.READ_SELF_ACTION__NAME :
 				setName((String) newValue);
@@ -438,50 +446,49 @@
 				return;
 			case UMLPackage.READ_SELF_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.READ_SELF_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.READ_SELF_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_SELF_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_SELF_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.READ_SELF_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.READ_SELF_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.READ_SELF_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.READ_SELF_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_SELF_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_SELF_ACTION__RESULT :
 				setResult((OutputPin) newValue);
@@ -616,7 +623,8 @@
 			case UMLPackage.READ_SELF_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.READ_SELF_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.READ_SELF_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -688,7 +696,8 @@
 			case UMLPackage.READ_SELF_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.READ_SELF_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_SELF_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.READ_SELF_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -696,7 +705,8 @@
 			case UMLPackage.READ_SELF_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.READ_SELF_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_SELF_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -773,8 +783,8 @@
 			case UMLPackage.READ_SELF_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_SELF_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_SELF_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.READ_SELF_ACTION___GET_CONTEXT :
@@ -809,7 +819,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.READ_SELF_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.READ_SELF_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadStructuralFeatureActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadStructuralFeatureActionImpl.java
index 456b560..28ad017 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadStructuralFeatureActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadStructuralFeatureActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -150,8 +150,9 @@
 						- UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__RESULT,
 					null, null);
 				if (newResult.eInternalContainer() == null) {
-					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__RESULT,
+					msgs = newResult.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__RESULT,
 						null, msgs);
 				}
 				if (msgs != null)
@@ -229,7 +230,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -245,8 +247,8 @@
 	 */
 	public boolean validateTypeAndOrdering(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ReadStructuralFeatureActionOperations.validateTypeAndOrdering(
-			this, diagnostics, context);
+		return ReadStructuralFeatureActionOperations
+			.validateTypeAndOrdering(this, diagnostics, context);
 	}
 
 	/**
@@ -271,11 +273,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -284,14 +286,14 @@
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -412,13 +414,13 @@
 		switch (featureID) {
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__NAME :
 				setName((String) newValue);
@@ -437,50 +439,49 @@
 				return;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__OBJECT :
 				setObject((InputPin) newValue);
@@ -627,7 +628,8 @@
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -703,7 +705,8 @@
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -711,7 +714,8 @@
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -788,8 +792,8 @@
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION___GET_CONTEXT :
@@ -832,7 +836,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.READ_STRUCTURAL_FEATURE_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadVariableActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadVariableActionImpl.java
index ea73fdf..5e21f89 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadVariableActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReadVariableActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -144,12 +144,16 @@
 			result = (OutputPin) eResolveProxy(oldResult);
 			if (result != oldResult) {
 				InternalEObject newResult = (InternalEObject) result;
-				NotificationChain msgs = oldResult.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_VARIABLE_ACTION__RESULT, null, null);
+				NotificationChain msgs = oldResult
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.READ_VARIABLE_ACTION__RESULT,
+						null, null);
 				if (newResult.eInternalContainer() == null) {
-					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_VARIABLE_ACTION__RESULT, null, msgs);
+					msgs = newResult.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.READ_VARIABLE_ACTION__RESULT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -201,13 +205,17 @@
 		if (newResult != result) {
 			NotificationChain msgs = null;
 			if (result != null)
-				msgs = ((InternalEObject) result).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_VARIABLE_ACTION__RESULT, null, msgs);
+				msgs = ((InternalEObject) result)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.READ_VARIABLE_ACTION__RESULT,
+						null, msgs);
 			if (newResult != null)
-				msgs = ((InternalEObject) newResult).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.READ_VARIABLE_ACTION__RESULT, null, msgs);
+				msgs = ((InternalEObject) newResult)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.READ_VARIABLE_ACTION__RESULT,
+						null, msgs);
 			msgs = basicSetResult(newResult, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -222,7 +230,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -249,8 +258,8 @@
 	 */
 	public boolean validateCompatibleMultiplicity(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ReadVariableActionOperations.validateCompatibleMultiplicity(
-			this, diagnostics, context);
+		return ReadVariableActionOperations.validateCompatibleMultiplicity(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -263,11 +272,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.READ_VARIABLE_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_VARIABLE_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_VARIABLE_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.READ_VARIABLE_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -276,14 +285,14 @@
 			case UMLPackage.READ_VARIABLE_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.READ_VARIABLE_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_VARIABLE_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.READ_VARIABLE_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.READ_VARIABLE_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -398,13 +407,13 @@
 		switch (featureID) {
 			case UMLPackage.READ_VARIABLE_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.READ_VARIABLE_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.READ_VARIABLE_ACTION__NAME :
 				setName((String) newValue);
@@ -423,50 +432,49 @@
 				return;
 			case UMLPackage.READ_VARIABLE_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.READ_VARIABLE_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.READ_VARIABLE_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_VARIABLE_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.READ_VARIABLE_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.READ_VARIABLE_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.READ_VARIABLE_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.READ_VARIABLE_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.READ_VARIABLE_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_VARIABLE_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.READ_VARIABLE_ACTION__VARIABLE :
 				setVariable((Variable) newValue);
@@ -607,7 +615,8 @@
 			case UMLPackage.READ_VARIABLE_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.READ_VARIABLE_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.READ_VARIABLE_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -681,7 +690,8 @@
 			case UMLPackage.READ_VARIABLE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.READ_VARIABLE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_VARIABLE_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.READ_VARIABLE_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -689,7 +699,8 @@
 			case UMLPackage.READ_VARIABLE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.READ_VARIABLE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.READ_VARIABLE_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -766,8 +777,8 @@
 			case UMLPackage.READ_VARIABLE_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_VARIABLE_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.READ_VARIABLE_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.READ_VARIABLE_ACTION___GET_CONTEXT :
@@ -802,7 +813,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.READ_VARIABLE_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.READ_VARIABLE_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceptionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceptionImpl.java
index 27d7894..63a880d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceptionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReceptionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -246,13 +246,13 @@
 		switch (featureID) {
 			case UMLPackage.RECEPTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.RECEPTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.RECEPTION__NAME :
 				setName((String) newValue);
@@ -265,18 +265,18 @@
 				return;
 			case UMLPackage.RECEPTION__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.RECEPTION__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.RECEPTION__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.RECEPTION__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -296,18 +296,18 @@
 				return;
 			case UMLPackage.RECEPTION__OWNED_PARAMETER :
 				getOwnedParameters().clear();
-				getOwnedParameters().addAll(
-					(Collection<? extends Parameter>) newValue);
+				getOwnedParameters()
+					.addAll((Collection<? extends Parameter>) newValue);
 				return;
 			case UMLPackage.RECEPTION__OWNED_PARAMETER_SET :
 				getOwnedParameterSets().clear();
-				getOwnedParameterSets().addAll(
-					(Collection<? extends ParameterSet>) newValue);
+				getOwnedParameterSets()
+					.addAll((Collection<? extends ParameterSet>) newValue);
 				return;
 			case UMLPackage.RECEPTION__RAISED_EXCEPTION :
 				getRaisedExceptions().clear();
-				getRaisedExceptions().addAll(
-					(Collection<? extends Type>) newValue);
+				getRaisedExceptions()
+					.addAll((Collection<? extends Type>) newValue);
 				return;
 			case UMLPackage.RECEPTION__SIGNAL :
 				setSignal((Signal) newValue);
@@ -432,9 +432,11 @@
 			case UMLPackage.RECEPTION__IS_STATIC :
 				return ((eFlags & IS_STATIC_EFLAG) != 0) != IS_STATIC_EDEFAULT;
 			case UMLPackage.RECEPTION__CONCURRENCY :
-				return (eFlags & CONCURRENCY_EFLAG) != CONCURRENCY_EFLAG_DEFAULT;
+				return (eFlags
+					& CONCURRENCY_EFLAG) != CONCURRENCY_EFLAG_DEFAULT;
 			case UMLPackage.RECEPTION__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.RECEPTION__METHOD :
 				return methods != null && !methods.isEmpty();
 			case UMLPackage.RECEPTION__OWNED_PARAMETER :
@@ -507,7 +509,8 @@
 			case UMLPackage.RECEPTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.RECEPTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.RECEPTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.RECEPTION___GET_STEREOTYPE_APPLICATIONS :
@@ -515,7 +518,8 @@
 			case UMLPackage.RECEPTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.RECEPTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.RECEPTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -604,13 +608,13 @@
 			case UMLPackage.RECEPTION___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.RECEPTION___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.RECEPTION___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.RECEPTION___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.RECEPTION___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.RECEPTION___MEMBERS_ARE_DISTINGUISHABLE :
@@ -630,8 +634,8 @@
 			case UMLPackage.RECEPTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.RECEPTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.RECEPTION___VALIDATE_ABSTRACT_NO_METHOD__DIAGNOSTICCHAIN_MAP :
 				return validateAbstractNoMethod(
 					(DiagnosticChain) arguments.get(0),
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReclassifyObjectActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReclassifyObjectActionImpl.java
index 1fa6858..a51bfa2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReclassifyObjectActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReclassifyObjectActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -301,12 +301,13 @@
 				InternalEObject newObject = (InternalEObject) object;
 				NotificationChain msgs = oldObject.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.RECLASSIFY_OBJECT_ACTION__OBJECT, null,
-					null);
+						- UMLPackage.RECLASSIFY_OBJECT_ACTION__OBJECT,
+					null, null);
 				if (newObject.eInternalContainer() == null) {
-					msgs = newObject.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.RECLASSIFY_OBJECT_ACTION__OBJECT, null,
-						msgs);
+					msgs = newObject.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.RECLASSIFY_OBJECT_ACTION__OBJECT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -360,13 +361,13 @@
 			if (object != null)
 				msgs = ((InternalEObject) object).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.RECLASSIFY_OBJECT_ACTION__OBJECT, null,
-					msgs);
+						- UMLPackage.RECLASSIFY_OBJECT_ACTION__OBJECT,
+					null, msgs);
 			if (newObject != null)
 				msgs = ((InternalEObject) newObject).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.RECLASSIFY_OBJECT_ACTION__OBJECT, null,
-					msgs);
+						- UMLPackage.RECLASSIFY_OBJECT_ACTION__OBJECT,
+					null, msgs);
 			msgs = basicSetObject(newObject, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -407,8 +408,8 @@
 	 */
 	public boolean validateClassifierNotAbstract(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return ReclassifyObjectActionOperations.validateClassifierNotAbstract(
-			this, diagnostics, context);
+		return ReclassifyObjectActionOperations
+			.validateClassifierNotAbstract(this, diagnostics, context);
 	}
 
 	/**
@@ -443,11 +444,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -456,14 +457,14 @@
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -580,13 +581,13 @@
 		switch (featureID) {
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__NAME :
 				setName((String) newValue);
@@ -605,66 +606,65 @@
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__IS_REPLACE_ALL :
 				setIsReplaceAll((Boolean) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__NEW_CLASSIFIER :
 				getNewClassifiers().clear();
-				getNewClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getNewClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__OBJECT :
 				setObject((InputPin) newValue);
 				return;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__OLD_CLASSIFIER :
 				getOldClassifiers().clear();
-				getOldClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getOldClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -805,7 +805,8 @@
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -815,7 +816,8 @@
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__OUTPUT :
 				return isSetOutputs();
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__IS_REPLACE_ALL :
-				return ((eFlags & IS_REPLACE_ALL_EFLAG) != 0) != IS_REPLACE_ALL_EDEFAULT;
+				return ((eFlags
+					& IS_REPLACE_ALL_EFLAG) != 0) != IS_REPLACE_ALL_EDEFAULT;
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__NEW_CLASSIFIER :
 				return newClassifiers != null && !newClassifiers.isEmpty();
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION__OBJECT :
@@ -883,7 +885,8 @@
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -891,7 +894,8 @@
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -968,8 +972,8 @@
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.RECLASSIFY_OBJECT_ACTION___GET_CONTEXT :
@@ -1019,7 +1023,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.RECLASSIFY_OBJECT_ACTION__OBJECT};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.RECLASSIFY_OBJECT_ACTION__OBJECT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableElementImpl.java
index a8145c2..dd69113 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableElementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -118,15 +118,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT);
 			if (redefinedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
-						redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
-							RedefinableElement.class, this,
-							UMLPackage.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
-							null));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
+					redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
+						RedefinableElement.class, this,
+						UMLPackage.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
+						null));
 			}
 			return redefinedElements;
 		}
@@ -174,21 +171,15 @@
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
 			EList<Classifier> redefinitionContexts = (EList<Classifier>) cache
-				.get(
-					eResource,
-					this,
+				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 			if (redefinitionContexts == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-						redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class,
-							this,
-							UMLPackage.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-							null));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+					redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+						null));
 			}
 			return redefinitionContexts;
 		}
@@ -200,7 +191,8 @@
 	 * The array of subset feature identifiers for the '{@link #getRedefinitionContexts() <em>Redefinition Context</em>}' reference list.
 	 * @see #getRedefinitionContexts()
 	 */
-	protected static final int[] REDEFINITION_CONTEXT_ESUBSETS = new int[]{UMLPackage.REDEFINABLE_ELEMENT__OWNER};
+	protected static final int[] REDEFINITION_CONTEXT_ESUBSETS = new int[]{
+		UMLPackage.REDEFINABLE_ELEMENT__OWNER};
 
 	public EList<Classifier> getRedefinitionContexts() {
 		CacheAdapter cache = getCacheAdapter();
@@ -208,21 +200,15 @@
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
 			EList<Classifier> redefinitionContexts = (EList<Classifier>) cache
-				.get(
-					eResource,
-					this,
+				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 			if (redefinitionContexts == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-						redefinitionContexts = new DerivedEObjectEList<Classifier>(
-							Classifier.class,
-							this,
-							UMLPackage.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-							REDEFINITION_CONTEXT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+					redefinitionContexts = new DerivedEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+						REDEFINITION_CONTEXT_ESUBSETS));
 			}
 			return redefinitionContexts;
 		}
@@ -289,10 +275,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateRedefinitionContextValid(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return RedefinableElementOperations.validateRedefinitionContextValid(
-			this, diagnostics, context);
+	public boolean validateRedefinitionContextValid(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return RedefinableElementOperations
+			.validateRedefinitionContextValid(this, diagnostics, context);
 	}
 
 	/**
@@ -302,8 +288,8 @@
 	 */
 	public boolean validateRedefinitionConsistent(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return RedefinableElementOperations.validateRedefinitionConsistent(
-			this, diagnostics, context);
+		return RedefinableElementOperations.validateRedefinitionConsistent(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -383,13 +369,13 @@
 		switch (featureID) {
 			case UMLPackage.REDEFINABLE_ELEMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.REDEFINABLE_ELEMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.REDEFINABLE_ELEMENT__NAME :
 				setName((String) newValue);
@@ -534,7 +520,8 @@
 			case UMLPackage.REDEFINABLE_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.REDEFINABLE_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REDEFINABLE_ELEMENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.REDEFINABLE_ELEMENT___GET_STEREOTYPE_APPLICATIONS :
@@ -542,7 +529,8 @@
 			case UMLPackage.REDEFINABLE_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.REDEFINABLE_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REDEFINABLE_ELEMENT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -619,8 +607,8 @@
 			case UMLPackage.REDEFINABLE_ELEMENT___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.REDEFINABLE_ELEMENT___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 		}
 		return eDynamicInvoke(operationID, arguments);
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableTemplateSignatureImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableTemplateSignatureImpl.java
index 777a6db..8c83c1d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableTemplateSignatureImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableTemplateSignatureImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 386760, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 386760, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -145,19 +145,15 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
-						ownedElements = new DerivedUnionEObjectEList<Element>(
-							Element.class,
-							this,
-							UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__OWNED_ELEMENT,
-							OWNED_ELEMENT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
+					ownedElements = new DerivedUnionEObjectEList<Element>(
+						Element.class, this,
+						UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__OWNED_ELEMENT,
+						OWNED_ELEMENT_ESUBSETS));
 			}
 			return ownedElements;
 		}
@@ -235,7 +231,8 @@
 		}
 
 		if (newTemplate != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__TEMPLATE && newTemplate != null)) {
+			|| (eContainerFeatureID() != UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__TEMPLATE
+				&& newTemplate != null)) {
 			if (EcoreUtil.isAncestor(this, newTemplate))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -286,7 +283,8 @@
 	 * @generated
 	 */
 	public TemplateParameter createOwnedParameter(EClass eClass) {
-		TemplateParameter newOwnedParameter = (TemplateParameter) create(eClass);
+		TemplateParameter newOwnedParameter = (TemplateParameter) create(
+			eClass);
 		getOwnedParameters().add(newOwnedParameter);
 		return newOwnedParameter;
 	}
@@ -315,16 +313,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT);
 			if (redefinedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
-						redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
-							RedefinableElement.class,
-							this,
-							UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__REDEFINED_ELEMENT,
-							REDEFINED_ELEMENT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
+					redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
+						RedefinableElement.class, this,
+						UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__REDEFINED_ELEMENT,
+						REDEFINED_ELEMENT_ESUBSETS));
 			}
 			return redefinedElements;
 		}
@@ -346,21 +340,15 @@
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
 			EList<Classifier> redefinitionContexts = (EList<Classifier>) cache
-				.get(
-					eResource,
-					this,
+				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 			if (redefinitionContexts == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-						redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
-							Classifier.class,
-							this,
-							UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__REDEFINITION_CONTEXT,
-							REDEFINITION_CONTEXT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+					redefinitionContexts = new DerivedUnionEObjectEList<Classifier>(
+						Classifier.class, this,
+						UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__REDEFINITION_CONTEXT,
+						REDEFINITION_CONTEXT_ESUBSETS));
 			}
 			return redefinitionContexts;
 		}
@@ -419,16 +407,13 @@
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
 			EList<TemplateParameter> result = (EList<TemplateParameter>) cache
-				.get(
-					this,
+				.get(this,
 					UMLPackage.Literals.REDEFINABLE_TEMPLATE_SIGNATURE__INHERITED_PARAMETER);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.REDEFINABLE_TEMPLATE_SIGNATURE__INHERITED_PARAMETER,
-						result = RedefinableTemplateSignatureOperations
-							.getInheritedParameters(this));
+				cache.put(this,
+					UMLPackage.Literals.REDEFINABLE_TEMPLATE_SIGNATURE__INHERITED_PARAMETER,
+					result = RedefinableTemplateSignatureOperations
+						.getInheritedParameters(this));
 			}
 			return result;
 		}
@@ -497,8 +482,8 @@
 	 */
 	public boolean validateRedefinesParents(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return RedefinableTemplateSignatureOperations.validateRedefinesParents(
-			this, diagnostics, context);
+		return RedefinableTemplateSignatureOperations
+			.validateRedefinesParents(this, diagnostics, context);
 	}
 
 	/**
@@ -546,18 +531,18 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__TEMPLATE :
 				return basicSetTemplate(null, msgs);
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__OWNED_PARAMETER :
-				return ((InternalEList<?>) getOwnedParameters()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedParameters())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -644,13 +629,13 @@
 		switch (featureID) {
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__NAME :
 				setName((String) newValue);
@@ -666,22 +651,21 @@
 				return;
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__PARAMETER :
 				getParameters().clear();
-				getParameters().addAll(
-					(Collection<? extends TemplateParameter>) newValue);
+				getParameters()
+					.addAll((Collection<? extends TemplateParameter>) newValue);
 				return;
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__TEMPLATE :
 				setTemplate((TemplateableElement) newValue);
 				return;
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__OWNED_PARAMETER :
 				getOwnedParameters().clear();
-				getOwnedParameters().addAll(
-					(Collection<? extends TemplateParameter>) newValue);
+				getOwnedParameters()
+					.addAll((Collection<? extends TemplateParameter>) newValue);
 				return;
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__EXTENDED_SIGNATURE :
 				getExtendedSignatures().clear();
-				getExtendedSignatures()
-					.addAll(
-						(Collection<? extends RedefinableTemplateSignature>) newValue);
+				getExtendedSignatures().addAll(
+					(Collection<? extends RedefinableTemplateSignature>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -799,7 +783,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == TemplateSignature.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__PARAMETER :
@@ -821,7 +806,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == TemplateSignature.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.TEMPLATE_SIGNATURE__PARAMETER :
@@ -914,7 +900,8 @@
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE___GET_STEREOTYPE_APPLICATIONS :
@@ -922,7 +909,8 @@
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -999,8 +987,8 @@
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE___VALIDATE_OWN_ELEMENTS__DIAGNOSTICCHAIN_MAP :
 				return validateOwnElements((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
@@ -1039,7 +1027,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] PARAMETER_ESUBSETS = new int[]{UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__OWNED_PARAMETER};
+	protected static final int[] PARAMETER_ESUBSETS = new int[]{
+		UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__OWNED_PARAMETER};
 
 	/**
 	 * The array of superset feature identifiers for the '{@link #getOwnedParameters() <em>Owned Parameter</em>}' containment reference list.
@@ -1049,7 +1038,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_PARAMETER_ESUPERSETS = new int[]{UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__PARAMETER};
+	protected static final int[] OWNED_PARAMETER_ESUPERSETS = new int[]{
+		UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__PARAMETER};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1095,7 +1085,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__EXTENDED_SIGNATURE};
+	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{
+		UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__EXTENDED_SIGNATURE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1104,8 +1095,8 @@
 	 */
 	@Override
 	public boolean isSetOwnedElements() {
-		return super.isSetOwnedElements()
-			|| eIsSet(UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__OWNED_PARAMETER);
+		return super.isSetOwnedElements() || eIsSet(
+			UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__OWNED_PARAMETER);
 	}
 
 	/**
@@ -1115,8 +1106,8 @@
 	 */
 	@Override
 	public boolean isSetRedefinedElements() {
-		return super.isSetRedefinedElements()
-			|| eIsSet(UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__EXTENDED_SIGNATURE);
+		return super.isSetRedefinedElements() || eIsSet(
+			UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__EXTENDED_SIGNATURE);
 	}
 
 	/**
@@ -1127,7 +1118,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINITION_CONTEXT_ESUBSETS = new int[]{UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__CLASSIFIER};
+	protected static final int[] REDEFINITION_CONTEXT_ESUBSETS = new int[]{
+		UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__CLASSIFIER};
 
 	/**
 	 * The array of superset feature identifiers for the '{@link #getInheritedParameters() <em>Inherited Parameter</em>}' reference list.
@@ -1137,7 +1129,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INHERITED_PARAMETER_ESUPERSETS = new int[]{UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__PARAMETER};
+	protected static final int[] INHERITED_PARAMETER_ESUPERSETS = new int[]{
+		UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__PARAMETER};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReduceActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReduceActionImpl.java
index fc471ac..79b6324 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReduceActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReduceActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -168,8 +168,8 @@
 			if (outputs == null) {
 				cache.put(eResource, this, UMLPackage.Literals.ACTION__OUTPUT,
 					outputs = new DerivedUnionEObjectEList<OutputPin>(
-						OutputPin.class, this,
-						UMLPackage.REDUCE_ACTION__OUTPUT, OUTPUT_ESUBSETS));
+						OutputPin.class, this, UMLPackage.REDUCE_ACTION__OUTPUT,
+						OUTPUT_ESUBSETS));
 			}
 			return outputs;
 		}
@@ -214,7 +214,8 @@
 			if (reducer != oldReducer) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.REDUCE_ACTION__REDUCER, oldReducer, reducer));
+						UMLPackage.REDUCE_ACTION__REDUCER, oldReducer,
+						reducer));
 			}
 		}
 		return reducer;
@@ -330,7 +331,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -352,11 +354,14 @@
 				InternalEObject newCollection = (InternalEObject) collection;
 				NotificationChain msgs = oldCollection.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.REDUCE_ACTION__COLLECTION, null, null);
+						- UMLPackage.REDUCE_ACTION__COLLECTION,
+					null, null);
 				if (newCollection.eInternalContainer() == null) {
-					msgs = newCollection.eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.REDUCE_ACTION__COLLECTION, null, msgs);
+					msgs = newCollection
+						.eInverseAdd(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.REDUCE_ACTION__COLLECTION,
+							null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -410,11 +415,13 @@
 			if (collection != null)
 				msgs = ((InternalEObject) collection).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.REDUCE_ACTION__COLLECTION, null, msgs);
+						- UMLPackage.REDUCE_ACTION__COLLECTION,
+					null, msgs);
 			if (newCollection != null)
 				msgs = ((InternalEObject) newCollection).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.REDUCE_ACTION__COLLECTION, null, msgs);
+						- UMLPackage.REDUCE_ACTION__COLLECTION,
+					null, msgs);
 			msgs = basicSetCollection(newCollection, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -490,8 +497,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateOutputTypesAreCompatible(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateOutputTypesAreCompatible(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return ReduceActionOperations.validateOutputTypesAreCompatible(this,
 			diagnostics, context);
 	}
@@ -517,11 +524,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.REDUCE_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REDUCE_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REDUCE_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.REDUCE_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -530,14 +537,14 @@
 			case UMLPackage.REDUCE_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.REDUCE_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.REDUCE_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.REDUCE_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REDUCE_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -660,13 +667,13 @@
 		switch (featureID) {
 			case UMLPackage.REDUCE_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.REDUCE_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.REDUCE_ACTION__NAME :
 				setName((String) newValue);
@@ -685,50 +692,49 @@
 				return;
 			case UMLPackage.REDUCE_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.REDUCE_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.REDUCE_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.REDUCE_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.REDUCE_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.REDUCE_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.REDUCE_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.REDUCE_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.REDUCE_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.REDUCE_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.REDUCE_ACTION__COLLECTION :
 				setCollection((InputPin) newValue);
@@ -881,7 +887,8 @@
 			case UMLPackage.REDUCE_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.REDUCE_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.REDUCE_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -893,7 +900,8 @@
 			case UMLPackage.REDUCE_ACTION__COLLECTION :
 				return collection != null;
 			case UMLPackage.REDUCE_ACTION__IS_ORDERED :
-				return ((eFlags & IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
+				return ((eFlags
+					& IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
 			case UMLPackage.REDUCE_ACTION__REDUCER :
 				return reducer != null;
 			case UMLPackage.REDUCE_ACTION__RESULT :
@@ -959,7 +967,8 @@
 			case UMLPackage.REDUCE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.REDUCE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REDUCE_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.REDUCE_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -967,7 +976,8 @@
 			case UMLPackage.REDUCE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.REDUCE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REDUCE_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1044,8 +1054,8 @@
 			case UMLPackage.REDUCE_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.REDUCE_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.REDUCE_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.REDUCE_ACTION___GET_CONTEXT :
@@ -1107,7 +1117,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.REDUCE_ACTION__COLLECTION};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.REDUCE_ACTION__COLLECTION};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getOutputs() <em>Output</em>}' reference list.
@@ -1117,7 +1128,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.REDUCE_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.REDUCE_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RegionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RegionImpl.java
index cc150a0..191c5eb 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RegionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RegionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -173,15 +173,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT);
 			if (redefinedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
-						redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
-							RedefinableElement.class, this,
-							UMLPackage.REGION__REDEFINED_ELEMENT,
-							REDEFINED_ELEMENT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
+					redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
+						RedefinableElement.class, this,
+						UMLPackage.REGION__REDEFINED_ELEMENT,
+						REDEFINED_ELEMENT_ESUBSETS));
 			}
 			return redefinedElements;
 		}
@@ -208,15 +205,12 @@
 				List<Classifier> redefinitionContexts = redefinitionContext == null
 					? Collections.<Classifier> emptyList()
 					: Collections.singletonList(redefinitionContext);
-				cache
-					.put(
-						this,
+				cache.put(this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+					result = new EcoreEList.UnmodifiableEList<Classifier>(this,
 						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-						result = new EcoreEList.UnmodifiableEList<Classifier>(
-							this,
-							UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-							redefinitionContexts.size(), redefinitionContexts
-								.toArray()));
+						redefinitionContexts.size(),
+						redefinitionContexts.toArray()));
 			}
 
 			return result;
@@ -307,15 +301,12 @@
 			EList<NamedElement> ownedMembers = (EList<NamedElement>) cache.get(
 				eResource, this, UMLPackage.Literals.NAMESPACE__OWNED_MEMBER);
 			if (ownedMembers == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.NAMESPACE__OWNED_MEMBER,
-						ownedMembers = new DerivedUnionEObjectEList<NamedElement>(
-							NamedElement.class, this,
-							UMLPackage.REGION__OWNED_MEMBER,
-							OWNED_MEMBER_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.NAMESPACE__OWNED_MEMBER,
+					ownedMembers = new DerivedUnionEObjectEList<NamedElement>(
+						NamedElement.class, this,
+						UMLPackage.REGION__OWNED_MEMBER,
+						OWNED_MEMBER_ESUBSETS));
 			}
 			return ownedMembers;
 		}
@@ -487,7 +478,8 @@
 	 */
 	public void setState(State newState) {
 		if (newState != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.REGION__STATE && newState != null)) {
+			|| (eContainerFeatureID() != UMLPackage.REGION__STATE
+				&& newState != null)) {
 			if (EcoreUtil.isAncestor(this, newState))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -588,7 +580,8 @@
 	 */
 	public void setStateMachine(StateMachine newStateMachine) {
 		if (newStateMachine != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.REGION__STATE_MACHINE && newStateMachine != null)) {
+			|| (eContainerFeatureID() != UMLPackage.REGION__STATE_MACHINE
+				&& newStateMachine != null)) {
 			if (EcoreUtil.isAncestor(this, newStateMachine))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -612,10 +605,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateRedefinitionContextValid(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return RedefinableElementOperations.validateRedefinitionContextValid(
-			this, diagnostics, context);
+	public boolean validateRedefinitionContextValid(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return RedefinableElementOperations
+			.validateRedefinitionContextValid(this, diagnostics, context);
 	}
 
 	/**
@@ -625,8 +618,8 @@
 	 */
 	public boolean validateRedefinitionConsistent(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return RedefinableElementOperations.validateRedefinitionConsistent(
-			this, diagnostics, context);
+		return RedefinableElementOperations.validateRedefinitionConsistent(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -780,32 +773,32 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.REGION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REGION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REGION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.REGION__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REGION__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REGION__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REGION__STATE :
 				return basicSetState(null, msgs);
 			case UMLPackage.REGION__STATE_MACHINE :
 				return basicSetStateMachine(null, msgs);
 			case UMLPackage.REGION__TRANSITION :
-				return ((InternalEList<?>) getTransitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTransitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REGION__SUBVERTEX :
-				return ((InternalEList<?>) getSubvertices()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubvertices())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -912,13 +905,13 @@
 		switch (featureID) {
 			case UMLPackage.REGION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.REGION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.REGION__NAME :
 				setName((String) newValue);
@@ -931,18 +924,18 @@
 				return;
 			case UMLPackage.REGION__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.REGION__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.REGION__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.REGION__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -958,8 +951,8 @@
 				return;
 			case UMLPackage.REGION__TRANSITION :
 				getTransitions().clear();
-				getTransitions().addAll(
-					(Collection<? extends Transition>) newValue);
+				getTransitions()
+					.addAll((Collection<? extends Transition>) newValue);
 				return;
 			case UMLPackage.REGION__SUBVERTEX :
 				getSubvertices().clear();
@@ -1092,7 +1085,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == RedefinableElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.REGION__IS_LEAF :
@@ -1114,7 +1108,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == RedefinableElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.REDEFINABLE_ELEMENT__IS_LEAF :
@@ -1213,7 +1208,8 @@
 			case UMLPackage.REGION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.REGION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REGION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.REGION___GET_STEREOTYPE_APPLICATIONS :
@@ -1221,7 +1217,8 @@
 			case UMLPackage.REGION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.REGION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REGION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1310,13 +1307,13 @@
 			case UMLPackage.REGION___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.REGION___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.REGION___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.REGION___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.REGION___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.REGION___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1336,8 +1333,8 @@
 			case UMLPackage.REGION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.REGION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.REGION___VALIDATE_DEEP_HISTORY_VERTEX__DIAGNOSTICCHAIN_MAP :
 				return validateDeepHistoryVertex(
 					(DiagnosticChain) arguments.get(0),
@@ -1350,8 +1347,7 @@
 				return validateOwned((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.REGION___VALIDATE_INITIAL_VERTEX__DIAGNOSTICCHAIN_MAP :
-				return validateInitialVertex(
-					(DiagnosticChain) arguments.get(0),
+				return validateInitialVertex((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.REGION___BELONGS_TO_PSM :
 				return belongsToPSM();
@@ -1388,7 +1384,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{UMLPackage.REGION__EXTENDED_REGION};
+	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{
+		UMLPackage.REGION__EXTENDED_REGION};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveStructuralFeatureValueActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveStructuralFeatureValueActionImpl.java
index 7c76932..a1272ed 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveStructuralFeatureValueActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveStructuralFeatureValueActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -144,16 +144,11 @@
 			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.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__INPUT,
-							INPUT_ESUBSETS));
+				cache.put(eResource, this, UMLPackage.Literals.ACTION__INPUT,
+					inputs = new DerivedUnionEObjectEList<InputPin>(
+						InputPin.class, this,
+						UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__INPUT,
+						INPUT_ESUBSETS));
 			}
 			return inputs;
 		}
@@ -177,15 +172,14 @@
 	 * @generated
 	 */
 	public void setIsRemoveDuplicates(boolean newIsRemoveDuplicates) {
-		boolean oldIsRemoveDuplicates = (eFlags & IS_REMOVE_DUPLICATES_EFLAG) != 0;
+		boolean oldIsRemoveDuplicates = (eFlags
+			& IS_REMOVE_DUPLICATES_EFLAG) != 0;
 		if (newIsRemoveDuplicates)
 			eFlags |= IS_REMOVE_DUPLICATES_EFLAG;
 		else
 			eFlags &= ~IS_REMOVE_DUPLICATES_EFLAG;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(
-				this,
-				Notification.SET,
+			eNotify(new ENotificationImpl(this, Notification.SET,
 				UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REMOVE_DUPLICATES,
 				oldIsRemoveDuplicates, newIsRemoveDuplicates));
 	}
@@ -201,26 +195,20 @@
 			removeAt = (InputPin) eResolveProxy(oldRemoveAt);
 			if (removeAt != oldRemoveAt) {
 				InternalEObject newRemoveAt = (InternalEObject) removeAt;
-				NotificationChain msgs = oldRemoveAt
-					.eInverseRemove(
-						this,
+				NotificationChain msgs = oldRemoveAt.eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT,
+					null, null);
+				if (newRemoveAt.eInternalContainer() == null) {
+					msgs = newRemoveAt.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
 							- UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT,
-						null, null);
-				if (newRemoveAt.eInternalContainer() == null) {
-					msgs = newRemoveAt
-						.eInverseAdd(
-							this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT,
-							null, msgs);
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT,
 						oldRemoveAt, removeAt));
 			}
@@ -268,19 +256,15 @@
 		if (newRemoveAt != removeAt) {
 			NotificationChain msgs = null;
 			if (removeAt != null)
-				msgs = ((InternalEObject) removeAt)
-					.eInverseRemove(
-						this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT,
-						null, msgs);
+				msgs = ((InternalEObject) removeAt).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT,
+					null, msgs);
 			if (newRemoveAt != null)
-				msgs = ((InternalEObject) newRemoveAt)
-					.eInverseAdd(
-						this,
-						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT,
-						null, msgs);
+				msgs = ((InternalEObject) newRemoveAt).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT,
+					null, msgs);
 			msgs = basicSetRemoveAt(newRemoveAt, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -335,11 +319,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -348,14 +332,14 @@
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -490,13 +474,13 @@
 		switch (featureID) {
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__NAME :
 				setName((String) newValue);
@@ -515,50 +499,49 @@
 				return;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__OBJECT :
 				setObject((InputPin) newValue);
@@ -723,7 +706,8 @@
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -741,7 +725,8 @@
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__VALUE :
 				return value != null;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__IS_REMOVE_DUPLICATES :
-				return ((eFlags & IS_REMOVE_DUPLICATES_EFLAG) != 0) != IS_REMOVE_DUPLICATES_EDEFAULT;
+				return ((eFlags
+					& IS_REMOVE_DUPLICATES_EFLAG) != 0) != IS_REMOVE_DUPLICATES_EDEFAULT;
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT :
 				return removeAt != null;
 		}
@@ -805,7 +790,8 @@
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -813,7 +799,8 @@
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -890,8 +877,8 @@
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION___GET_CONTEXT :
@@ -977,8 +964,8 @@
 	 */
 	@Override
 	public boolean isSetInputs() {
-		return super.isSetInputs()
-			|| eIsSet(UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT);
+		return super.isSetInputs() || eIsSet(
+			UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT);
 	}
 
 } //RemoveStructuralFeatureValueActionImpl
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveVariableValueActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveVariableValueActionImpl.java
index 4291d90..955f2a2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveVariableValueActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RemoveVariableValueActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -170,7 +170,8 @@
 	 * @generated
 	 */
 	public void setIsRemoveDuplicates(boolean newIsRemoveDuplicates) {
-		boolean oldIsRemoveDuplicates = (eFlags & IS_REMOVE_DUPLICATES_EFLAG) != 0;
+		boolean oldIsRemoveDuplicates = (eFlags
+			& IS_REMOVE_DUPLICATES_EFLAG) != 0;
 		if (newIsRemoveDuplicates)
 			eFlags |= IS_REMOVE_DUPLICATES_EFLAG;
 		else
@@ -197,8 +198,9 @@
 						- UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__REMOVE_AT,
 					null, null);
 				if (newRemoveAt.eInternalContainer() == null) {
-					msgs = newRemoveAt.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__REMOVE_AT,
+					msgs = newRemoveAt.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__REMOVE_AT,
 						null, msgs);
 				}
 				if (msgs != null)
@@ -233,8 +235,8 @@
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this,
 				Notification.SET,
-				UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__REMOVE_AT,
-				oldRemoveAt, newRemoveAt);
+				UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__REMOVE_AT, oldRemoveAt,
+				newRemoveAt);
 			if (msgs == null)
 				msgs = notification;
 			else
@@ -266,8 +268,8 @@
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__REMOVE_AT,
-				newRemoveAt, newRemoveAt));
+				UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__REMOVE_AT, newRemoveAt,
+				newRemoveAt));
 	}
 
 	/**
@@ -301,8 +303,8 @@
 	 */
 	public boolean validateRemoveAtAndValue(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return RemoveVariableValueActionOperations.validateRemoveAtAndValue(
-			this, diagnostics, context);
+		return RemoveVariableValueActionOperations
+			.validateRemoveAtAndValue(this, diagnostics, context);
 	}
 
 	/**
@@ -315,11 +317,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -328,14 +330,14 @@
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -458,13 +460,13 @@
 		switch (featureID) {
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__NAME :
 				setName((String) newValue);
@@ -483,50 +485,49 @@
 				return;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__VARIABLE :
 				setVariable((Variable) newValue);
@@ -679,7 +680,8 @@
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -693,7 +695,8 @@
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__VALUE :
 				return value != null;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__IS_REMOVE_DUPLICATES :
-				return ((eFlags & IS_REMOVE_DUPLICATES_EFLAG) != 0) != IS_REMOVE_DUPLICATES_EDEFAULT;
+				return ((eFlags
+					& IS_REMOVE_DUPLICATES_EFLAG) != 0) != IS_REMOVE_DUPLICATES_EDEFAULT;
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION__REMOVE_AT :
 				return removeAt != null;
 		}
@@ -757,7 +760,8 @@
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -765,7 +769,8 @@
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -842,8 +847,8 @@
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION___GET_CONTEXT :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReplyActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReplyActionImpl.java
index 62bfe62..4651b77 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReplyActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ReplyActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -209,9 +209,10 @@
 			if (returnInformation != oldReturnInformation) {
 				InternalEObject newReturnInformation = (InternalEObject) returnInformation;
 				NotificationChain msgs = oldReturnInformation.eInverseRemove(
-					this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.REPLY_ACTION__RETURN_INFORMATION, null,
-					null);
+					this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.REPLY_ACTION__RETURN_INFORMATION,
+					null, null);
 				if (newReturnInformation.eInternalContainer() == null) {
 					msgs = newReturnInformation.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
@@ -269,14 +270,16 @@
 			NotificationChain msgs = null;
 			if (returnInformation != null)
 				msgs = ((InternalEObject) returnInformation).eInverseRemove(
-					this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.REPLY_ACTION__RETURN_INFORMATION, null,
-					msgs);
+					this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.REPLY_ACTION__RETURN_INFORMATION,
+					null, msgs);
 			if (newReturnInformation != null)
 				msgs = ((InternalEObject) newReturnInformation).eInverseAdd(
-					this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.REPLY_ACTION__RETURN_INFORMATION, null,
-					msgs);
+					this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.REPLY_ACTION__RETURN_INFORMATION,
+					null, msgs);
 			msgs = basicSetReturnInformation(newReturnInformation, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -413,11 +416,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.REPLY_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REPLY_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REPLY_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.REPLY_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -426,14 +429,14 @@
 			case UMLPackage.REPLY_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.REPLY_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.REPLY_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.REPLY_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REPLY_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -444,8 +447,8 @@
 				return ((InternalEList<?>) getLocalPreconditions())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REPLY_ACTION__REPLY_VALUE :
-				return ((InternalEList<?>) getReplyValues()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getReplyValues())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.REPLY_ACTION__RETURN_INFORMATION :
 				return basicSetReturnInformation(null, msgs);
 		}
@@ -553,13 +556,13 @@
 		switch (featureID) {
 			case UMLPackage.REPLY_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__NAME :
 				setName((String) newValue);
@@ -578,58 +581,57 @@
 				return;
 			case UMLPackage.REPLY_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__REPLY_TO_CALL :
 				setReplyToCall((Trigger) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__REPLY_VALUE :
 				getReplyValues().clear();
-				getReplyValues().addAll(
-					(Collection<? extends InputPin>) newValue);
+				getReplyValues()
+					.addAll((Collection<? extends InputPin>) newValue);
 				return;
 			case UMLPackage.REPLY_ACTION__RETURN_INFORMATION :
 				setReturnInformation((InputPin) newValue);
@@ -770,7 +772,8 @@
 			case UMLPackage.REPLY_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.REPLY_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.REPLY_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -846,7 +849,8 @@
 			case UMLPackage.REPLY_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.REPLY_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REPLY_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.REPLY_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -854,7 +858,8 @@
 			case UMLPackage.REPLY_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.REPLY_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.REPLY_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -931,8 +936,8 @@
 			case UMLPackage.REPLY_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.REPLY_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.REPLY_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.REPLY_ACTION___GET_CONTEXT :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendObjectActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendObjectActionImpl.java
index afccc72..b422229 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendObjectActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendObjectActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -152,12 +152,16 @@
 			target = (InputPin) eResolveProxy(oldTarget);
 			if (target != oldTarget) {
 				InternalEObject newTarget = (InternalEObject) target;
-				NotificationChain msgs = oldTarget.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.SEND_OBJECT_ACTION__TARGET, null, null);
+				NotificationChain msgs = oldTarget
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.SEND_OBJECT_ACTION__TARGET,
+						null, null);
 				if (newTarget.eInternalContainer() == null) {
-					msgs = newTarget.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.SEND_OBJECT_ACTION__TARGET, null, msgs);
+					msgs = newTarget.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.SEND_OBJECT_ACTION__TARGET,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -209,13 +213,17 @@
 		if (newTarget != target) {
 			NotificationChain msgs = null;
 			if (target != null)
-				msgs = ((InternalEObject) target).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.SEND_OBJECT_ACTION__TARGET, null, msgs);
+				msgs = ((InternalEObject) target)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.SEND_OBJECT_ACTION__TARGET,
+						null, msgs);
 			if (newTarget != null)
-				msgs = ((InternalEObject) newTarget).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.SEND_OBJECT_ACTION__TARGET, null, msgs);
+				msgs = ((InternalEObject) newTarget)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.SEND_OBJECT_ACTION__TARGET,
+						null, msgs);
 			msgs = basicSetTarget(newTarget, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -270,12 +278,16 @@
 			request = (InputPin) eResolveProxy(oldRequest);
 			if (request != oldRequest) {
 				InternalEObject newRequest = (InternalEObject) request;
-				NotificationChain msgs = oldRequest.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.SEND_OBJECT_ACTION__REQUEST, null, null);
+				NotificationChain msgs = oldRequest
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.SEND_OBJECT_ACTION__REQUEST,
+						null, null);
 				if (newRequest.eInternalContainer() == null) {
-					msgs = newRequest.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.SEND_OBJECT_ACTION__REQUEST, null, msgs);
+					msgs = newRequest.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.SEND_OBJECT_ACTION__REQUEST,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -327,19 +339,24 @@
 		if (newRequest != request) {
 			NotificationChain msgs = null;
 			if (request != null)
-				msgs = ((InternalEObject) request).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.SEND_OBJECT_ACTION__REQUEST, null, msgs);
+				msgs = ((InternalEObject) request)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.SEND_OBJECT_ACTION__REQUEST,
+						null, msgs);
 			if (newRequest != null)
-				msgs = ((InternalEObject) newRequest).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.SEND_OBJECT_ACTION__REQUEST, null, msgs);
+				msgs = ((InternalEObject) newRequest)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.SEND_OBJECT_ACTION__REQUEST,
+						null, msgs);
 			msgs = basicSetRequest(newRequest, msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.SEND_OBJECT_ACTION__REQUEST, newRequest, newRequest));
+				UMLPackage.SEND_OBJECT_ACTION__REQUEST, newRequest,
+				newRequest));
 	}
 
 	/**
@@ -385,11 +402,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.SEND_OBJECT_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEND_OBJECT_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEND_OBJECT_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.SEND_OBJECT_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -398,14 +415,14 @@
 			case UMLPackage.SEND_OBJECT_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.SEND_OBJECT_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.SEND_OBJECT_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.SEND_OBJECT_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEND_OBJECT_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -416,8 +433,8 @@
 				return ((InternalEList<?>) getLocalPreconditions())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEND_OBJECT_ACTION__ARGUMENT :
-				return ((InternalEList<?>) getArguments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getArguments()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.SEND_OBJECT_ACTION__REQUEST :
 				return basicSetRequest(null, msgs);
 			case UMLPackage.SEND_OBJECT_ACTION__TARGET :
@@ -531,13 +548,13 @@
 		switch (featureID) {
 			case UMLPackage.SEND_OBJECT_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.SEND_OBJECT_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.SEND_OBJECT_ACTION__NAME :
 				setName((String) newValue);
@@ -556,50 +573,49 @@
 				return;
 			case UMLPackage.SEND_OBJECT_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.SEND_OBJECT_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.SEND_OBJECT_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.SEND_OBJECT_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.SEND_OBJECT_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.SEND_OBJECT_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.SEND_OBJECT_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.SEND_OBJECT_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.SEND_OBJECT_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.SEND_OBJECT_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.SEND_OBJECT_ACTION__ARGUMENT :
 				getArguments().clear();
@@ -754,7 +770,8 @@
 			case UMLPackage.SEND_OBJECT_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.SEND_OBJECT_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.SEND_OBJECT_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -832,7 +849,8 @@
 			case UMLPackage.SEND_OBJECT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.SEND_OBJECT_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.SEND_OBJECT_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.SEND_OBJECT_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -840,7 +858,8 @@
 			case UMLPackage.SEND_OBJECT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.SEND_OBJECT_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.SEND_OBJECT_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -917,8 +936,8 @@
 			case UMLPackage.SEND_OBJECT_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.SEND_OBJECT_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.SEND_OBJECT_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.SEND_OBJECT_ACTION___GET_CONTEXT :
@@ -930,8 +949,7 @@
 			case UMLPackage.SEND_OBJECT_ACTION___CONTAINING_BEHAVIOR :
 				return containingBehavior();
 			case UMLPackage.SEND_OBJECT_ACTION___VALIDATE_TYPE_TARGET_PIN__DIAGNOSTICCHAIN_MAP :
-				return validateTypeTargetPin(
-					(DiagnosticChain) arguments.get(0),
+				return validateTypeTargetPin((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 		}
 		return eDynamicInvoke(operationID, arguments);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendSignalActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendSignalActionImpl.java
index 192563d..0025dab 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendSignalActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SendSignalActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -155,12 +155,16 @@
 			target = (InputPin) eResolveProxy(oldTarget);
 			if (target != oldTarget) {
 				InternalEObject newTarget = (InternalEObject) target;
-				NotificationChain msgs = oldTarget.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.SEND_SIGNAL_ACTION__TARGET, null, null);
+				NotificationChain msgs = oldTarget
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.SEND_SIGNAL_ACTION__TARGET,
+						null, null);
 				if (newTarget.eInternalContainer() == null) {
-					msgs = newTarget.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.SEND_SIGNAL_ACTION__TARGET, null, msgs);
+					msgs = newTarget.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.SEND_SIGNAL_ACTION__TARGET,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -212,13 +216,17 @@
 		if (newTarget != target) {
 			NotificationChain msgs = null;
 			if (target != null)
-				msgs = ((InternalEObject) target).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.SEND_SIGNAL_ACTION__TARGET, null, msgs);
+				msgs = ((InternalEObject) target)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.SEND_SIGNAL_ACTION__TARGET,
+						null, msgs);
 			if (newTarget != null)
-				msgs = ((InternalEObject) newTarget).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.SEND_SIGNAL_ACTION__TARGET, null, msgs);
+				msgs = ((InternalEObject) newTarget)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.SEND_SIGNAL_ACTION__TARGET,
+						null, msgs);
 			msgs = basicSetTarget(newTarget, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -299,8 +307,8 @@
 	 */
 	public boolean validateNumberOrder(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return SendSignalActionOperations.validateNumberOrder(this,
-			diagnostics, context);
+		return SendSignalActionOperations.validateNumberOrder(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -319,10 +327,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateTypeOrderingMultiplicity(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return SendSignalActionOperations.validateTypeOrderingMultiplicity(
-			this, diagnostics, context);
+	public boolean validateTypeOrderingMultiplicity(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return SendSignalActionOperations.validateTypeOrderingMultiplicity(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -335,11 +343,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.SEND_SIGNAL_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEND_SIGNAL_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEND_SIGNAL_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.SEND_SIGNAL_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -348,14 +356,14 @@
 			case UMLPackage.SEND_SIGNAL_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.SEND_SIGNAL_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.SEND_SIGNAL_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.SEND_SIGNAL_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEND_SIGNAL_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -366,8 +374,8 @@
 				return ((InternalEList<?>) getLocalPreconditions())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEND_SIGNAL_ACTION__ARGUMENT :
-				return ((InternalEList<?>) getArguments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getArguments()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.SEND_SIGNAL_ACTION__TARGET :
 				return basicSetTarget(null, msgs);
 		}
@@ -479,13 +487,13 @@
 		switch (featureID) {
 			case UMLPackage.SEND_SIGNAL_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.SEND_SIGNAL_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.SEND_SIGNAL_ACTION__NAME :
 				setName((String) newValue);
@@ -504,50 +512,49 @@
 				return;
 			case UMLPackage.SEND_SIGNAL_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.SEND_SIGNAL_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.SEND_SIGNAL_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.SEND_SIGNAL_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.SEND_SIGNAL_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.SEND_SIGNAL_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.SEND_SIGNAL_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.SEND_SIGNAL_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.SEND_SIGNAL_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.SEND_SIGNAL_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.SEND_SIGNAL_ACTION__ARGUMENT :
 				getArguments().clear();
@@ -702,7 +709,8 @@
 			case UMLPackage.SEND_SIGNAL_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.SEND_SIGNAL_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.SEND_SIGNAL_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -780,7 +788,8 @@
 			case UMLPackage.SEND_SIGNAL_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.SEND_SIGNAL_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.SEND_SIGNAL_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.SEND_SIGNAL_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -788,7 +797,8 @@
 			case UMLPackage.SEND_SIGNAL_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.SEND_SIGNAL_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.SEND_SIGNAL_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -865,8 +875,8 @@
 			case UMLPackage.SEND_SIGNAL_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.SEND_SIGNAL_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.SEND_SIGNAL_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.SEND_SIGNAL_ACTION___GET_CONTEXT :
@@ -885,8 +895,7 @@
 				return validateNumberOrder((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.SEND_SIGNAL_ACTION___VALIDATE_TYPE_TARGET_PIN__DIAGNOSTICCHAIN_MAP :
-				return validateTypeTargetPin(
-					(DiagnosticChain) arguments.get(0),
+				return validateTypeTargetPin((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 		}
 		return eDynamicInvoke(operationID, arguments);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SequenceNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SequenceNodeImpl.java
index 08c9440..1bb387e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SequenceNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SequenceNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -221,11 +221,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.SEQUENCE_NODE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEQUENCE_NODE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEQUENCE_NODE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.SEQUENCE_NODE__IN_INTERRUPTIBLE_REGION :
@@ -234,14 +234,14 @@
 			case UMLPackage.SEQUENCE_NODE__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.SEQUENCE_NODE__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.SEQUENCE_NODE__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.SEQUENCE_NODE__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEQUENCE_NODE__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -252,14 +252,14 @@
 				return ((InternalEList<?>) getLocalPreconditions())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEQUENCE_NODE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEQUENCE_NODE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEQUENCE_NODE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEQUENCE_NODE__EDGE :
 				return ((InternalEList<?>) getEdges()).basicRemove(otherEnd,
 					msgs);
@@ -270,14 +270,14 @@
 				return ((InternalEList<?>) getStructuredNodeOutputs())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SEQUENCE_NODE__VARIABLE :
-				return ((InternalEList<?>) getVariables()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getVariables()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.SEQUENCE_NODE__NODE :
 				return ((InternalEList<?>) getNodes()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.SEQUENCE_NODE__EXECUTABLE_NODE :
-				return ((InternalEList<?>) getExecutableNodes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getExecutableNodes())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -413,13 +413,13 @@
 		switch (featureID) {
 			case UMLPackage.SEQUENCE_NODE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__NAME :
 				setName((String) newValue);
@@ -438,65 +438,64 @@
 				return;
 			case UMLPackage.SEQUENCE_NODE__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__IN_ACTIVITY :
 				setInActivity((Activity) newValue);
@@ -511,13 +510,13 @@
 				return;
 			case UMLPackage.SEQUENCE_NODE__STRUCTURED_NODE_INPUT :
 				getStructuredNodeInputs().clear();
-				getStructuredNodeInputs().addAll(
-					(Collection<? extends InputPin>) newValue);
+				getStructuredNodeInputs()
+					.addAll((Collection<? extends InputPin>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__STRUCTURED_NODE_OUTPUT :
 				getStructuredNodeOutputs().clear();
-				getStructuredNodeOutputs().addAll(
-					(Collection<? extends OutputPin>) newValue);
+				getStructuredNodeOutputs()
+					.addAll((Collection<? extends OutputPin>) newValue);
 				return;
 			case UMLPackage.SEQUENCE_NODE__VARIABLE :
 				getVariables().clear();
@@ -531,8 +530,8 @@
 				return;
 			case UMLPackage.SEQUENCE_NODE__EXECUTABLE_NODE :
 				getExecutableNodes().clear();
-				getExecutableNodes().addAll(
-					(Collection<? extends ExecutableNode>) newValue);
+				getExecutableNodes()
+					.addAll((Collection<? extends ExecutableNode>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -694,7 +693,8 @@
 			case UMLPackage.SEQUENCE_NODE__INPUT :
 				return isSetInputs();
 			case UMLPackage.SEQUENCE_NODE__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.SEQUENCE_NODE__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -728,7 +728,8 @@
 			case UMLPackage.SEQUENCE_NODE__EDGE :
 				return edges != null && !edges.isEmpty();
 			case UMLPackage.SEQUENCE_NODE__MUST_ISOLATE :
-				return ((eFlags & MUST_ISOLATE_EFLAG) != 0) != MUST_ISOLATE_EDEFAULT;
+				return ((eFlags
+					& MUST_ISOLATE_EFLAG) != 0) != MUST_ISOLATE_EDEFAULT;
 			case UMLPackage.SEQUENCE_NODE__STRUCTURED_NODE_INPUT :
 				return structuredNodeInputs != null
 					&& !structuredNodeInputs.isEmpty();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalEventImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalEventImpl.java
index 9e10bed..1eb50f9 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalEventImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalEventImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -176,13 +176,13 @@
 		switch (featureID) {
 			case UMLPackage.SIGNAL_EVENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.SIGNAL_EVENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.SIGNAL_EVENT__NAME :
 				setName((String) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalImpl.java
index e06b0e1..8840d32 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SignalImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -150,15 +150,12 @@
 			EList<NamedElement> ownedMembers = (EList<NamedElement>) cache.get(
 				eResource, this, UMLPackage.Literals.NAMESPACE__OWNED_MEMBER);
 			if (ownedMembers == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.NAMESPACE__OWNED_MEMBER,
-						ownedMembers = new DerivedUnionEObjectEList<NamedElement>(
-							NamedElement.class, this,
-							UMLPackage.SIGNAL__OWNED_MEMBER,
-							OWNED_MEMBER_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.NAMESPACE__OWNED_MEMBER,
+					ownedMembers = new DerivedUnionEObjectEList<NamedElement>(
+						NamedElement.class, this,
+						UMLPackage.SIGNAL__OWNED_MEMBER,
+						OWNED_MEMBER_ESUBSETS));
 			}
 			return ownedMembers;
 		}
@@ -184,7 +181,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Property createOwnedAttribute(String name, Type type, EClass eClass) {
+	public Property createOwnedAttribute(String name, Type type,
+			EClass eClass) {
 		Property newOwnedAttribute = (Property) create(eClass);
 		getOwnedAttributes().add(newOwnedAttribute);
 		if (name != null)
@@ -256,52 +254,52 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.SIGNAL__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SIGNAL__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SIGNAL__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.SIGNAL__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SIGNAL__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SIGNAL__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SIGNAL__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.SIGNAL__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.SIGNAL__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SIGNAL__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.SIGNAL__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SIGNAL__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SIGNAL__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SIGNAL__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SIGNAL__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.SIGNAL__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SIGNAL__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -423,13 +421,13 @@
 		switch (featureID) {
 			case UMLPackage.SIGNAL__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.SIGNAL__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.SIGNAL__NAME :
 				setName((String) newValue);
@@ -442,18 +440,18 @@
 				return;
 			case UMLPackage.SIGNAL__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.SIGNAL__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.SIGNAL__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.SIGNAL__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -469,31 +467,31 @@
 				return;
 			case UMLPackage.SIGNAL__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.SIGNAL__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.SIGNAL__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.SIGNAL__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.SIGNAL__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.SIGNAL__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.SIGNAL__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -503,8 +501,8 @@
 				return;
 			case UMLPackage.SIGNAL__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.SIGNAL__USE_CASE :
 				getUseCases().clear();
@@ -512,21 +510,21 @@
 				return;
 			case UMLPackage.SIGNAL__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.SIGNAL__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.SIGNAL__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.SIGNAL__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -696,9 +694,11 @@
 			case UMLPackage.SIGNAL__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.SIGNAL__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.SIGNAL__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.SIGNAL__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.SIGNAL__USE_CASE :
@@ -773,7 +773,8 @@
 			case UMLPackage.SIGNAL___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.SIGNAL___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.SIGNAL___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.SIGNAL___GET_STEREOTYPE_APPLICATIONS :
@@ -781,7 +782,8 @@
 			case UMLPackage.SIGNAL___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.SIGNAL___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.SIGNAL___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -870,13 +872,13 @@
 			case UMLPackage.SIGNAL___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.SIGNAL___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.SIGNAL___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.SIGNAL___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.SIGNAL___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.SIGNAL___MEMBERS_ARE_DISTINGUISHABLE :
@@ -896,10 +898,11 @@
 			case UMLPackage.SIGNAL___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.SIGNAL___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.SIGNAL___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.SIGNAL___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.SIGNAL___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1016,7 +1019,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] ATTRIBUTE_ESUBSETS = new int[]{UMLPackage.SIGNAL__OWNED_ATTRIBUTE};
+	protected static final int[] ATTRIBUTE_ESUBSETS = new int[]{
+		UMLPackage.SIGNAL__OWNED_ATTRIBUTE};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getOwnedMembers() <em>Owned Member</em>}' reference list.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SlotImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SlotImpl.java
index 6bf23a2..d1c1b22 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SlotImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SlotImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 451350
+ *   Kenn Hussey (CEA) - 327039, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -113,8 +113,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -169,7 +169,8 @@
 	 */
 	public void setOwningInstance(InstanceSpecification newOwningInstance) {
 		if (newOwningInstance != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.SLOT__OWNING_INSTANCE && newOwningInstance != null)) {
+			|| (eContainerFeatureID() != UMLPackage.SLOT__OWNING_INSTANCE
+				&& newOwningInstance != null)) {
 			if (EcoreUtil.isAncestor(this, newOwningInstance))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -197,7 +198,8 @@
 	public StructuralFeature getDefiningFeature() {
 		if (definingFeature != null && definingFeature.eIsProxy()) {
 			InternalEObject oldDefiningFeature = (InternalEObject) definingFeature;
-			definingFeature = (StructuralFeature) eResolveProxy(oldDefiningFeature);
+			definingFeature = (StructuralFeature) eResolveProxy(
+				oldDefiningFeature);
 			if (definingFeature != oldDefiningFeature) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -249,7 +251,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ValueSpecification createValue(String name, Type type, EClass eClass) {
+	public ValueSpecification createValue(String name, Type type,
+			EClass eClass) {
 		ValueSpecification newValue = (ValueSpecification) create(eClass);
 		getValues().add(newValue);
 		if (name != null)
@@ -323,11 +326,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.SLOT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SLOT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SLOT__VALUE :
 				return ((InternalEList<?>) getValues()).basicRemove(otherEnd,
 					msgs);
@@ -397,13 +400,13 @@
 		switch (featureID) {
 			case UMLPackage.SLOT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.SLOT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.SLOT__DEFINING_FEATURE :
 				setDefiningFeature((StructuralFeature) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StartClassifierBehaviorActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StartClassifierBehaviorActionImpl.java
index 1eefc89..7a3f145 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StartClassifierBehaviorActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StartClassifierBehaviorActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -148,8 +148,9 @@
 						- UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__OBJECT,
 					null, null);
 				if (newObject.eInternalContainer() == null) {
-					msgs = newObject.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__OBJECT,
+					msgs = newObject.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__OBJECT,
 						null, msgs);
 				}
 				if (msgs != null)
@@ -252,8 +253,8 @@
 	 */
 	public boolean validateMultiplicity(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return StartClassifierBehaviorActionOperations.validateMultiplicity(
-			this, diagnostics, context);
+		return StartClassifierBehaviorActionOperations
+			.validateMultiplicity(this, diagnostics, context);
 	}
 
 	/**
@@ -277,11 +278,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -290,14 +291,14 @@
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -408,13 +409,13 @@
 		switch (featureID) {
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__NAME :
 				setName((String) newValue);
@@ -433,50 +434,49 @@
 				return;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__OBJECT :
 				setObject((InputPin) newValue);
@@ -611,7 +611,8 @@
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -683,7 +684,8 @@
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -691,7 +693,8 @@
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -768,8 +771,8 @@
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION___GET_CONTEXT :
@@ -799,7 +802,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__OBJECT};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__OBJECT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StartObjectBehaviorActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StartObjectBehaviorActionImpl.java
index b47df5c..6110a89 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StartObjectBehaviorActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StartObjectBehaviorActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2008, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -163,8 +163,9 @@
 						- 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,
+					msgs = newObject.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OBJECT,
 						null, msgs);
 				}
 				if (msgs != null)
@@ -304,8 +305,7 @@
 			EList<Parameter> result = (EList<Parameter>) cache.get(this,
 				UMLPackage.Literals.CALL_ACTION___OUTPUT_PARAMETERS);
 			if (result == null) {
-				cache.put(
-					this,
+				cache.put(this,
 					UMLPackage.Literals.CALL_ACTION___OUTPUT_PARAMETERS,
 					result = StartObjectBehaviorActionOperations
 						.outputParameters(this));
@@ -328,8 +328,7 @@
 			EList<Parameter> result = (EList<Parameter>) cache.get(this,
 				UMLPackage.Literals.CALL_ACTION___INPUT_PARAMETERS);
 			if (result == null) {
-				cache.put(
-					this,
+				cache.put(this,
 					UMLPackage.Literals.CALL_ACTION___INPUT_PARAMETERS,
 					result = StartObjectBehaviorActionOperations
 						.inputParameters(this));
@@ -360,11 +359,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -373,14 +372,14 @@
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -391,8 +390,8 @@
 				return ((InternalEList<?>) getLocalPreconditions())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ARGUMENT :
-				return ((InternalEList<?>) getArguments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getArguments()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__RESULT :
 				return ((InternalEList<?>) getResults()).basicRemove(otherEnd,
 					msgs);
@@ -507,13 +506,13 @@
 		switch (featureID) {
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__NAME :
 				setName((String) newValue);
@@ -532,50 +531,49 @@
 				return;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__ARGUMENT :
 				getArguments().clear();
@@ -737,7 +735,8 @@
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -751,7 +750,8 @@
 			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;
+				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 :
@@ -817,7 +817,8 @@
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -825,7 +826,8 @@
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -902,8 +904,8 @@
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION___GET_CONTEXT :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateImpl.java
index 544d769..c2beec9 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -305,21 +305,18 @@
 				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT);
 			if (redefinedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
-						redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
-							RedefinableElement.class, this,
-							UMLPackage.STATE__REDEFINED_ELEMENT,
-							REDEFINED_ELEMENT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
+					redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
+						RedefinableElement.class, this,
+						UMLPackage.STATE__REDEFINED_ELEMENT,
+						REDEFINED_ELEMENT_ESUBSETS));
 			}
 			return redefinedElements;
 		}
 		return new DerivedUnionEObjectEList<RedefinableElement>(
-			RedefinableElement.class, this,
-			UMLPackage.STATE__REDEFINED_ELEMENT, REDEFINED_ELEMENT_ESUBSETS);
+			RedefinableElement.class, this, UMLPackage.STATE__REDEFINED_ELEMENT,
+			REDEFINED_ELEMENT_ESUBSETS);
 	}
 
 	/**
@@ -340,15 +337,12 @@
 				List<Classifier> redefinitionContexts = redefinitionContext == null
 					? Collections.<Classifier> emptyList()
 					: Collections.singletonList(redefinitionContext);
-				cache
-					.put(
-						this,
+				cache.put(this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+					result = new EcoreEList.UnmodifiableEList<Classifier>(this,
 						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-						result = new EcoreEList.UnmodifiableEList<Classifier>(
-							this,
-							UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-							redefinitionContexts.size(), redefinitionContexts
-								.toArray()));
+						redefinitionContexts.size(),
+						redefinitionContexts.toArray()));
 			}
 
 			return result;
@@ -461,7 +455,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Transition getOutgoing(String name, boolean ignoreCase, EClass eClass) {
+	public Transition getOutgoing(String name, boolean ignoreCase,
+			EClass eClass) {
 		outgoingLoop : for (Transition outgoing : getOutgoings()) {
 			if (eClass != null && !eClass.isInstance(outgoing))
 				continue outgoingLoop;
@@ -497,7 +492,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Transition getIncoming(String name, boolean ignoreCase, EClass eClass) {
+	public Transition getIncoming(String name, boolean ignoreCase,
+			EClass eClass) {
 		incomingLoop : for (Transition incoming : getIncomings()) {
 			if (eClass != null && !eClass.isInstance(incoming))
 				continue incomingLoop;
@@ -551,7 +547,8 @@
 	 */
 	public void setContainer(Region newContainer) {
 		if (newContainer != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.STATE__CONTAINER && newContainer != null)) {
+			|| (eContainerFeatureID() != UMLPackage.STATE__CONTAINER
+				&& newContainer != null)) {
 			if (EcoreUtil.isAncestor(this, newContainer))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -606,8 +603,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -669,7 +666,8 @@
 			if (submachine != oldSubmachine) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.STATE__SUBMACHINE, oldSubmachine, submachine));
+						UMLPackage.STATE__SUBMACHINE, oldSubmachine,
+						submachine));
 			}
 		}
 		return submachine;
@@ -750,7 +748,8 @@
 	 * @generated
 	 */
 	public ConnectionPointReference createConnection(String name) {
-		ConnectionPointReference newConnection = (ConnectionPointReference) create(UMLPackage.Literals.CONNECTION_POINT_REFERENCE);
+		ConnectionPointReference newConnection = (ConnectionPointReference) create(
+			UMLPackage.Literals.CONNECTION_POINT_REFERENCE);
 		getConnections().add(newConnection);
 		if (name != null)
 			newConnection.setName(name);
@@ -805,7 +804,8 @@
 	 * @generated
 	 */
 	public Pseudostate createConnectionPoint(String name) {
-		Pseudostate newConnectionPoint = (Pseudostate) create(UMLPackage.Literals.PSEUDOSTATE);
+		Pseudostate newConnectionPoint = (Pseudostate) create(
+			UMLPackage.Literals.PSEUDOSTATE);
 		getConnectionPoints().add(newConnectionPoint);
 		if (name != null)
 			newConnectionPoint.setName(name);
@@ -970,8 +970,9 @@
 					EOPPOSITE_FEATURE_BASE - UMLPackage.STATE__ENTRY, null,
 					null);
 				if (newEntry.eInternalContainer() == null) {
-					msgs = newEntry.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STATE__ENTRY, null, msgs);
+					msgs = newEntry.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - UMLPackage.STATE__ENTRY, null,
+						msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -1060,12 +1061,13 @@
 			exit = (Behavior) eResolveProxy(oldExit);
 			if (exit != oldExit) {
 				InternalEObject newExit = (InternalEObject) exit;
-				NotificationChain msgs = oldExit
-					.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STATE__EXIT, null, null);
+				NotificationChain msgs = oldExit.eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - UMLPackage.STATE__EXIT, null,
+					null);
 				if (newExit.eInternalContainer() == null) {
-					msgs = newExit.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STATE__EXIT, null, msgs);
+					msgs = newExit.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - UMLPackage.STATE__EXIT, null,
+						msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -1115,13 +1117,13 @@
 		if (newExit != exit) {
 			NotificationChain msgs = null;
 			if (exit != null)
-				msgs = ((InternalEObject) exit)
-					.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STATE__EXIT, null, msgs);
+				msgs = ((InternalEObject) exit).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - UMLPackage.STATE__EXIT, null,
+					msgs);
 			if (newExit != null)
-				msgs = ((InternalEObject) newExit)
-					.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STATE__EXIT, null, msgs);
+				msgs = ((InternalEObject) newExit).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE - UMLPackage.STATE__EXIT, null,
+					msgs);
 			msgs = basicSetExit(newExit, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -1259,7 +1261,8 @@
 	 * @generated
 	 */
 	public Trigger createDeferrableTrigger(String name) {
-		Trigger newDeferrableTrigger = (Trigger) create(UMLPackage.Literals.TRIGGER);
+		Trigger newDeferrableTrigger = (Trigger) create(
+			UMLPackage.Literals.TRIGGER);
 		getDeferrableTriggers().add(newDeferrableTrigger);
 		if (name != null)
 			newDeferrableTrigger.setName(name);
@@ -1354,10 +1357,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateRedefinitionContextValid(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return RedefinableElementOperations.validateRedefinitionContextValid(
-			this, diagnostics, context);
+	public boolean validateRedefinitionContextValid(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return RedefinableElementOperations
+			.validateRedefinitionContextValid(this, diagnostics, context);
 	}
 
 	/**
@@ -1367,8 +1370,8 @@
 	 */
 	public boolean validateRedefinitionConsistent(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return RedefinableElementOperations.validateRedefinitionConsistent(
-			this, diagnostics, context);
+		return RedefinableElementOperations.validateRedefinitionConsistent(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -1547,30 +1550,30 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.STATE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.STATE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE__CONTAINER :
 				return basicSetContainer(null, msgs);
 			case UMLPackage.STATE__CONNECTION :
-				return ((InternalEList<?>) getConnections()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getConnections())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE__CONNECTION_POINT :
-				return ((InternalEList<?>) getConnectionPoints()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getConnectionPoints())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE__DEFERRABLE_TRIGGER :
 				return ((InternalEList<?>) getDeferrableTriggers())
 					.basicRemove(otherEnd, msgs);
@@ -1720,13 +1723,13 @@
 		switch (featureID) {
 			case UMLPackage.STATE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.STATE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.STATE__NAME :
 				setName((String) newValue);
@@ -1739,18 +1742,18 @@
 				return;
 			case UMLPackage.STATE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.STATE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.STATE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.STATE__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -1765,13 +1768,13 @@
 				return;
 			case UMLPackage.STATE__CONNECTION_POINT :
 				getConnectionPoints().clear();
-				getConnectionPoints().addAll(
-					(Collection<? extends Pseudostate>) newValue);
+				getConnectionPoints()
+					.addAll((Collection<? extends Pseudostate>) newValue);
 				return;
 			case UMLPackage.STATE__DEFERRABLE_TRIGGER :
 				getDeferrableTriggers().clear();
-				getDeferrableTriggers().addAll(
-					(Collection<? extends Trigger>) newValue);
+				getDeferrableTriggers()
+					.addAll((Collection<? extends Trigger>) newValue);
 				return;
 			case UMLPackage.STATE__DO_ACTIVITY :
 				setDoActivity((Behavior) newValue);
@@ -1964,7 +1967,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == RedefinableElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.STATE__IS_LEAF :
@@ -1998,7 +2002,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == RedefinableElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.REDEFINABLE_ELEMENT__IS_LEAF :
@@ -2125,7 +2130,8 @@
 			case UMLPackage.STATE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.STATE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STATE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.STATE___GET_STEREOTYPE_APPLICATIONS :
@@ -2133,7 +2139,8 @@
 			case UMLPackage.STATE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.STATE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STATE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -2222,13 +2229,13 @@
 			case UMLPackage.STATE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.STATE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.STATE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.STATE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.STATE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.STATE___MEMBERS_ARE_DISTINGUISHABLE :
@@ -2248,8 +2255,8 @@
 			case UMLPackage.STATE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.STATE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.STATE___CONTAINING_STATE_MACHINE :
 				return containingStateMachine();
 			case UMLPackage.STATE___GET_INCOMINGS :
@@ -2318,7 +2325,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{UMLPackage.STATE__REDEFINED_STATE};
+	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{
+		UMLPackage.STATE__REDEFINED_STATE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2400,8 +2408,7 @@
 	 */
 	@Override
 	public boolean isSetOwnedMembers() {
-		return super.isSetOwnedMembers()
-			|| eIsSet(UMLPackage.STATE__CONNECTION)
+		return super.isSetOwnedMembers() || eIsSet(UMLPackage.STATE__CONNECTION)
 			|| eIsSet(UMLPackage.STATE__CONNECTION_POINT)
 			|| eIsSet(UMLPackage.STATE__REGION);
 	}
@@ -2444,7 +2451,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_RULE_ESUBSETS = new int[]{UMLPackage.STATE__STATE_INVARIANT};
+	protected static final int[] OWNED_RULE_ESUBSETS = new int[]{
+		UMLPackage.STATE__STATE_INVARIANT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateInvariantImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateInvariantImpl.java
index b5525ec..20aa450 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateInvariantImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateInvariantImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -103,8 +103,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -130,13 +130,16 @@
 			invariant = (Constraint) eResolveProxy(oldInvariant);
 			if (invariant != oldInvariant) {
 				InternalEObject newInvariant = (InternalEObject) invariant;
-				NotificationChain msgs = oldInvariant.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STATE_INVARIANT__INVARIANT, null, null);
+				NotificationChain msgs = oldInvariant
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.STATE_INVARIANT__INVARIANT,
+						null, null);
 				if (newInvariant.eInternalContainer() == null) {
-					msgs = newInvariant
-						.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.STATE_INVARIANT__INVARIANT, null, msgs);
+					msgs = newInvariant.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.STATE_INVARIANT__INVARIANT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -188,13 +191,17 @@
 		if (newInvariant != invariant) {
 			NotificationChain msgs = null;
 			if (invariant != null)
-				msgs = ((InternalEObject) invariant).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STATE_INVARIANT__INVARIANT, null, msgs);
+				msgs = ((InternalEObject) invariant)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.STATE_INVARIANT__INVARIANT,
+						null, msgs);
 			if (newInvariant != null)
-				msgs = ((InternalEObject) newInvariant).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STATE_INVARIANT__INVARIANT, null, msgs);
+				msgs = ((InternalEObject) newInvariant)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.STATE_INVARIANT__INVARIANT,
+						null, msgs);
 			msgs = basicSetInvariant(newInvariant, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -315,11 +322,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.STATE_INVARIANT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_INVARIANT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_INVARIANT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.STATE_INVARIANT__COVERED :
@@ -330,8 +337,8 @@
 			case UMLPackage.STATE_INVARIANT__ENCLOSING_INTERACTION :
 				return basicSetEnclosingInteraction(null, msgs);
 			case UMLPackage.STATE_INVARIANT__GENERAL_ORDERING :
-				return ((InternalEList<?>) getGeneralOrderings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralOrderings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_INVARIANT__INVARIANT :
 				return basicSetInvariant(null, msgs);
 		}
@@ -403,13 +410,13 @@
 		switch (featureID) {
 			case UMLPackage.STATE_INVARIANT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.STATE_INVARIANT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.STATE_INVARIANT__NAME :
 				setName((String) newValue);
@@ -432,8 +439,8 @@
 				return;
 			case UMLPackage.STATE_INVARIANT__GENERAL_ORDERING :
 				getGeneralOrderings().clear();
-				getGeneralOrderings().addAll(
-					(Collection<? extends GeneralOrdering>) newValue);
+				getGeneralOrderings()
+					.addAll((Collection<? extends GeneralOrdering>) newValue);
 				return;
 			case UMLPackage.STATE_INVARIANT__INVARIANT :
 				setInvariant((Constraint) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateMachineImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateMachineImpl.java
index 75889b4..19ed760 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateMachineImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateMachineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 479276
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 479276, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -183,7 +183,8 @@
 			return ownedMembers;
 		}
 		return new DerivedUnionEObjectEList<NamedElement>(NamedElement.class,
-			this, UMLPackage.STATE_MACHINE__OWNED_MEMBER, OWNED_MEMBER_ESUBSETS);
+			this, UMLPackage.STATE_MACHINE__OWNED_MEMBER,
+			OWNED_MEMBER_ESUBSETS);
 	}
 
 	/**
@@ -304,7 +305,8 @@
 	 * @generated
 	 */
 	public Pseudostate createConnectionPoint(String name) {
-		Pseudostate newConnectionPoint = (Pseudostate) create(UMLPackage.Literals.PSEUDOSTATE);
+		Pseudostate newConnectionPoint = (Pseudostate) create(
+			UMLPackage.Literals.PSEUDOSTATE);
 		getConnectionPoints().add(newConnectionPoint);
 		if (name != null)
 			newConnectionPoint.setName(name);
@@ -367,8 +369,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public StateMachine getExtendedStateMachine(String name,
-			boolean ignoreCase, EClass eClass) {
+	public StateMachine getExtendedStateMachine(String name, boolean ignoreCase,
+			EClass eClass) {
 		extendedStateMachineLoop : for (StateMachine extendedStateMachine : getExtendedStateMachines()) {
 			if (eClass != null && !eClass.isInstance(extendedStateMachine))
 				continue extendedStateMachineLoop;
@@ -458,8 +460,8 @@
 	 */
 	public boolean validateMethod(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return StateMachineOperations
-			.validateMethod(this, diagnostics, context);
+		return StateMachineOperations.validateMethod(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -501,10 +503,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.STATE_MACHINE__TEMPLATE_BINDING :
@@ -513,8 +515,7 @@
 			case UMLPackage.STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							EOPPOSITE_FEATURE_BASE
 								- UMLPackage.STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
@@ -543,7 +544,8 @@
 					msgs = ((InternalEObject) specification).eInverseRemove(
 						this, UMLPackage.BEHAVIORAL_FEATURE__METHOD,
 						BehavioralFeature.class, msgs);
-				return basicSetSpecification((BehavioralFeature) otherEnd, msgs);
+				return basicSetSpecification((BehavioralFeature) otherEnd,
+					msgs);
 			case UMLPackage.STATE_MACHINE__CONNECTION_POINT :
 				return ((InternalEList<InternalEObject>) (InternalEList<?>) getConnectionPoints())
 					.basicAdd(otherEnd, msgs);
@@ -567,84 +569,84 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.STATE_MACHINE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.STATE_MACHINE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.STATE_MACHINE__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.STATE_MACHINE__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.STATE_MACHINE__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.STATE_MACHINE__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__OWNED_CONNECTOR :
-				return ((InternalEList<?>) getOwnedConnectors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedConnectors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__INTERFACE_REALIZATION :
 				return ((InternalEList<?>) getInterfaceRealizations())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__OWNED_BEHAVIOR :
-				return ((InternalEList<?>) getOwnedBehaviors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedBehaviors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__NESTED_CLASSIFIER :
-				return ((InternalEList<?>) getNestedClassifiers()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedClassifiers())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__OWNED_RECEPTION :
-				return ((InternalEList<?>) getOwnedReceptions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedReceptions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__SPECIFICATION :
 				return basicSetSpecification(null, msgs);
 			case UMLPackage.STATE_MACHINE__OWNED_PARAMETER :
-				return ((InternalEList<?>) getOwnedParameters()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedParameters())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__OWNED_PARAMETER_SET :
 				return ((InternalEList<?>) getOwnedParameterSets())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__CONNECTION_POINT :
-				return ((InternalEList<?>) getConnectionPoints()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getConnectionPoints())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__SUBMACHINE_STATE :
-				return ((InternalEList<?>) getSubmachineStates()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubmachineStates())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STATE_MACHINE__REGION :
 				return ((InternalEList<?>) getRegions()).basicRemove(otherEnd,
 					msgs);
@@ -825,13 +827,13 @@
 		switch (featureID) {
 			case UMLPackage.STATE_MACHINE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__NAME :
 				setName((String) newValue);
@@ -844,18 +846,18 @@
 				return;
 			case UMLPackage.STATE_MACHINE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -871,31 +873,31 @@
 				return;
 			case UMLPackage.STATE_MACHINE__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -905,8 +907,8 @@
 				return;
 			case UMLPackage.STATE_MACHINE__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__USE_CASE :
 				getUseCases().clear();
@@ -914,26 +916,26 @@
 				return;
 			case UMLPackage.STATE_MACHINE__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -945,32 +947,31 @@
 				return;
 			case UMLPackage.STATE_MACHINE__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__IS_ACTIVE :
 				setIsActive((Boolean) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__NESTED_CLASSIFIER :
 				getNestedClassifiers().clear();
-				getNestedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getNestedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__OWNED_RECEPTION :
 				getOwnedReceptions().clear();
-				getOwnedReceptions().addAll(
-					(Collection<? extends Reception>) newValue);
+				getOwnedReceptions()
+					.addAll((Collection<? extends Reception>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__SUPER_CLASS :
 				getSuperClasses().clear();
-				getSuperClasses()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
+				getSuperClasses().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__SPECIFICATION :
 				setSpecification((BehavioralFeature) newValue);
@@ -980,38 +981,38 @@
 				return;
 			case UMLPackage.STATE_MACHINE__OWNED_PARAMETER :
 				getOwnedParameters().clear();
-				getOwnedParameters().addAll(
-					(Collection<? extends Parameter>) newValue);
+				getOwnedParameters()
+					.addAll((Collection<? extends Parameter>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__OWNED_PARAMETER_SET :
 				getOwnedParameterSets().clear();
-				getOwnedParameterSets().addAll(
-					(Collection<? extends ParameterSet>) newValue);
+				getOwnedParameterSets()
+					.addAll((Collection<? extends ParameterSet>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__POSTCONDITION :
 				getPostconditions().clear();
-				getPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__PRECONDITION :
 				getPreconditions().clear();
-				getPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__REDEFINED_BEHAVIOR :
 				getRedefinedBehaviors().clear();
-				getRedefinedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getRedefinedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__CONNECTION_POINT :
 				getConnectionPoints().clear();
-				getConnectionPoints().addAll(
-					(Collection<? extends Pseudostate>) newValue);
+				getConnectionPoints()
+					.addAll((Collection<? extends Pseudostate>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__SUBMACHINE_STATE :
 				getSubmachineStates().clear();
-				getSubmachineStates().addAll(
-					(Collection<? extends State>) newValue);
+				getSubmachineStates()
+					.addAll((Collection<? extends State>) newValue);
 				return;
 			case UMLPackage.STATE_MACHINE__REGION :
 				getRegions().clear();
@@ -1019,8 +1020,8 @@
 				return;
 			case UMLPackage.STATE_MACHINE__EXTENDED_STATE_MACHINE :
 				getExtendedStateMachines().clear();
-				getExtendedStateMachines().addAll(
-					(Collection<? extends StateMachine>) newValue);
+				getExtendedStateMachines()
+					.addAll((Collection<? extends StateMachine>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -1252,7 +1253,8 @@
 			case UMLPackage.STATE_MACHINE__IS_ABSTRACT :
 				return isSetIsAbstract();
 			case UMLPackage.STATE_MACHINE__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.STATE_MACHINE__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.STATE_MACHINE__USE_CASE :
@@ -1380,7 +1382,8 @@
 			case UMLPackage.STATE_MACHINE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.STATE_MACHINE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STATE_MACHINE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.STATE_MACHINE___GET_STEREOTYPE_APPLICATIONS :
@@ -1388,7 +1391,8 @@
 			case UMLPackage.STATE_MACHINE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.STATE_MACHINE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STATE_MACHINE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1477,13 +1481,13 @@
 			case UMLPackage.STATE_MACHINE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.STATE_MACHINE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.STATE_MACHINE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.STATE_MACHINE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.STATE_MACHINE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.STATE_MACHINE___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1503,10 +1507,11 @@
 			case UMLPackage.STATE_MACHINE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.STATE_MACHINE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.STATE_MACHINE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.STATE_MACHINE___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.STATE_MACHINE___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1607,8 +1612,7 @@
 			case UMLPackage.STATE_MACHINE___GET_OWNED_PORTS :
 				return getOwnedPorts();
 			case UMLPackage.STATE_MACHINE___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.STATE_MACHINE___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
@@ -1663,7 +1667,8 @@
 					(DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.STATE_MACHINE___LCA__VERTEX_VERTEX :
-				return LCA((Vertex) arguments.get(0), (Vertex) arguments.get(1));
+				return LCA((Vertex) arguments.get(0),
+					(Vertex) arguments.get(1));
 			case UMLPackage.STATE_MACHINE___ANCESTOR__VERTEX_VERTEX :
 				return ancestor((Vertex) arguments.get(0),
 					(Vertex) arguments.get(1));
@@ -1728,7 +1733,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_BEHAVIOR_ESUPERSETS = new int[]{UMLPackage.STATE_MACHINE__REDEFINED_CLASSIFIER};
+	protected static final int[] REDEFINED_BEHAVIOR_ESUPERSETS = new int[]{
+		UMLPackage.STATE_MACHINE__REDEFINED_CLASSIFIER};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1744,6 +1750,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public boolean isRedefinitionContextValid(
 			RedefinableElement redefinedElement) {
 		return StateMachineOperations.isRedefinitionContextValid(this,
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StereotypeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StereotypeImpl.java
index 11334ed..7856381 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StereotypeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StereotypeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -130,8 +130,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -267,8 +267,8 @@
 	 */
 	public Extension createExtension(org.eclipse.uml2.uml.Class metaclass,
 			boolean isRequired) {
-		return StereotypeOperations
-			.createExtension(this, metaclass, isRequired);
+		return StereotypeOperations.createExtension(this, metaclass,
+			isRequired);
 	}
 
 	/**
@@ -362,16 +362,13 @@
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
 			EList<org.eclipse.uml2.uml.Class> result = (EList<org.eclipse.uml2.uml.Class>) cache
-				.get(
-					this,
+				.get(this,
 					UMLPackage.Literals.STEREOTYPE___GET_ALL_EXTENDED_METACLASSES);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.STEREOTYPE___GET_ALL_EXTENDED_METACLASSES,
-						result = StereotypeOperations
-							.getAllExtendedMetaclasses(this));
+				cache.put(this,
+					UMLPackage.Literals.STEREOTYPE___GET_ALL_EXTENDED_METACLASSES,
+					result = StereotypeOperations
+						.getAllExtendedMetaclasses(this));
 			}
 			return result;
 		}
@@ -415,70 +412,70 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.STEREOTYPE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.STEREOTYPE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.STEREOTYPE__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.STEREOTYPE__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.STEREOTYPE__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.STEREOTYPE__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__OWNED_CONNECTOR :
-				return ((InternalEList<?>) getOwnedConnectors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedConnectors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__INTERFACE_REALIZATION :
 				return ((InternalEList<?>) getInterfaceRealizations())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__OWNED_BEHAVIOR :
-				return ((InternalEList<?>) getOwnedBehaviors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedBehaviors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__OWNED_OPERATION :
-				return ((InternalEList<?>) getOwnedOperations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedOperations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__NESTED_CLASSIFIER :
-				return ((InternalEList<?>) getNestedClassifiers()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getNestedClassifiers())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__OWNED_RECEPTION :
-				return ((InternalEList<?>) getOwnedReceptions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedReceptions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STEREOTYPE__ICON :
 				return ((InternalEList<?>) getIcons()).basicRemove(otherEnd,
 					msgs);
@@ -637,13 +634,13 @@
 		switch (featureID) {
 			case UMLPackage.STEREOTYPE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__NAME :
 				setName((String) newValue);
@@ -656,18 +653,18 @@
 				return;
 			case UMLPackage.STEREOTYPE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -683,31 +680,31 @@
 				return;
 			case UMLPackage.STEREOTYPE__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -717,8 +714,8 @@
 				return;
 			case UMLPackage.STEREOTYPE__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__USE_CASE :
 				getUseCases().clear();
@@ -726,26 +723,26 @@
 				return;
 			case UMLPackage.STEREOTYPE__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -757,32 +754,31 @@
 				return;
 			case UMLPackage.STEREOTYPE__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__OWNED_OPERATION :
 				getOwnedOperations().clear();
-				getOwnedOperations().addAll(
-					(Collection<? extends Operation>) newValue);
+				getOwnedOperations()
+					.addAll((Collection<? extends Operation>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__IS_ACTIVE :
 				setIsActive((Boolean) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__NESTED_CLASSIFIER :
 				getNestedClassifiers().clear();
-				getNestedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getNestedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__OWNED_RECEPTION :
 				getOwnedReceptions().clear();
-				getOwnedReceptions().addAll(
-					(Collection<? extends Reception>) newValue);
+				getOwnedReceptions()
+					.addAll((Collection<? extends Reception>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__SUPER_CLASS :
 				getSuperClasses().clear();
-				getSuperClasses()
-					.addAll(
-						(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
+				getSuperClasses().addAll(
+					(Collection<? extends org.eclipse.uml2.uml.Class>) newValue);
 				return;
 			case UMLPackage.STEREOTYPE__ICON :
 				getIcons().clear();
@@ -988,7 +984,8 @@
 			case UMLPackage.STEREOTYPE__IS_ABSTRACT :
 				return isSetIsAbstract();
 			case UMLPackage.STEREOTYPE__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.STEREOTYPE__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.STEREOTYPE__USE_CASE :
@@ -1095,7 +1092,8 @@
 			case UMLPackage.STEREOTYPE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.STEREOTYPE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STEREOTYPE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.STEREOTYPE___GET_STEREOTYPE_APPLICATIONS :
@@ -1103,7 +1101,8 @@
 			case UMLPackage.STEREOTYPE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.STEREOTYPE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STEREOTYPE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1192,13 +1191,13 @@
 			case UMLPackage.STEREOTYPE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.STEREOTYPE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.STEREOTYPE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.STEREOTYPE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.STEREOTYPE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.STEREOTYPE___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1218,10 +1217,11 @@
 			case UMLPackage.STEREOTYPE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.STEREOTYPE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.STEREOTYPE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.STEREOTYPE___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.STEREOTYPE___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1322,8 +1322,7 @@
 			case UMLPackage.STEREOTYPE___GET_OWNED_PORTS :
 				return getOwnedPorts();
 			case UMLPackage.STEREOTYPE___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.STEREOTYPE___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StringExpressionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StringExpressionImpl.java
index 091db68..8444b97 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StringExpressionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StringExpressionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -140,8 +140,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -153,7 +153,8 @@
 			return ownedElements;
 		}
 		return new DerivedUnionEObjectEList<Element>(Element.class, this,
-			UMLPackage.STRING_EXPRESSION__OWNED_ELEMENT, OWNED_ELEMENT_ESUBSETS);
+			UMLPackage.STRING_EXPRESSION__OWNED_ELEMENT,
+			OWNED_ELEMENT_ESUBSETS);
 	}
 
 	/**
@@ -177,7 +178,8 @@
 	 * @generated
 	 */
 	public TemplateBinding createTemplateBinding(TemplateSignature signature) {
-		TemplateBinding newTemplateBinding = (TemplateBinding) create(UMLPackage.Literals.TEMPLATE_BINDING);
+		TemplateBinding newTemplateBinding = (TemplateBinding) create(
+			UMLPackage.Literals.TEMPLATE_BINDING);
 		getTemplateBindings().add(newTemplateBinding);
 		if (signature != null)
 			newTemplateBinding.setSignature(signature);
@@ -217,9 +219,11 @@
 	 * @generated
 	 */
 	public TemplateSignature getOwnedTemplateSignature() {
-		if (ownedTemplateSignature != null && ownedTemplateSignature.eIsProxy()) {
+		if (ownedTemplateSignature != null
+			&& ownedTemplateSignature.eIsProxy()) {
 			InternalEObject oldOwnedTemplateSignature = (InternalEObject) ownedTemplateSignature;
-			ownedTemplateSignature = (TemplateSignature) eResolveProxy(oldOwnedTemplateSignature);
+			ownedTemplateSignature = (TemplateSignature) eResolveProxy(
+				oldOwnedTemplateSignature);
 			if (ownedTemplateSignature != oldOwnedTemplateSignature) {
 				InternalEObject newOwnedTemplateSignature = (InternalEObject) ownedTemplateSignature;
 				NotificationChain msgs = oldOwnedTemplateSignature
@@ -257,7 +261,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetOwnedTemplateSignature(
-			TemplateSignature newOwnedTemplateSignature, NotificationChain msgs) {
+			TemplateSignature newOwnedTemplateSignature,
+			NotificationChain msgs) {
 		TemplateSignature oldOwnedTemplateSignature = ownedTemplateSignature;
 		ownedTemplateSignature = newOwnedTemplateSignature;
 		if (eNotificationRequired()) {
@@ -307,7 +312,8 @@
 	 * @generated
 	 */
 	public TemplateSignature createOwnedTemplateSignature(EClass eClass) {
-		TemplateSignature newOwnedTemplateSignature = (TemplateSignature) create(eClass);
+		TemplateSignature newOwnedTemplateSignature = (TemplateSignature) create(
+			eClass);
 		setOwnedTemplateSignature(newOwnedTemplateSignature);
 		return newOwnedTemplateSignature;
 	}
@@ -318,7 +324,8 @@
 	 * @generated
 	 */
 	public TemplateSignature createOwnedTemplateSignature() {
-		return createOwnedTemplateSignature(UMLPackage.Literals.TEMPLATE_SIGNATURE);
+		return createOwnedTemplateSignature(
+			UMLPackage.Literals.TEMPLATE_SIGNATURE);
 	}
 
 	/**
@@ -355,7 +362,8 @@
 	 * @generated
 	 */
 	public StringExpression createSubExpression(String name, Type type) {
-		StringExpression newSubExpression = (StringExpression) create(UMLPackage.Literals.STRING_EXPRESSION);
+		StringExpression newSubExpression = (StringExpression) create(
+			UMLPackage.Literals.STRING_EXPRESSION);
 		getSubExpressions().add(newSubExpression);
 		if (name != null)
 			newSubExpression.setName(name);
@@ -435,7 +443,8 @@
 	 */
 	public void setOwningExpression(StringExpression newOwningExpression) {
 		if (newOwningExpression != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.STRING_EXPRESSION__OWNING_EXPRESSION && newOwningExpression != null)) {
+			|| (eContainerFeatureID() != UMLPackage.STRING_EXPRESSION__OWNING_EXPRESSION
+				&& newOwningExpression != null)) {
 			if (EcoreUtil.isAncestor(this, newOwningExpression))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -443,8 +452,8 @@
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newOwningExpression != null)
-				msgs = ((InternalEObject) newOwningExpression).eInverseAdd(
-					this, UMLPackage.STRING_EXPRESSION__SUB_EXPRESSION,
+				msgs = ((InternalEObject) newOwningExpression).eInverseAdd(this,
+					UMLPackage.STRING_EXPRESSION__SUB_EXPRESSION,
 					StringExpression.class, msgs);
 			msgs = basicSetOwningExpression(newOwningExpression, msgs);
 			if (msgs != null)
@@ -465,16 +474,13 @@
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
 			EList<ParameterableElement> result = (EList<ParameterableElement>) cache
-				.get(
-					this,
+				.get(this,
 					UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS,
-						result = TemplateableElementOperations
-							.parameterableElements(this));
+				cache.put(this,
+					UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS,
+					result = TemplateableElementOperations
+						.parameterableElements(this));
 			}
 			return result;
 		}
@@ -542,10 +548,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.STRING_EXPRESSION__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.STRING_EXPRESSION__TEMPLATE_BINDING :
@@ -554,8 +560,7 @@
 			case UMLPackage.STRING_EXPRESSION__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							EOPPOSITE_FEATURE_BASE
 								- UMLPackage.STRING_EXPRESSION__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
@@ -583,11 +588,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.STRING_EXPRESSION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRING_EXPRESSION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRING_EXPRESSION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.STRING_EXPRESSION__OWNING_TEMPLATE_PARAMETER :
@@ -598,15 +603,15 @@
 				return ((InternalEList<?>) getOperands()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.STRING_EXPRESSION__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRING_EXPRESSION__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.STRING_EXPRESSION__OWNING_EXPRESSION :
 				return basicSetOwningExpression(null, msgs);
 			case UMLPackage.STRING_EXPRESSION__SUB_EXPRESSION :
-				return ((InternalEList<?>) getSubExpressions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubExpressions())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -709,13 +714,13 @@
 		switch (featureID) {
 			case UMLPackage.STRING_EXPRESSION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.STRING_EXPRESSION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.STRING_EXPRESSION__NAME :
 				setName((String) newValue);
@@ -745,8 +750,8 @@
 				return;
 			case UMLPackage.STRING_EXPRESSION__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.STRING_EXPRESSION__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
@@ -756,8 +761,8 @@
 				return;
 			case UMLPackage.STRING_EXPRESSION__SUB_EXPRESSION :
 				getSubExpressions().clear();
-				getSubExpressions().addAll(
-					(Collection<? extends StringExpression>) newValue);
+				getSubExpressions()
+					.addAll((Collection<? extends StringExpression>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -875,7 +880,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == TemplateableElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.STRING_EXPRESSION__TEMPLATE_BINDING :
@@ -895,7 +901,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == TemplateableElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.TEMPLATEABLE_ELEMENT__TEMPLATE_BINDING :
@@ -986,7 +993,8 @@
 			case UMLPackage.STRING_EXPRESSION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.STRING_EXPRESSION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STRING_EXPRESSION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.STRING_EXPRESSION___GET_STEREOTYPE_APPLICATIONS :
@@ -994,7 +1002,8 @@
 			case UMLPackage.STRING_EXPRESSION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.STRING_EXPRESSION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STRING_EXPRESSION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1057,7 +1066,8 @@
 			case UMLPackage.STRING_EXPRESSION___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.STRING_EXPRESSION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.STRING_EXPRESSION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.STRING_EXPRESSION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureActionImpl.java
index 8e2fe1e..e24fc9d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -152,12 +152,11 @@
 	public StructuralFeature getStructuralFeature() {
 		if (structuralFeature != null && structuralFeature.eIsProxy()) {
 			InternalEObject oldStructuralFeature = (InternalEObject) structuralFeature;
-			structuralFeature = (StructuralFeature) eResolveProxy(oldStructuralFeature);
+			structuralFeature = (StructuralFeature) eResolveProxy(
+				oldStructuralFeature);
 			if (structuralFeature != oldStructuralFeature) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.STRUCTURAL_FEATURE_ACTION__STRUCTURAL_FEATURE,
 						oldStructuralFeature, structuralFeature));
 			}
@@ -201,19 +200,20 @@
 				InternalEObject newObject = (InternalEObject) object;
 				NotificationChain msgs = oldObject.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STRUCTURAL_FEATURE_ACTION__OBJECT, null,
-					null);
+						- UMLPackage.STRUCTURAL_FEATURE_ACTION__OBJECT,
+					null, null);
 				if (newObject.eInternalContainer() == null) {
-					msgs = newObject.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STRUCTURAL_FEATURE_ACTION__OBJECT, null,
-						msgs);
+					msgs = newObject.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.STRUCTURAL_FEATURE_ACTION__OBJECT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.STRUCTURAL_FEATURE_ACTION__OBJECT,
-						oldObject, object));
+						UMLPackage.STRUCTURAL_FEATURE_ACTION__OBJECT, oldObject,
+						object));
 			}
 		}
 		return object;
@@ -260,13 +260,13 @@
 			if (object != null)
 				msgs = ((InternalEObject) object).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STRUCTURAL_FEATURE_ACTION__OBJECT, null,
-					msgs);
+						- UMLPackage.STRUCTURAL_FEATURE_ACTION__OBJECT,
+					null, msgs);
 			if (newObject != null)
 				msgs = ((InternalEObject) newObject).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STRUCTURAL_FEATURE_ACTION__OBJECT, null,
-					msgs);
+						- UMLPackage.STRUCTURAL_FEATURE_ACTION__OBJECT,
+					null, msgs);
 			msgs = basicSetObject(newObject, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -365,11 +365,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -378,14 +378,14 @@
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -500,13 +500,13 @@
 		switch (featureID) {
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__NAME :
 				setName((String) newValue);
@@ -525,50 +525,49 @@
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__OBJECT :
 				setObject((InputPin) newValue);
@@ -709,7 +708,8 @@
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -783,7 +783,8 @@
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -791,7 +792,8 @@
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -868,8 +870,8 @@
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.STRUCTURAL_FEATURE_ACTION___GET_CONTEXT :
@@ -908,7 +910,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.STRUCTURAL_FEATURE_ACTION__OBJECT};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.STRUCTURAL_FEATURE_ACTION__OBJECT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureImpl.java
index 59c0e15..4fd0d95 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuralFeatureImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -261,8 +261,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -379,13 +379,13 @@
 				InternalEObject newUpperValue = (InternalEObject) upperValue;
 				NotificationChain msgs = oldUpperValue.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STRUCTURAL_FEATURE__UPPER_VALUE, null,
-					null);
+						- UMLPackage.STRUCTURAL_FEATURE__UPPER_VALUE,
+					null, null);
 				if (newUpperValue.eInternalContainer() == null) {
 					msgs = newUpperValue.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.STRUCTURAL_FEATURE__UPPER_VALUE, null,
-						msgs);
+							- UMLPackage.STRUCTURAL_FEATURE__UPPER_VALUE,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -439,13 +439,13 @@
 			if (upperValue != null)
 				msgs = ((InternalEObject) upperValue).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STRUCTURAL_FEATURE__UPPER_VALUE, null,
-					msgs);
+						- UMLPackage.STRUCTURAL_FEATURE__UPPER_VALUE,
+					null, msgs);
 			if (newUpperValue != null)
 				msgs = ((InternalEObject) newUpperValue).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STRUCTURAL_FEATURE__UPPER_VALUE, null,
-					msgs);
+						- UMLPackage.STRUCTURAL_FEATURE__UPPER_VALUE,
+					null, msgs);
 			msgs = basicSetUpperValue(newUpperValue, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -484,13 +484,13 @@
 				InternalEObject newLowerValue = (InternalEObject) lowerValue;
 				NotificationChain msgs = oldLowerValue.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STRUCTURAL_FEATURE__LOWER_VALUE, null,
-					null);
+						- UMLPackage.STRUCTURAL_FEATURE__LOWER_VALUE,
+					null, null);
 				if (newLowerValue.eInternalContainer() == null) {
 					msgs = newLowerValue.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.STRUCTURAL_FEATURE__LOWER_VALUE, null,
-						msgs);
+							- UMLPackage.STRUCTURAL_FEATURE__LOWER_VALUE,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -544,13 +544,13 @@
 			if (lowerValue != null)
 				msgs = ((InternalEObject) lowerValue).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STRUCTURAL_FEATURE__LOWER_VALUE, null,
-					msgs);
+						- UMLPackage.STRUCTURAL_FEATURE__LOWER_VALUE,
+					null, msgs);
 			if (newLowerValue != null)
 				msgs = ((InternalEObject) newLowerValue).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.STRUCTURAL_FEATURE__LOWER_VALUE, null,
-					msgs);
+						- UMLPackage.STRUCTURAL_FEATURE__LOWER_VALUE,
+					null, msgs);
 			msgs = basicSetLowerValue(newLowerValue, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -609,8 +609,8 @@
 	 */
 	public boolean validateLowerGe0(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return MultiplicityElementOperations.validateLowerGe0(this,
-			diagnostics, context);
+		return MultiplicityElementOperations.validateLowerGe0(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -632,7 +632,8 @@
 	public boolean validateValueSpecificationNoSideEffects(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return MultiplicityElementOperations
-			.validateValueSpecificationNoSideEffects(this, diagnostics, context);
+			.validateValueSpecificationNoSideEffects(this, diagnostics,
+				context);
 	}
 
 	/**
@@ -664,8 +665,8 @@
 	 */
 	public boolean validateUpperIsUnlimitedNatural(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return MultiplicityElementOperations.validateUpperIsUnlimitedNatural(
-			this, diagnostics, context);
+		return MultiplicityElementOperations
+			.validateUpperIsUnlimitedNatural(this, diagnostics, context);
 	}
 
 	/**
@@ -732,11 +733,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.STRUCTURAL_FEATURE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURAL_FEATURE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURAL_FEATURE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.STRUCTURAL_FEATURE__LOWER_VALUE :
@@ -828,13 +829,13 @@
 		switch (featureID) {
 			case UMLPackage.STRUCTURAL_FEATURE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.STRUCTURAL_FEATURE__NAME :
 				setName((String) newValue);
@@ -979,7 +980,8 @@
 			case UMLPackage.STRUCTURAL_FEATURE__TYPE :
 				return type != null;
 			case UMLPackage.STRUCTURAL_FEATURE__IS_ORDERED :
-				return ((eFlags & IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
+				return ((eFlags
+					& IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
 			case UMLPackage.STRUCTURAL_FEATURE__IS_UNIQUE :
 				return ((eFlags & IS_UNIQUE_EFLAG) != 0) != IS_UNIQUE_EDEFAULT;
 			case UMLPackage.STRUCTURAL_FEATURE__LOWER :
@@ -991,7 +993,8 @@
 			case UMLPackage.STRUCTURAL_FEATURE__UPPER_VALUE :
 				return upperValue != null;
 			case UMLPackage.STRUCTURAL_FEATURE__IS_READ_ONLY :
-				return ((eFlags & IS_READ_ONLY_EFLAG) != 0) != IS_READ_ONLY_EDEFAULT;
+				return ((eFlags
+					& IS_READ_ONLY_EFLAG) != 0) != IS_READ_ONLY_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
@@ -1002,7 +1005,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == TypedElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.STRUCTURAL_FEATURE__TYPE :
@@ -1038,7 +1042,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == TypedElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.TYPED_ELEMENT__TYPE :
@@ -1179,7 +1184,8 @@
 			case UMLPackage.STRUCTURAL_FEATURE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.STRUCTURAL_FEATURE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STRUCTURAL_FEATURE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.STRUCTURAL_FEATURE___GET_STEREOTYPE_APPLICATIONS :
@@ -1187,7 +1193,8 @@
 			case UMLPackage.STRUCTURAL_FEATURE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.STRUCTURAL_FEATURE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STRUCTURAL_FEATURE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1264,8 +1271,8 @@
 			case UMLPackage.STRUCTURAL_FEATURE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.STRUCTURAL_FEATURE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.STRUCTURAL_FEATURE___VALIDATE_UPPER_GE_LOWER__DIAGNOSTICCHAIN_MAP :
 				return validateUpperGeLower((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
@@ -1297,8 +1304,8 @@
 			case UMLPackage.STRUCTURAL_FEATURE___COMPATIBLE_WITH__MULTIPLICITYELEMENT :
 				return compatibleWith((MultiplicityElement) arguments.get(0));
 			case UMLPackage.STRUCTURAL_FEATURE___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT :
-				return includesMultiplicity((MultiplicityElement) arguments
-					.get(0));
+				return includesMultiplicity(
+					(MultiplicityElement) arguments.get(0));
 			case UMLPackage.STRUCTURAL_FEATURE___IS__INT_INT :
 				return is((Integer) arguments.get(0),
 					(Integer) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredActivityNodeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredActivityNodeImpl.java
index 48a38bc..6eb58e7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredActivityNodeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredActivityNodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 465214
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 465214, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -239,8 +239,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -293,8 +293,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<NamedElement> members = (EList<NamedElement>) cache.get(
-				eResource, this, UMLPackage.Literals.NAMESPACE__MEMBER);
+			EList<NamedElement> members = (EList<NamedElement>) cache
+				.get(eResource, this, UMLPackage.Literals.NAMESPACE__MEMBER);
 			if (members == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.NAMESPACE__MEMBER,
@@ -329,8 +329,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ElementImport createElementImport(PackageableElement importedElement) {
-		ElementImport newElementImport = (ElementImport) create(UMLPackage.Literals.ELEMENT_IMPORT);
+	public ElementImport createElementImport(
+			PackageableElement importedElement) {
+		ElementImport newElementImport = (ElementImport) create(
+			UMLPackage.Literals.ELEMENT_IMPORT);
 		getElementImports().add(newElementImport);
 		if (importedElement != null)
 			newElementImport.setImportedElement(importedElement);
@@ -386,7 +388,8 @@
 	 */
 	public PackageImport createPackageImport(
 			org.eclipse.uml2.uml.Package importedPackage) {
-		PackageImport newPackageImport = (PackageImport) create(UMLPackage.Literals.PACKAGE_IMPORT);
+		PackageImport newPackageImport = (PackageImport) create(
+			UMLPackage.Literals.PACKAGE_IMPORT);
 		getPackageImports().add(newPackageImport);
 		if (importedPackage != null)
 			newPackageImport.setImportedPackage(importedPackage);
@@ -409,7 +412,8 @@
 	 * @generated
 	 */
 	public PackageImport getPackageImport(
-			org.eclipse.uml2.uml.Package importedPackage, boolean createOnDemand) {
+			org.eclipse.uml2.uml.Package importedPackage,
+			boolean createOnDemand) {
 		packageImportLoop : for (PackageImport packageImport : getPackageImports()) {
 			if (importedPackage != null
 				&& !importedPackage.equals(packageImport.getImportedPackage()))
@@ -522,8 +526,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PackageableElement getImportedMember(String name,
-			boolean ignoreCase, EClass eClass) {
+	public PackageableElement getImportedMember(String name, boolean ignoreCase,
+			EClass eClass) {
 		importedMemberLoop : for (PackageableElement importedMember : getImportedMembers()) {
 			if (eClass != null && !eClass.isInstance(importedMember))
 				continue importedMemberLoop;
@@ -603,16 +607,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_NODE);
 			if (containedNodes == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_NODE,
-						containedNodes = new DerivedUnionEObjectEList<ActivityNode>(
-							ActivityNode.class,
-							this,
-							UMLPackage.STRUCTURED_ACTIVITY_NODE__CONTAINED_NODE,
-							CONTAINED_NODE_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_NODE,
+					containedNodes = new DerivedUnionEObjectEList<ActivityNode>(
+						ActivityNode.class, this,
+						UMLPackage.STRUCTURED_ACTIVITY_NODE__CONTAINED_NODE,
+						CONTAINED_NODE_ESUBSETS));
 			}
 			return containedNodes;
 		}
@@ -635,16 +635,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_EDGE);
 			if (containedEdges == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_EDGE,
-						containedEdges = new DerivedUnionEObjectEList<ActivityEdge>(
-							ActivityEdge.class,
-							this,
-							UMLPackage.STRUCTURED_ACTIVITY_NODE__CONTAINED_EDGE,
-							CONTAINED_EDGE_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.ACTIVITY_GROUP__CONTAINED_EDGE,
+					containedEdges = new DerivedUnionEObjectEList<ActivityEdge>(
+						ActivityEdge.class, this,
+						UMLPackage.STRUCTURED_ACTIVITY_NODE__CONTAINED_EDGE,
+						CONTAINED_EDGE_ESUBSETS));
 			}
 			return containedEdges;
 		}
@@ -863,7 +859,8 @@
 	 * @generated
 	 */
 	public OutputPin createStructuredNodeOutput(String name, Type type) {
-		OutputPin newStructuredNodeOutput = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newStructuredNodeOutput = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		getStructuredNodeOutputs().add(newStructuredNodeOutput);
 		if (name != null)
 			newStructuredNodeOutput.setName(name);
@@ -1056,7 +1053,8 @@
 					.getStructuredNodes()).basicAdd(this, msgs);
 			msgs = eBasicSetContainer((InternalEObject) newActivity,
 				InternalEObject.EOPPOSITE_FEATURE_BASE
-					- UMLPackage.ACTIVITY__STRUCTURED_NODE, msgs);
+					- UMLPackage.ACTIVITY__STRUCTURED_NODE,
+				msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
@@ -1100,8 +1098,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateCannotImportOwnedMembers(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateCannotImportOwnedMembers(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return NamespaceOperations.validateCannotImportOwnedMembers(this,
 			diagnostics, context);
 	}
@@ -1259,8 +1257,8 @@
 	 */
 	public boolean validateEdges(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return StructuredActivityNodeOperations.validateEdges(this,
-			diagnostics, context);
+		return StructuredActivityNodeOperations.validateEdges(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -1326,9 +1324,7 @@
 			EList<ActivityNode> result = (EList<ActivityNode>) cache.get(this,
 				UMLPackage.Literals.ACTION___ALL_OWNED_NODES);
 			if (result == null) {
-				cache.put(
-					this,
-					UMLPackage.Literals.ACTION___ALL_OWNED_NODES,
+				cache.put(this, UMLPackage.Literals.ACTION___ALL_OWNED_NODES,
 					result = StructuredActivityNodeOperations
 						.allOwnedNodes(this));
 			}
@@ -1402,11 +1398,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION :
@@ -1415,14 +1411,14 @@
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -1433,14 +1429,14 @@
 				return ((InternalEList<?>) getLocalPreconditions())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__EDGE :
 				return ((InternalEList<?>) getEdges()).basicRemove(otherEnd,
 					msgs);
@@ -1451,8 +1447,8 @@
 				return ((InternalEList<?>) getStructuredNodeOutputs())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__VARIABLE :
-				return ((InternalEList<?>) getVariables()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getVariables()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__NODE :
 				return ((InternalEList<?>) getNodes()).basicRemove(otherEnd,
 					msgs);
@@ -1589,13 +1585,13 @@
 		switch (featureID) {
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__NAME :
 				setName((String) newValue);
@@ -1614,65 +1610,64 @@
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__IN_ACTIVITY :
 				setInActivity((Activity) newValue);
@@ -1687,13 +1682,13 @@
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_INPUT :
 				getStructuredNodeInputs().clear();
-				getStructuredNodeInputs().addAll(
-					(Collection<? extends InputPin>) newValue);
+				getStructuredNodeInputs()
+					.addAll((Collection<? extends InputPin>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_OUTPUT :
 				getStructuredNodeOutputs().clear();
-				getStructuredNodeOutputs().addAll(
-					(Collection<? extends OutputPin>) newValue);
+				getStructuredNodeOutputs()
+					.addAll((Collection<? extends OutputPin>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__VARIABLE :
 				getVariables().clear();
@@ -1862,7 +1857,8 @@
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__INPUT :
 				return isSetInputs();
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -1896,7 +1892,8 @@
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__EDGE :
 				return edges != null && !edges.isEmpty();
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__MUST_ISOLATE :
-				return ((eFlags & MUST_ISOLATE_EFLAG) != 0) != MUST_ISOLATE_EDEFAULT;
+				return ((eFlags
+					& MUST_ISOLATE_EFLAG) != 0) != MUST_ISOLATE_EDEFAULT;
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_INPUT :
 				return structuredNodeInputs != null
 					&& !structuredNodeInputs.isEmpty();
@@ -1917,7 +1914,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Namespace.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.STRUCTURED_ACTIVITY_NODE__OWNED_RULE :
@@ -1961,7 +1959,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == Namespace.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.NAMESPACE__OWNED_RULE :
@@ -2108,7 +2107,8 @@
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___GET_STEREOTYPE_APPLICATIONS :
@@ -2116,7 +2116,8 @@
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -2193,8 +2194,8 @@
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___GET_CONTEXT :
@@ -2232,20 +2233,19 @@
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___MEMBERS_ARE_DISTINGUISHABLE :
 				return membersAreDistinguishable();
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___VALIDATE_NODES_AND_EDGES__DIAGNOSTICCHAIN_MAP :
-				return validateNodesAndEdges(
-					(DiagnosticChain) arguments.get(0),
+				return validateNodesAndEdges((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___VALIDATE_NOT_CONTAINED__DIAGNOSTICCHAIN_MAP :
 				return validateNotContained((DiagnosticChain) arguments.get(0),
@@ -2258,8 +2258,7 @@
 				return validateEdges((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___VALIDATE_INPUT_PIN_EDGES__DIAGNOSTICCHAIN_MAP :
-				return validateInputPinEdges(
-					(DiagnosticChain) arguments.get(0),
+				return validateInputPinEdges((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.STRUCTURED_ACTIVITY_NODE___SOURCE_NODES :
 				return sourceNodes();
@@ -2390,7 +2389,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NamedElement getMember(String name, boolean ignoreCase, EClass eClass) {
+	public NamedElement getMember(String name, boolean ignoreCase,
+			EClass eClass) {
 		memberLoop : for (NamedElement member : getMembers()) {
 			if (eClass != null && !eClass.isInstance(member))
 				continue memberLoop;
@@ -2589,7 +2589,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] CONTAINED_EDGE_ESUBSETS = new int[]{UMLPackage.STRUCTURED_ACTIVITY_NODE__EDGE};
+	protected static final int[] CONTAINED_EDGE_ESUBSETS = new int[]{
+		UMLPackage.STRUCTURED_ACTIVITY_NODE__EDGE};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getContainedNodes() <em>Contained Node</em>}' reference list.
@@ -2599,7 +2600,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] CONTAINED_NODE_ESUBSETS = new int[]{UMLPackage.STRUCTURED_ACTIVITY_NODE__NODE};
+	protected static final int[] CONTAINED_NODE_ESUBSETS = new int[]{
+		UMLPackage.STRUCTURED_ACTIVITY_NODE__NODE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2637,7 +2639,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_INPUT};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_INPUT};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getOutputs() <em>Output</em>}' reference list.
@@ -2647,7 +2650,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_OUTPUT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_OUTPUT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -2674,8 +2678,8 @@
 	 */
 	@Override
 	public boolean isSetInputs() {
-		return super.isSetInputs()
-			|| eIsSet(UMLPackage.STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_INPUT);
+		return super.isSetInputs() || eIsSet(
+			UMLPackage.STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_INPUT);
 	}
 
 	/**
@@ -2685,8 +2689,8 @@
 	 */
 	@Override
 	public boolean isSetOutputs() {
-		return super.isSetOutputs()
-			|| eIsSet(UMLPackage.STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_OUTPUT);
+		return super.isSetOutputs() || eIsSet(
+			UMLPackage.STRUCTURED_ACTIVITY_NODE__STRUCTURED_NODE_OUTPUT);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredClassifierImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredClassifierImpl.java
index ae9f214..f70afbf 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredClassifierImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StructuredClassifierImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -227,8 +227,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<NamedElement> members = (EList<NamedElement>) cache.get(
-				eResource, this, UMLPackage.Literals.NAMESPACE__MEMBER);
+			EList<NamedElement> members = (EList<NamedElement>) cache
+				.get(eResource, this, UMLPackage.Literals.NAMESPACE__MEMBER);
 			if (members == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.NAMESPACE__MEMBER,
@@ -289,7 +289,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Property createOwnedAttribute(String name, Type type, EClass eClass) {
+	public Property createOwnedAttribute(String name, Type type,
+			EClass eClass) {
 		Property newOwnedAttribute = (Property) create(eClass);
 		getOwnedAttributes().add(newOwnedAttribute);
 		if (name != null)
@@ -350,7 +351,8 @@
 
 		@Override
 		public List<Property> basicList() {
-			return new PartEList(dataClass, owner, featureID, sourceFeatureIDs) {
+			return new PartEList(dataClass, owner, featureID,
+				sourceFeatureIDs) {
 
 				@Override
 				public ListIterator<Property> listIterator(int index) {
@@ -376,7 +378,8 @@
 	 * The array of superset feature identifiers for the '{@link #getParts() <em>Part</em>}' reference list.
 	 * @see #getParts()
 	 */
-	protected static final int[] PART_ESUPERSETS = new int[]{UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE};
+	protected static final int[] PART_ESUPERSETS = new int[]{
+		UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -388,15 +391,14 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Property> parts = (EList<Property>) cache.get(eResource,
-				this, UMLPackage.Literals.STRUCTURED_CLASSIFIER__PART);
+			EList<Property> parts = (EList<Property>) cache.get(eResource, this,
+				UMLPackage.Literals.STRUCTURED_CLASSIFIER__PART);
 			if (parts == null) {
-				cache
-					.put(eResource, this,
-						UMLPackage.Literals.STRUCTURED_CLASSIFIER__PART,
-						parts = new PartEList(Property.class, this,
-							UMLPackage.STRUCTURED_CLASSIFIER__PART,
-							PART_ESUPERSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.STRUCTURED_CLASSIFIER__PART,
+					parts = new PartEList(Property.class, this,
+						UMLPackage.STRUCTURED_CLASSIFIER__PART,
+						PART_ESUPERSETS));
 			}
 			return parts;
 		}
@@ -454,7 +456,8 @@
 	 * @generated
 	 */
 	public Connector createOwnedConnector(String name) {
-		Connector newOwnedConnector = (Connector) create(UMLPackage.Literals.CONNECTOR);
+		Connector newOwnedConnector = (Connector) create(
+			UMLPackage.Literals.CONNECTOR);
 		getOwnedConnectors().add(newOwnedConnector);
 		if (name != null)
 			newOwnedConnector.setName(name);
@@ -532,55 +535,55 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.STRUCTURED_CLASSIFIER__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE :
-				return ((InternalEList<?>) getOwnedAttributes()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedAttributes())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_CONNECTOR :
-				return ((InternalEList<?>) getOwnedConnectors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedConnectors())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -708,13 +711,13 @@
 		switch (featureID) {
 			case UMLPackage.STRUCTURED_CLASSIFIER__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__NAME :
 				setName((String) newValue);
@@ -727,18 +730,18 @@
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -754,31 +757,31 @@
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -788,8 +791,8 @@
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__USE_CASE :
 				getUseCases().clear();
@@ -797,26 +800,26 @@
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE :
 				getOwnedAttributes().clear();
-				getOwnedAttributes().addAll(
-					(Collection<? extends Property>) newValue);
+				getOwnedAttributes()
+					.addAll((Collection<? extends Property>) newValue);
 				return;
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_CONNECTOR :
 				getOwnedConnectors().clear();
-				getOwnedConnectors().addAll(
-					(Collection<? extends Connector>) newValue);
+				getOwnedConnectors()
+					.addAll((Collection<? extends Connector>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -989,9 +992,11 @@
 			case UMLPackage.STRUCTURED_CLASSIFIER__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.STRUCTURED_CLASSIFIER__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.STRUCTURED_CLASSIFIER__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.STRUCTURED_CLASSIFIER__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.STRUCTURED_CLASSIFIER__USE_CASE :
@@ -1072,7 +1077,8 @@
 			case UMLPackage.STRUCTURED_CLASSIFIER___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.STRUCTURED_CLASSIFIER___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STRUCTURED_CLASSIFIER___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.STRUCTURED_CLASSIFIER___GET_STEREOTYPE_APPLICATIONS :
@@ -1080,7 +1086,8 @@
 			case UMLPackage.STRUCTURED_CLASSIFIER___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.STRUCTURED_CLASSIFIER___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.STRUCTURED_CLASSIFIER___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1169,13 +1176,13 @@
 			case UMLPackage.STRUCTURED_CLASSIFIER___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.STRUCTURED_CLASSIFIER___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.STRUCTURED_CLASSIFIER___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.STRUCTURED_CLASSIFIER___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.STRUCTURED_CLASSIFIER___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.STRUCTURED_CLASSIFIER___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1195,10 +1202,11 @@
 			case UMLPackage.STRUCTURED_CLASSIFIER___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.STRUCTURED_CLASSIFIER___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.STRUCTURED_CLASSIFIER___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.STRUCTURED_CLASSIFIER___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.STRUCTURED_CLASSIFIER___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1329,7 +1337,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] ATTRIBUTE_ESUBSETS = new int[]{UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE};
+	protected static final int[] ATTRIBUTE_ESUBSETS = new int[]{
+		UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1383,7 +1392,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] ROLE_ESUBSETS = new int[]{UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE};
+	protected static final int[] ROLE_ESUBSETS = new int[]{
+		UMLPackage.STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SubstitutionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SubstitutionImpl.java
index f637558..c74102a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SubstitutionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SubstitutionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -142,7 +142,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SUPPLIER_ESUBSETS = new int[]{UMLPackage.SUBSTITUTION__CONTRACT};
+	protected static final int[] SUPPLIER_ESUBSETS = new int[]{
+		UMLPackage.SUBSTITUTION__CONTRACT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -153,8 +154,8 @@
 	public EList<NamedElement> getClients() {
 		if (clients == null) {
 			clients = new SubsetSupersetEObjectResolvingEList<NamedElement>(
-				NamedElement.class, this, UMLPackage.SUBSTITUTION__CLIENT,
-				null, CLIENT_ESUBSETS);
+				NamedElement.class, this, UMLPackage.SUBSTITUTION__CLIENT, null,
+				CLIENT_ESUBSETS);
 		}
 		return clients;
 	}
@@ -167,7 +168,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] CLIENT_ESUBSETS = new int[]{UMLPackage.SUBSTITUTION__SUBSTITUTING_CLASSIFIER};
+	protected static final int[] CLIENT_ESUBSETS = new int[]{
+		UMLPackage.SUBSTITUTION__SUBSTITUTING_CLASSIFIER};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -267,9 +269,11 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setSubstitutingClassifier(Classifier newSubstitutingClassifier) {
+	public void setSubstitutingClassifier(
+			Classifier newSubstitutingClassifier) {
 		if (newSubstitutingClassifier != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.SUBSTITUTION__SUBSTITUTING_CLASSIFIER && newSubstitutingClassifier != null)) {
+			|| (eContainerFeatureID() != UMLPackage.SUBSTITUTION__SUBSTITUTING_CLASSIFIER
+				&& newSubstitutingClassifier != null)) {
 			if (EcoreUtil.isAncestor(this, newSubstitutingClassifier))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -310,10 +314,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.SUBSTITUTION__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.SUBSTITUTION__SUBSTITUTING_CLASSIFIER :
@@ -335,11 +339,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.SUBSTITUTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SUBSTITUTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.SUBSTITUTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.SUBSTITUTION__OWNING_TEMPLATE_PARAMETER :
@@ -368,9 +372,9 @@
 					UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 					TemplateParameter.class, msgs);
 			case UMLPackage.SUBSTITUTION__SUBSTITUTING_CLASSIFIER :
-				return eInternalContainer()
-					.eInverseRemove(this, UMLPackage.CLASSIFIER__SUBSTITUTION,
-						Classifier.class, msgs);
+				return eInternalContainer().eInverseRemove(this,
+					UMLPackage.CLASSIFIER__SUBSTITUTION, Classifier.class,
+					msgs);
 		}
 		return eDynamicBasicRemoveFromContainer(msgs);
 	}
@@ -454,13 +458,13 @@
 		switch (featureID) {
 			case UMLPackage.SUBSTITUTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.SUBSTITUTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.SUBSTITUTION__NAME :
 				setName((String) newValue);
@@ -479,13 +483,13 @@
 				return;
 			case UMLPackage.SUBSTITUTION__CLIENT :
 				getClients().clear();
-				getClients().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getClients()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.SUBSTITUTION__SUPPLIER :
 				getSuppliers().clear();
-				getSuppliers().addAll(
-					(Collection<? extends NamedElement>) newValue);
+				getSuppliers()
+					.addAll((Collection<? extends NamedElement>) newValue);
 				return;
 			case UMLPackage.SUBSTITUTION__MAPPING :
 				setMapping((OpaqueExpression) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateBindingImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateBindingImpl.java
index 00f12c3..867229d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateBindingImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateBindingImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -123,8 +123,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> targets = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
+			EList<Element> targets = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET);
 			if (targets == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__TARGET,
@@ -149,8 +149,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -176,8 +176,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> sources = (EList<Element>) cache.get(eResource,
-				this, UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
+			EList<Element> sources = (EList<Element>) cache.get(eResource, this,
+				UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE);
 			if (sources == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.DIRECTED_RELATIONSHIP__SOURCE,
@@ -229,7 +229,8 @@
 		signature = newSignature;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.TEMPLATE_BINDING__SIGNATURE, oldSignature, signature));
+				UMLPackage.TEMPLATE_BINDING__SIGNATURE, oldSignature,
+				signature));
 	}
 
 	/**
@@ -253,7 +254,8 @@
 	 * @generated
 	 */
 	public TemplateParameterSubstitution createParameterSubstitution() {
-		TemplateParameterSubstitution newParameterSubstitution = (TemplateParameterSubstitution) create(UMLPackage.Literals.TEMPLATE_PARAMETER_SUBSTITUTION);
+		TemplateParameterSubstitution newParameterSubstitution = (TemplateParameterSubstitution) create(
+			UMLPackage.Literals.TEMPLATE_PARAMETER_SUBSTITUTION);
 		getParameterSubstitutions().add(newParameterSubstitution);
 		return newParameterSubstitution;
 	}
@@ -299,7 +301,8 @@
 	 */
 	public void setBoundElement(TemplateableElement newBoundElement) {
 		if (newBoundElement != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.TEMPLATE_BINDING__BOUND_ELEMENT && newBoundElement != null)) {
+			|| (eContainerFeatureID() != UMLPackage.TEMPLATE_BINDING__BOUND_ELEMENT
+				&& newBoundElement != null)) {
 			if (EcoreUtil.isAncestor(this, newBoundElement))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -326,8 +329,8 @@
 	 */
 	public boolean validateParameterSubstitutionFormal(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return TemplateBindingOperations.validateParameterSubstitutionFormal(
-			this, diagnostics, context);
+		return TemplateBindingOperations
+			.validateParameterSubstitutionFormal(this, diagnostics, context);
 	}
 
 	/**
@@ -335,8 +338,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateOneParameterSubstitution(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateOneParameterSubstitution(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return TemplateBindingOperations.validateOneParameterSubstitution(this,
 			diagnostics, context);
 	}
@@ -376,11 +379,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.TEMPLATE_BINDING__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEMPLATE_BINDING__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEMPLATE_BINDING__PARAMETER_SUBSTITUTION :
 				return ((InternalEList<?>) getParameterSubstitutions())
 					.basicRemove(otherEnd, msgs);
@@ -456,19 +459,18 @@
 		switch (featureID) {
 			case UMLPackage.TEMPLATE_BINDING__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TEMPLATE_BINDING__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TEMPLATE_BINDING__PARAMETER_SUBSTITUTION :
 				getParameterSubstitutions().clear();
-				getParameterSubstitutions()
-					.addAll(
-						(Collection<? extends TemplateParameterSubstitution>) newValue);
+				getParameterSubstitutions().addAll(
+					(Collection<? extends TemplateParameterSubstitution>) newValue);
 				return;
 			case UMLPackage.TEMPLATE_BINDING__SIGNATURE :
 				setSignature((TemplateSignature) newValue);
@@ -597,7 +599,8 @@
 			case UMLPackage.TEMPLATE_BINDING___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.TEMPLATE_BINDING___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TEMPLATE_BINDING___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.TEMPLATE_BINDING___GET_STEREOTYPE_APPLICATIONS :
@@ -605,7 +608,8 @@
 			case UMLPackage.TEMPLATE_BINDING___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.TEMPLATE_BINDING___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TEMPLATE_BINDING___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -675,7 +679,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] TARGET_ESUBSETS = new int[]{UMLPackage.TEMPLATE_BINDING__SIGNATURE};
+	protected static final int[] TARGET_ESUBSETS = new int[]{
+		UMLPackage.TEMPLATE_BINDING__SIGNATURE};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -734,7 +739,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SOURCE_ESUBSETS = new int[]{UMLPackage.TEMPLATE_BINDING__BOUND_ELEMENT};
+	protected static final int[] SOURCE_ESUBSETS = new int[]{
+		UMLPackage.TEMPLATE_BINDING__BOUND_ELEMENT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterImpl.java
index 377f3bc..7196067 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -154,8 +154,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -179,7 +179,8 @@
 	public ParameterableElement getParameteredElement() {
 		if (parameteredElement != null && parameteredElement.eIsProxy()) {
 			InternalEObject oldParameteredElement = (InternalEObject) parameteredElement;
-			parameteredElement = (ParameterableElement) eResolveProxy(oldParameteredElement);
+			parameteredElement = (ParameterableElement) eResolveProxy(
+				oldParameteredElement);
 			if (parameteredElement != oldParameteredElement) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -205,7 +206,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetParameteredElement(
-			ParameterableElement newParameteredElement, NotificationChain msgs) {
+			ParameterableElement newParameteredElement,
+			NotificationChain msgs) {
 		ParameterableElement oldParameteredElement = parameteredElement;
 		parameteredElement = newParameteredElement;
 		if (eNotificationRequired()) {
@@ -233,7 +235,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setParameteredElement(ParameterableElement newParameteredElement) {
+	public void setParameteredElement(
+			ParameterableElement newParameteredElement) {
 		if (newParameteredElement != parameteredElement) {
 			NotificationChain msgs = null;
 			if (parameteredElement != null)
@@ -341,7 +344,8 @@
 	 */
 	public void setSignature(TemplateSignature newSignature) {
 		if (newSignature != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.TEMPLATE_PARAMETER__SIGNATURE && newSignature != null)) {
+			|| (eContainerFeatureID() != UMLPackage.TEMPLATE_PARAMETER__SIGNATURE
+				&& newSignature != null)) {
 			if (EcoreUtil.isAncestor(this, newSignature))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -370,27 +374,23 @@
 		if (ownedParameteredElement != null
 			&& ownedParameteredElement.eIsProxy()) {
 			InternalEObject oldOwnedParameteredElement = (InternalEObject) ownedParameteredElement;
-			ownedParameteredElement = (ParameterableElement) eResolveProxy(oldOwnedParameteredElement);
+			ownedParameteredElement = (ParameterableElement) eResolveProxy(
+				oldOwnedParameteredElement);
 			if (ownedParameteredElement != oldOwnedParameteredElement) {
 				InternalEObject newOwnedParameteredElement = (InternalEObject) ownedParameteredElement;
 				NotificationChain msgs = oldOwnedParameteredElement
-					.eInverseRemove(
-						this,
+					.eInverseRemove(this,
 						UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER,
 						ParameterableElement.class, null);
 				if (newOwnedParameteredElement.eInternalContainer() == null) {
-					msgs = newOwnedParameteredElement
-						.eInverseAdd(
-							this,
-							UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER,
-							ParameterableElement.class, msgs);
+					msgs = newOwnedParameteredElement.eInverseAdd(this,
+						UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER,
+						ParameterableElement.class, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 						oldOwnedParameteredElement, ownedParameteredElement));
 			}
@@ -449,14 +449,12 @@
 			NotificationChain msgs = null;
 			if (ownedParameteredElement != null)
 				msgs = ((InternalEObject) ownedParameteredElement)
-					.eInverseRemove(
-						this,
+					.eInverseRemove(this,
 						UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER,
 						ParameterableElement.class, msgs);
 			if (newOwnedParameteredElement != null)
 				msgs = ((InternalEObject) newOwnedParameteredElement)
-					.eInverseAdd(
-						this,
+					.eInverseAdd(this,
 						UMLPackage.PARAMETERABLE_ELEMENT__OWNING_TEMPLATE_PARAMETER,
 						ParameterableElement.class, msgs);
 			msgs = basicSetOwnedParameteredElement(newOwnedParameteredElement,
@@ -475,7 +473,8 @@
 	 * @generated
 	 */
 	public ParameterableElement createOwnedParameteredElement(EClass eClass) {
-		ParameterableElement newOwnedParameteredElement = (ParameterableElement) create(eClass);
+		ParameterableElement newOwnedParameteredElement = (ParameterableElement) create(
+			eClass);
 		setOwnedParameteredElement(newOwnedParameteredElement);
 		return newOwnedParameteredElement;
 	}
@@ -488,13 +487,14 @@
 	public ParameterableElement getOwnedDefault() {
 		if (ownedDefault != null && ownedDefault.eIsProxy()) {
 			InternalEObject oldOwnedDefault = (InternalEObject) ownedDefault;
-			ownedDefault = (ParameterableElement) eResolveProxy(oldOwnedDefault);
+			ownedDefault = (ParameterableElement) eResolveProxy(
+				oldOwnedDefault);
 			if (ownedDefault != oldOwnedDefault) {
 				InternalEObject newOwnedDefault = (InternalEObject) ownedDefault;
 				NotificationChain msgs = oldOwnedDefault.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEMPLATE_PARAMETER__OWNED_DEFAULT, null,
-					null);
+						- UMLPackage.TEMPLATE_PARAMETER__OWNED_DEFAULT,
+					null, null);
 				if (newOwnedDefault.eInternalContainer() == null) {
 					msgs = newOwnedDefault.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
@@ -561,13 +561,13 @@
 			if (ownedDefault != null)
 				msgs = ((InternalEObject) ownedDefault).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEMPLATE_PARAMETER__OWNED_DEFAULT, null,
-					msgs);
+						- UMLPackage.TEMPLATE_PARAMETER__OWNED_DEFAULT,
+					null, msgs);
 			if (newOwnedDefault != null)
 				msgs = ((InternalEObject) newOwnedDefault).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEMPLATE_PARAMETER__OWNED_DEFAULT, null,
-					msgs);
+						- UMLPackage.TEMPLATE_PARAMETER__OWNED_DEFAULT,
+					null, msgs);
 			msgs = basicSetOwnedDefault(newOwnedDefault, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -583,7 +583,8 @@
 	 * @generated
 	 */
 	public ParameterableElement createOwnedDefault(EClass eClass) {
-		ParameterableElement newOwnedDefault = (ParameterableElement) create(eClass);
+		ParameterableElement newOwnedDefault = (ParameterableElement) create(
+			eClass);
 		setOwnedDefault(newOwnedDefault);
 		return newOwnedDefault;
 	}
@@ -615,8 +616,7 @@
 			case UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT :
 				if (parameteredElement != null)
 					msgs = ((InternalEObject) parameteredElement)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							UMLPackage.PARAMETERABLE_ELEMENT__TEMPLATE_PARAMETER,
 							ParameterableElement.class, msgs);
 				return basicSetParameteredElement(
@@ -628,8 +628,7 @@
 			case UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT :
 				if (ownedParameteredElement != null)
 					msgs = ((InternalEObject) ownedParameteredElement)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							EOPPOSITE_FEATURE_BASE
 								- UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 							null, msgs);
@@ -649,11 +648,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.TEMPLATE_PARAMETER__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEMPLATE_PARAMETER__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEMPLATE_PARAMETER__OWNED_DEFAULT :
 				return basicSetOwnedDefault(null, msgs);
 			case UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT :
@@ -736,13 +735,13 @@
 		switch (featureID) {
 			case UMLPackage.TEMPLATE_PARAMETER__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TEMPLATE_PARAMETER__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TEMPLATE_PARAMETER__DEFAULT :
 				setDefault((ParameterableElement) newValue);
@@ -883,7 +882,8 @@
 			case UMLPackage.TEMPLATE_PARAMETER___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.TEMPLATE_PARAMETER___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TEMPLATE_PARAMETER___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.TEMPLATE_PARAMETER___GET_STEREOTYPE_APPLICATIONS :
@@ -891,7 +891,8 @@
 			case UMLPackage.TEMPLATE_PARAMETER___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.TEMPLATE_PARAMETER___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TEMPLATE_PARAMETER___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterSubstitutionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterSubstitutionImpl.java
index 13ed624..35d98bb 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterSubstitutionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateParameterSubstitutionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 451350
+ *   Kenn Hussey (CEA) - 327039, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -131,19 +131,15 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
-						ownedElements = new DerivedUnionEObjectEList<Element>(
-							Element.class,
-							this,
-							UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ELEMENT,
-							OWNED_ELEMENT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
+					ownedElements = new DerivedUnionEObjectEList<Element>(
+						Element.class, this,
+						UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ELEMENT,
+						OWNED_ELEMENT_ESUBSETS));
 			}
 			return ownedElements;
 		}
@@ -205,26 +201,20 @@
 			ownedActual = (ParameterableElement) eResolveProxy(oldOwnedActual);
 			if (ownedActual != oldOwnedActual) {
 				InternalEObject newOwnedActual = (InternalEObject) ownedActual;
-				NotificationChain msgs = oldOwnedActual
-					.eInverseRemove(
-						this,
+				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, null);
-				if (newOwnedActual.eInternalContainer() == null) {
-					msgs = newOwnedActual
-						.eInverseAdd(
-							this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL,
-							null, msgs);
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL,
 						oldOwnedActual, ownedActual));
 			}
@@ -280,19 +270,15 @@
 		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);
+				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 = ((InternalEObject) newOwnedActual).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL,
+					null, msgs);
 			msgs = basicSetOwnedActual(newOwnedActual, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -308,7 +294,8 @@
 	 * @generated
 	 */
 	public ParameterableElement createOwnedActual(EClass eClass) {
-		ParameterableElement newOwnedActual = (ParameterableElement) create(eClass);
+		ParameterableElement newOwnedActual = (ParameterableElement) create(
+			eClass);
 		setOwnedActual(newOwnedActual);
 		return newOwnedActual;
 	}
@@ -354,7 +341,8 @@
 	 */
 	public void setTemplateBinding(TemplateBinding newTemplateBinding) {
 		if (newTemplateBinding != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING && newTemplateBinding != null)) {
+			|| (eContainerFeatureID() != UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING
+				&& newTemplateBinding != null)) {
 			if (EcoreUtil.isAncestor(this, newTemplateBinding))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -401,7 +389,8 @@
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING :
 				if (eInternalContainer() != null)
 					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetTemplateBinding((TemplateBinding) otherEnd, msgs);
+				return basicSetTemplateBinding((TemplateBinding) otherEnd,
+					msgs);
 		}
 		return eDynamicInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -416,11 +405,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL :
 				return basicSetOwnedActual(null, msgs);
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING :
@@ -495,13 +484,13 @@
 		switch (featureID) {
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL :
 				setActual((ParameterableElement) newValue);
@@ -634,7 +623,8 @@
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION___GET_STEREOTYPE_APPLICATIONS :
@@ -642,7 +632,8 @@
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -782,8 +773,8 @@
 	 */
 	@Override
 	public boolean isSetOwner() {
-		return super.isSetOwner()
-			|| eIsSet(UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING);
+		return super.isSetOwner() || eIsSet(
+			UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__TEMPLATE_BINDING);
 	}
 
 } //TemplateParameterSubstitutionImpl
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateSignatureImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateSignatureImpl.java
index 30e1e51..1d5ddde 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateSignatureImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateSignatureImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -121,8 +121,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -194,7 +194,8 @@
 	 */
 	public void setTemplate(TemplateableElement newTemplate) {
 		if (newTemplate != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.TEMPLATE_SIGNATURE__TEMPLATE && newTemplate != null)) {
+			|| (eContainerFeatureID() != UMLPackage.TEMPLATE_SIGNATURE__TEMPLATE
+				&& newTemplate != null)) {
 			if (EcoreUtil.isAncestor(this, newTemplate))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -236,7 +237,8 @@
 	 * @generated
 	 */
 	public TemplateParameter createOwnedParameter(EClass eClass) {
-		TemplateParameter newOwnedParameter = (TemplateParameter) create(eClass);
+		TemplateParameter newOwnedParameter = (TemplateParameter) create(
+			eClass);
 		getOwnedParameters().add(newOwnedParameter);
 		return newOwnedParameter;
 	}
@@ -306,16 +308,16 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.TEMPLATE_SIGNATURE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEMPLATE_SIGNATURE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEMPLATE_SIGNATURE__TEMPLATE :
 				return basicSetTemplate(null, msgs);
 			case UMLPackage.TEMPLATE_SIGNATURE__OWNED_PARAMETER :
-				return ((InternalEList<?>) getOwnedParameters()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedParameters())
+					.basicRemove(otherEnd, msgs);
 		}
 		return eDynamicInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -378,26 +380,26 @@
 		switch (featureID) {
 			case UMLPackage.TEMPLATE_SIGNATURE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TEMPLATE_SIGNATURE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TEMPLATE_SIGNATURE__PARAMETER :
 				getParameters().clear();
-				getParameters().addAll(
-					(Collection<? extends TemplateParameter>) newValue);
+				getParameters()
+					.addAll((Collection<? extends TemplateParameter>) newValue);
 				return;
 			case UMLPackage.TEMPLATE_SIGNATURE__TEMPLATE :
 				setTemplate((TemplateableElement) newValue);
 				return;
 			case UMLPackage.TEMPLATE_SIGNATURE__OWNED_PARAMETER :
 				getOwnedParameters().clear();
-				getOwnedParameters().addAll(
-					(Collection<? extends TemplateParameter>) newValue);
+				getOwnedParameters()
+					.addAll((Collection<? extends TemplateParameter>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -513,7 +515,8 @@
 			case UMLPackage.TEMPLATE_SIGNATURE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.TEMPLATE_SIGNATURE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TEMPLATE_SIGNATURE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.TEMPLATE_SIGNATURE___GET_STEREOTYPE_APPLICATIONS :
@@ -521,7 +524,8 @@
 			case UMLPackage.TEMPLATE_SIGNATURE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.TEMPLATE_SIGNATURE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TEMPLATE_SIGNATURE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -579,7 +583,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] PARAMETER_ESUBSETS = new int[]{UMLPackage.TEMPLATE_SIGNATURE__OWNED_PARAMETER};
+	protected static final int[] PARAMETER_ESUBSETS = new int[]{
+		UMLPackage.TEMPLATE_SIGNATURE__OWNED_PARAMETER};
 
 	/**
 	 * The array of superset feature identifiers for the '{@link #getOwnedParameters() <em>Owned Parameter</em>}' containment reference list.
@@ -589,7 +594,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_PARAMETER_ESUPERSETS = new int[]{UMLPackage.TEMPLATE_SIGNATURE__PARAMETER};
+	protected static final int[] OWNED_PARAMETER_ESUPERSETS = new int[]{
+		UMLPackage.TEMPLATE_SIGNATURE__PARAMETER};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateableElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateableElementImpl.java
index a10a50c..1e75432 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateableElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateableElementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -116,8 +116,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -154,7 +154,8 @@
 	 * @generated
 	 */
 	public TemplateBinding createTemplateBinding(TemplateSignature signature) {
-		TemplateBinding newTemplateBinding = (TemplateBinding) create(UMLPackage.Literals.TEMPLATE_BINDING);
+		TemplateBinding newTemplateBinding = (TemplateBinding) create(
+			UMLPackage.Literals.TEMPLATE_BINDING);
 		getTemplateBindings().add(newTemplateBinding);
 		if (signature != null)
 			newTemplateBinding.setSignature(signature);
@@ -194,9 +195,11 @@
 	 * @generated
 	 */
 	public TemplateSignature getOwnedTemplateSignature() {
-		if (ownedTemplateSignature != null && ownedTemplateSignature.eIsProxy()) {
+		if (ownedTemplateSignature != null
+			&& ownedTemplateSignature.eIsProxy()) {
 			InternalEObject oldOwnedTemplateSignature = (InternalEObject) ownedTemplateSignature;
-			ownedTemplateSignature = (TemplateSignature) eResolveProxy(oldOwnedTemplateSignature);
+			ownedTemplateSignature = (TemplateSignature) eResolveProxy(
+				oldOwnedTemplateSignature);
 			if (ownedTemplateSignature != oldOwnedTemplateSignature) {
 				InternalEObject newOwnedTemplateSignature = (InternalEObject) ownedTemplateSignature;
 				NotificationChain msgs = oldOwnedTemplateSignature
@@ -211,9 +214,7 @@
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(
-						this,
-						Notification.RESOLVE,
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE,
 						oldOwnedTemplateSignature, ownedTemplateSignature));
 			}
@@ -236,7 +237,8 @@
 	 * @generated
 	 */
 	public NotificationChain basicSetOwnedTemplateSignature(
-			TemplateSignature newOwnedTemplateSignature, NotificationChain msgs) {
+			TemplateSignature newOwnedTemplateSignature,
+			NotificationChain msgs) {
 		TemplateSignature oldOwnedTemplateSignature = ownedTemplateSignature;
 		ownedTemplateSignature = newOwnedTemplateSignature;
 		if (eNotificationRequired()) {
@@ -286,7 +288,8 @@
 	 * @generated
 	 */
 	public TemplateSignature createOwnedTemplateSignature(EClass eClass) {
-		TemplateSignature newOwnedTemplateSignature = (TemplateSignature) create(eClass);
+		TemplateSignature newOwnedTemplateSignature = (TemplateSignature) create(
+			eClass);
 		setOwnedTemplateSignature(newOwnedTemplateSignature);
 		return newOwnedTemplateSignature;
 	}
@@ -297,7 +300,8 @@
 	 * @generated
 	 */
 	public TemplateSignature createOwnedTemplateSignature() {
-		return createOwnedTemplateSignature(UMLPackage.Literals.TEMPLATE_SIGNATURE);
+		return createOwnedTemplateSignature(
+			UMLPackage.Literals.TEMPLATE_SIGNATURE);
 	}
 
 	/**
@@ -310,16 +314,13 @@
 		if (cache != null) {
 			@SuppressWarnings("unchecked")
 			EList<ParameterableElement> result = (EList<ParameterableElement>) cache
-				.get(
-					this,
+				.get(this,
 					UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS);
 			if (result == null) {
-				cache
-					.put(
-						this,
-						UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS,
-						result = TemplateableElementOperations
-							.parameterableElements(this));
+				cache.put(this,
+					UMLPackage.Literals.TEMPLATEABLE_ELEMENT___PARAMETERABLE_ELEMENTS,
+					result = TemplateableElementOperations
+						.parameterableElements(this));
 			}
 			return result;
 		}
@@ -354,8 +355,7 @@
 			case UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(
-							this,
+						.eInverseRemove(this,
 							EOPPOSITE_FEATURE_BASE
 								- UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
@@ -375,14 +375,14 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.TEMPLATEABLE_ELEMENT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEMPLATEABLE_ELEMENT__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 		}
@@ -428,18 +428,18 @@
 		switch (featureID) {
 			case UMLPackage.TEMPLATEABLE_ELEMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TEMPLATEABLE_ELEMENT__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
@@ -553,7 +553,8 @@
 			case UMLPackage.TEMPLATEABLE_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.TEMPLATEABLE_ELEMENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TEMPLATEABLE_ELEMENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.TEMPLATEABLE_ELEMENT___GET_STEREOTYPE_APPLICATIONS :
@@ -561,7 +562,8 @@
 			case UMLPackage.TEMPLATEABLE_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.TEMPLATEABLE_ELEMENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TEMPLATEABLE_ELEMENT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -618,7 +620,8 @@
 	public boolean isSetOwnedElements() {
 		return super.isSetOwnedElements()
 			|| eIsSet(UMLPackage.TEMPLATEABLE_ELEMENT__TEMPLATE_BINDING)
-			|| eIsSet(UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE);
+			|| eIsSet(
+				UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE);
 	}
 
 } //TemplateableElementImpl
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TestIdentityActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TestIdentityActionImpl.java
index a8777bf..399f159 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TestIdentityActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TestIdentityActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -144,12 +144,11 @@
 			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.TEST_IDENTITY_ACTION__INPUT,
-							INPUT_ESUBSETS));
+				cache.put(eResource, this, UMLPackage.Literals.ACTION__INPUT,
+					inputs = new DerivedUnionEObjectEList<InputPin>(
+						InputPin.class, this,
+						UMLPackage.TEST_IDENTITY_ACTION__INPUT,
+						INPUT_ESUBSETS));
 			}
 			return inputs;
 		}
@@ -194,18 +193,23 @@
 			first = (InputPin) eResolveProxy(oldFirst);
 			if (first != oldFirst) {
 				InternalEObject newFirst = (InternalEObject) first;
-				NotificationChain msgs = oldFirst.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEST_IDENTITY_ACTION__FIRST, null, null);
+				NotificationChain msgs = oldFirst
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEST_IDENTITY_ACTION__FIRST,
+						null, null);
 				if (newFirst.eInternalContainer() == null) {
-					msgs = newFirst.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEST_IDENTITY_ACTION__FIRST, null, msgs);
+					msgs = newFirst.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEST_IDENTITY_ACTION__FIRST,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.TEST_IDENTITY_ACTION__FIRST, oldFirst, first));
+						UMLPackage.TEST_IDENTITY_ACTION__FIRST, oldFirst,
+						first));
 			}
 		}
 		return first;
@@ -250,13 +254,17 @@
 		if (newFirst != first) {
 			NotificationChain msgs = null;
 			if (first != null)
-				msgs = ((InternalEObject) first).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEST_IDENTITY_ACTION__FIRST, null, msgs);
+				msgs = ((InternalEObject) first)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEST_IDENTITY_ACTION__FIRST,
+						null, msgs);
 			if (newFirst != null)
-				msgs = ((InternalEObject) newFirst).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEST_IDENTITY_ACTION__FIRST, null, msgs);
+				msgs = ((InternalEObject) newFirst)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEST_IDENTITY_ACTION__FIRST,
+						null, msgs);
 			msgs = basicSetFirst(newFirst, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -300,12 +308,16 @@
 			second = (InputPin) eResolveProxy(oldSecond);
 			if (second != oldSecond) {
 				InternalEObject newSecond = (InternalEObject) second;
-				NotificationChain msgs = oldSecond.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEST_IDENTITY_ACTION__SECOND, null, null);
+				NotificationChain msgs = oldSecond
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEST_IDENTITY_ACTION__SECOND,
+						null, null);
 				if (newSecond.eInternalContainer() == null) {
-					msgs = newSecond.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEST_IDENTITY_ACTION__SECOND, null, msgs);
+					msgs = newSecond.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEST_IDENTITY_ACTION__SECOND,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -357,13 +369,17 @@
 		if (newSecond != second) {
 			NotificationChain msgs = null;
 			if (second != null)
-				msgs = ((InternalEObject) second).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEST_IDENTITY_ACTION__SECOND, null, msgs);
+				msgs = ((InternalEObject) second)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEST_IDENTITY_ACTION__SECOND,
+						null, msgs);
 			if (newSecond != null)
-				msgs = ((InternalEObject) newSecond).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEST_IDENTITY_ACTION__SECOND, null, msgs);
+				msgs = ((InternalEObject) newSecond)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEST_IDENTITY_ACTION__SECOND,
+						null, msgs);
 			msgs = basicSetSecond(newSecond, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -407,12 +423,16 @@
 			result = (OutputPin) eResolveProxy(oldResult);
 			if (result != oldResult) {
 				InternalEObject newResult = (InternalEObject) result;
-				NotificationChain msgs = oldResult.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEST_IDENTITY_ACTION__RESULT, null, null);
+				NotificationChain msgs = oldResult
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEST_IDENTITY_ACTION__RESULT,
+						null, null);
 				if (newResult.eInternalContainer() == null) {
-					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEST_IDENTITY_ACTION__RESULT, null, msgs);
+					msgs = newResult.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEST_IDENTITY_ACTION__RESULT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -464,13 +484,17 @@
 		if (newResult != result) {
 			NotificationChain msgs = null;
 			if (result != null)
-				msgs = ((InternalEObject) result).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEST_IDENTITY_ACTION__RESULT, null, msgs);
+				msgs = ((InternalEObject) result)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEST_IDENTITY_ACTION__RESULT,
+						null, msgs);
 			if (newResult != null)
-				msgs = ((InternalEObject) newResult).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TEST_IDENTITY_ACTION__RESULT, null, msgs);
+				msgs = ((InternalEObject) newResult)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEST_IDENTITY_ACTION__RESULT,
+						null, msgs);
 			msgs = basicSetResult(newResult, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -485,7 +509,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -537,11 +562,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.TEST_IDENTITY_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEST_IDENTITY_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEST_IDENTITY_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.TEST_IDENTITY_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -550,14 +575,14 @@
 			case UMLPackage.TEST_IDENTITY_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.TEST_IDENTITY_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.TEST_IDENTITY_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.TEST_IDENTITY_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TEST_IDENTITY_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -680,13 +705,13 @@
 		switch (featureID) {
 			case UMLPackage.TEST_IDENTITY_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TEST_IDENTITY_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TEST_IDENTITY_ACTION__NAME :
 				setName((String) newValue);
@@ -705,50 +730,49 @@
 				return;
 			case UMLPackage.TEST_IDENTITY_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.TEST_IDENTITY_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.TEST_IDENTITY_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.TEST_IDENTITY_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.TEST_IDENTITY_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.TEST_IDENTITY_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.TEST_IDENTITY_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.TEST_IDENTITY_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.TEST_IDENTITY_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.TEST_IDENTITY_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.TEST_IDENTITY_ACTION__FIRST :
 				setFirst((InputPin) newValue);
@@ -895,7 +919,8 @@
 			case UMLPackage.TEST_IDENTITY_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.TEST_IDENTITY_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.TEST_IDENTITY_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -971,7 +996,8 @@
 			case UMLPackage.TEST_IDENTITY_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.TEST_IDENTITY_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TEST_IDENTITY_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.TEST_IDENTITY_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -979,7 +1005,8 @@
 			case UMLPackage.TEST_IDENTITY_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.TEST_IDENTITY_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TEST_IDENTITY_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1056,8 +1083,8 @@
 			case UMLPackage.TEST_IDENTITY_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.TEST_IDENTITY_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.TEST_IDENTITY_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.TEST_IDENTITY_ACTION___GET_CONTEXT :
@@ -1114,7 +1141,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.TEST_IDENTITY_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.TEST_IDENTITY_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeConstraintImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeConstraintImpl.java
index 4ebee69..0cb4a05 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeConstraintImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeConstraintImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
- *   Kenn Hussey (CEA) - 327039, 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -139,17 +139,19 @@
 	public ValueSpecification getSpecification() {
 		if (specification != null && specification.eIsProxy()) {
 			InternalEObject oldSpecification = (InternalEObject) specification;
-			specification = (ValueSpecification) eResolveProxy(oldSpecification);
+			specification = (ValueSpecification) eResolveProxy(
+				oldSpecification);
 			if (specification != oldSpecification) {
 				InternalEObject newSpecification = (InternalEObject) specification;
-				NotificationChain msgs = oldSpecification
-					.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TIME_CONSTRAINT__SPECIFICATION, null, null);
+				NotificationChain msgs = oldSpecification.eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.TIME_CONSTRAINT__SPECIFICATION,
+					null, null);
 				if (newSpecification.eInternalContainer() == null) {
 					msgs = newSpecification.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.TIME_CONSTRAINT__SPECIFICATION, null,
-						msgs);
+							- UMLPackage.TIME_CONSTRAINT__SPECIFICATION,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -214,13 +216,15 @@
 		if (newSpecification != specification) {
 			NotificationChain msgs = null;
 			if (specification != null)
-				msgs = ((InternalEObject) specification)
-					.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TIME_CONSTRAINT__SPECIFICATION, null, msgs);
+				msgs = ((InternalEObject) specification).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.TIME_CONSTRAINT__SPECIFICATION,
+					null, msgs);
 			if (newSpecification != null)
-				msgs = ((InternalEObject) newSpecification)
-					.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TIME_CONSTRAINT__SPECIFICATION, null, msgs);
+				msgs = ((InternalEObject) newSpecification).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE
+						- UMLPackage.TIME_CONSTRAINT__SPECIFICATION,
+					null, msgs);
 			msgs = basicSetSpecification(newSpecification, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -237,7 +241,8 @@
 	 */
 	public ValueSpecification createSpecification(String name, Type type,
 			EClass eClass) {
-		ValueSpecification newSpecification = (ValueSpecification) create(eClass);
+		ValueSpecification newSpecification = (ValueSpecification) create(
+			eClass);
 		setSpecification(newSpecification);
 		if (name != null)
 			newSpecification.setName(name);
@@ -261,8 +266,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateHasOneConstrainedElement(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateHasOneConstrainedElement(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return TimeConstraintOperations.validateHasOneConstrainedElement(this,
 			diagnostics, context);
 	}
@@ -277,11 +282,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.TIME_CONSTRAINT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TIME_CONSTRAINT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TIME_CONSTRAINT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.TIME_CONSTRAINT__OWNING_TEMPLATE_PARAMETER :
@@ -365,13 +370,13 @@
 		switch (featureID) {
 			case UMLPackage.TIME_CONSTRAINT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TIME_CONSTRAINT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TIME_CONSTRAINT__NAME :
 				setName((String) newValue);
@@ -390,8 +395,8 @@
 				return;
 			case UMLPackage.TIME_CONSTRAINT__CONSTRAINED_ELEMENT :
 				getConstrainedElements().clear();
-				getConstrainedElements().addAll(
-					(Collection<? extends Element>) newValue);
+				getConstrainedElements()
+					.addAll((Collection<? extends Element>) newValue);
 				return;
 			case UMLPackage.TIME_CONSTRAINT__CONTEXT :
 				setContext((Namespace) newValue);
@@ -493,7 +498,8 @@
 			case UMLPackage.TIME_CONSTRAINT__SPECIFICATION :
 				return isSetSpecification();
 			case UMLPackage.TIME_CONSTRAINT__FIRST_EVENT :
-				return ((eFlags & FIRST_EVENT_EFLAG) != 0) != FIRST_EVENT_EDEFAULT;
+				return ((eFlags
+					& FIRST_EVENT_EFLAG) != 0) != FIRST_EVENT_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
@@ -555,7 +561,8 @@
 			case UMLPackage.TIME_CONSTRAINT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.TIME_CONSTRAINT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TIME_CONSTRAINT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.TIME_CONSTRAINT___GET_STEREOTYPE_APPLICATIONS :
@@ -563,7 +570,8 @@
 			case UMLPackage.TIME_CONSTRAINT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.TIME_CONSTRAINT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TIME_CONSTRAINT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -626,7 +634,8 @@
 			case UMLPackage.TIME_CONSTRAINT___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.TIME_CONSTRAINT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.TIME_CONSTRAINT___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.TIME_CONSTRAINT___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -637,8 +646,7 @@
 				return validateBooleanValue((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.TIME_CONSTRAINT___VALIDATE_NO_SIDE_EFFECTS__DIAGNOSTICCHAIN_MAP :
-				return validateNoSideEffects(
-					(DiagnosticChain) arguments.get(0),
+				return validateNoSideEffects((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.TIME_CONSTRAINT___VALIDATE_NOT_APPLY_TO_SELF__DIAGNOSTICCHAIN_MAP :
 				return validateNotApplyToSelf(
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeEventImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeEventImpl.java
index a893c61..4b6cfb0 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeEventImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeEventImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -133,8 +133,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -190,8 +190,9 @@
 					EOPPOSITE_FEATURE_BASE - UMLPackage.TIME_EVENT__WHEN, null,
 					null);
 				if (newWhen.eInternalContainer() == null) {
-					msgs = newWhen.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TIME_EVENT__WHEN, null, msgs);
+					msgs = newWhen.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - UMLPackage.TIME_EVENT__WHEN,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -223,7 +224,8 @@
 		when = newWhen;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this,
-				Notification.SET, UMLPackage.TIME_EVENT__WHEN, oldWhen, newWhen);
+				Notification.SET, UMLPackage.TIME_EVENT__WHEN, oldWhen,
+				newWhen);
 			if (msgs == null)
 				msgs = notification;
 			else
@@ -262,7 +264,8 @@
 	 * @generated
 	 */
 	public TimeExpression createWhen(String name, Type type) {
-		TimeExpression newWhen = (TimeExpression) create(UMLPackage.Literals.TIME_EXPRESSION);
+		TimeExpression newWhen = (TimeExpression) create(
+			UMLPackage.Literals.TIME_EXPRESSION);
 		setWhen(newWhen);
 		if (name != null)
 			newWhen.setName(name);
@@ -292,11 +295,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.TIME_EVENT__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TIME_EVENT__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TIME_EVENT__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.TIME_EVENT__OWNING_TEMPLATE_PARAMETER :
@@ -372,13 +375,13 @@
 		switch (featureID) {
 			case UMLPackage.TIME_EVENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TIME_EVENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TIME_EVENT__NAME :
 				setName((String) newValue);
@@ -479,7 +482,8 @@
 			case UMLPackage.TIME_EVENT__TEMPLATE_PARAMETER :
 				return templateParameter != null;
 			case UMLPackage.TIME_EVENT__IS_RELATIVE :
-				return ((eFlags & IS_RELATIVE_EFLAG) != 0) != IS_RELATIVE_EDEFAULT;
+				return ((eFlags
+					& IS_RELATIVE_EFLAG) != 0) != IS_RELATIVE_EDEFAULT;
 			case UMLPackage.TIME_EVENT__WHEN :
 				return when != null;
 		}
@@ -543,7 +547,8 @@
 			case UMLPackage.TIME_EVENT___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.TIME_EVENT___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TIME_EVENT___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.TIME_EVENT___GET_STEREOTYPE_APPLICATIONS :
@@ -551,7 +556,8 @@
 			case UMLPackage.TIME_EVENT___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.TIME_EVENT___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TIME_EVENT___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -614,7 +620,8 @@
 			case UMLPackage.TIME_EVENT___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.TIME_EVENT___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.TIME_EVENT___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.TIME_EVENT___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeExpressionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeExpressionImpl.java
index a6922c0..0e1b129 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeExpressionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeExpressionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -120,8 +120,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -236,7 +236,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ValueSpecification createExpr(String name, Type type, EClass eClass) {
+	public ValueSpecification createExpr(String name, Type type,
+			EClass eClass) {
 		ValueSpecification newExpr = (ValueSpecification) create(eClass);
 		setExpr(newExpr);
 		if (name != null)
@@ -319,11 +320,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.TIME_EXPRESSION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TIME_EXPRESSION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TIME_EXPRESSION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.TIME_EXPRESSION__OWNING_TEMPLATE_PARAMETER :
@@ -403,13 +404,13 @@
 		switch (featureID) {
 			case UMLPackage.TIME_EXPRESSION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TIME_EXPRESSION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TIME_EXPRESSION__NAME :
 				setName((String) newValue);
@@ -434,8 +435,8 @@
 				return;
 			case UMLPackage.TIME_EXPRESSION__OBSERVATION :
 				getObservations().clear();
-				getObservations().addAll(
-					(Collection<? extends Observation>) newValue);
+				getObservations()
+					.addAll((Collection<? extends Observation>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -584,7 +585,8 @@
 			case UMLPackage.TIME_EXPRESSION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.TIME_EXPRESSION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TIME_EXPRESSION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.TIME_EXPRESSION___GET_STEREOTYPE_APPLICATIONS :
@@ -592,7 +594,8 @@
 			case UMLPackage.TIME_EXPRESSION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.TIME_EXPRESSION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TIME_EXPRESSION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -655,7 +658,8 @@
 			case UMLPackage.TIME_EXPRESSION___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.TIME_EXPRESSION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.TIME_EXPRESSION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.TIME_EXPRESSION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeIntervalImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeIntervalImpl.java
index fa643bd..8d8d547 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeIntervalImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeIntervalImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 212765, 418466, 451350
+ *   Kenn Hussey (CEA) - 212765, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -249,13 +249,13 @@
 		switch (featureID) {
 			case UMLPackage.TIME_INTERVAL__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TIME_INTERVAL__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TIME_INTERVAL__NAME :
 				setName((String) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeObservationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeObservationImpl.java
index 2a3c7bc..4ed5ea5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeObservationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TimeObservationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -228,13 +228,13 @@
 		switch (featureID) {
 			case UMLPackage.TIME_OBSERVATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TIME_OBSERVATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TIME_OBSERVATION__NAME :
 				setName((String) newValue);
@@ -337,7 +337,8 @@
 			case UMLPackage.TIME_OBSERVATION__EVENT :
 				return event != null;
 			case UMLPackage.TIME_OBSERVATION__FIRST_EVENT :
-				return ((eFlags & FIRST_EVENT_EFLAG) != 0) != FIRST_EVENT_EDEFAULT;
+				return ((eFlags
+					& FIRST_EVENT_EFLAG) != 0) != FIRST_EVENT_EDEFAULT;
 		}
 		return eDynamicIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java
index 2410a30..18024c4 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -165,7 +165,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int KIND_EFLAG_DEFAULT = KIND_EDEFAULT.ordinal() << KIND_EFLAG_OFFSET;
+	protected static final int KIND_EFLAG_DEFAULT = KIND_EDEFAULT
+		.ordinal() << KIND_EFLAG_OFFSET;
 
 	/**
 	 * The array of enumeration values for '{@link TransitionKind Transition Kind}'
@@ -261,15 +262,12 @@
 				.get(eResource, this,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT);
 			if (redefinedElements == null) {
-				cache
-					.put(
-						eResource,
-						this,
-						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
-						redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
-							RedefinableElement.class, this,
-							UMLPackage.TRANSITION__REDEFINED_ELEMENT,
-							REDEFINED_ELEMENT_ESUBSETS));
+				cache.put(eResource, this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT,
+					redefinedElements = new DerivedUnionEObjectEList<RedefinableElement>(
+						RedefinableElement.class, this,
+						UMLPackage.TRANSITION__REDEFINED_ELEMENT,
+						REDEFINED_ELEMENT_ESUBSETS));
 			}
 			return redefinedElements;
 		}
@@ -290,8 +288,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -315,8 +313,8 @@
 	public EList<Constraint> getOwnedRules() {
 		if (ownedRules == null) {
 			ownedRules = new SubsetSupersetEObjectContainmentWithInverseEList.Resolving<Constraint>(
-				Constraint.class, this, UMLPackage.TRANSITION__OWNED_RULE,
-				null, OWNED_RULE_ESUBSETS, UMLPackage.CONSTRAINT__CONTEXT);
+				Constraint.class, this, UMLPackage.TRANSITION__OWNED_RULE, null,
+				OWNED_RULE_ESUBSETS, UMLPackage.CONSTRAINT__CONTEXT);
 		}
 		return ownedRules;
 	}
@@ -340,15 +338,12 @@
 					? Collections.<Classifier> emptyList()
 					: Collections
 						.<Classifier> singletonList(redefinitionContext);
-				cache
-					.put(
-						this,
+				cache.put(this,
+					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
+					result = new EcoreEList.UnmodifiableEList<Classifier>(this,
 						UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-						result = new EcoreEList.UnmodifiableEList<Classifier>(
-							this,
-							UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT,
-							redefinitionContexts.size(), redefinitionContexts
-								.toArray()));
+						redefinitionContexts.size(),
+						redefinitionContexts.toArray()));
 			}
 
 			return result;
@@ -453,7 +448,8 @@
 	 * @generated
 	 */
 	public void setKind(TransitionKind newKind) {
-		TransitionKind oldKind = KIND_EFLAG_VALUES[(eFlags & KIND_EFLAG) >>> KIND_EFLAG_OFFSET];
+		TransitionKind oldKind = KIND_EFLAG_VALUES[(eFlags
+			& KIND_EFLAG) >>> KIND_EFLAG_OFFSET];
 		if (newKind == null)
 			newKind = KIND_EDEFAULT;
 		eFlags = eFlags & ~KIND_EFLAG | newKind.ordinal() << KIND_EFLAG_OFFSET;
@@ -503,7 +499,8 @@
 	 */
 	public void setContainer(Region newContainer) {
 		if (newContainer != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.TRANSITION__CONTAINER && newContainer != null)) {
+			|| (eContainerFeatureID() != UMLPackage.TRANSITION__CONTAINER
+				&& newContainer != null)) {
 			if (EcoreUtil.isAncestor(this, newContainer))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -569,7 +566,8 @@
 	public Transition getRedefinedTransition() {
 		if (redefinedTransition != null && redefinedTransition.eIsProxy()) {
 			InternalEObject oldRedefinedTransition = (InternalEObject) redefinedTransition;
-			redefinedTransition = (Transition) eResolveProxy(oldRedefinedTransition);
+			redefinedTransition = (Transition) eResolveProxy(
+				oldRedefinedTransition);
 			if (redefinedTransition != oldRedefinedTransition) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -689,8 +687,9 @@
 					EOPPOSITE_FEATURE_BASE - UMLPackage.TRANSITION__EFFECT,
 					null, null);
 				if (newEffect.eInternalContainer() == null) {
-					msgs = newEffect.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.TRANSITION__EFFECT, null, msgs);
+					msgs = newEffect.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - UMLPackage.TRANSITION__EFFECT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -868,10 +867,10 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateRedefinitionContextValid(
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return RedefinableElementOperations.validateRedefinitionContextValid(
-			this, diagnostics, context);
+	public boolean validateRedefinitionContextValid(DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return RedefinableElementOperations
+			.validateRedefinitionContextValid(this, diagnostics, context);
 	}
 
 	/**
@@ -881,8 +880,8 @@
 	 */
 	public boolean validateRedefinitionConsistent(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return RedefinableElementOperations.validateRedefinitionConsistent(
-			this, diagnostics, context);
+		return RedefinableElementOperations.validateRedefinitionConsistent(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -903,8 +902,8 @@
 	 */
 	public boolean validateForkSegmentGuards(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return TransitionOperations.validateForkSegmentGuards(this,
-			diagnostics, context);
+		return TransitionOperations.validateForkSegmentGuards(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -914,8 +913,8 @@
 	 */
 	public boolean validateJoinSegmentGuards(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return TransitionOperations.validateJoinSegmentGuards(this,
-			diagnostics, context);
+		return TransitionOperations.validateJoinSegmentGuards(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -969,8 +968,8 @@
 	 */
 	public boolean validateInitialTransition(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return TransitionOperations.validateInitialTransition(this,
-			diagnostics, context);
+		return TransitionOperations.validateInitialTransition(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -1073,22 +1072,22 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.TRANSITION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TRANSITION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TRANSITION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.TRANSITION__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TRANSITION__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TRANSITION__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.TRANSITION__EFFECT :
 				return basicSetEffect(null, msgs);
 			case UMLPackage.TRANSITION__TRIGGER :
@@ -1211,13 +1210,13 @@
 		switch (featureID) {
 			case UMLPackage.TRANSITION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TRANSITION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TRANSITION__NAME :
 				setName((String) newValue);
@@ -1230,18 +1229,18 @@
 				return;
 			case UMLPackage.TRANSITION__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.TRANSITION__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.TRANSITION__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.TRANSITION__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -1412,7 +1411,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == RedefinableElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.TRANSITION__IS_LEAF :
@@ -1434,7 +1434,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == RedefinableElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.REDEFINABLE_ELEMENT__IS_LEAF :
@@ -1533,7 +1534,8 @@
 			case UMLPackage.TRANSITION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.TRANSITION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TRANSITION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.TRANSITION___GET_STEREOTYPE_APPLICATIONS :
@@ -1541,7 +1543,8 @@
 			case UMLPackage.TRANSITION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.TRANSITION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TRANSITION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1630,13 +1633,13 @@
 			case UMLPackage.TRANSITION___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.TRANSITION___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.TRANSITION___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.TRANSITION___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.TRANSITION___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.TRANSITION___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1656,8 +1659,8 @@
 			case UMLPackage.TRANSITION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.TRANSITION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.TRANSITION___VALIDATE_STATE_IS_EXTERNAL__DIAGNOSTICCHAIN_MAP :
 				return validateStateIsExternal(
 					(DiagnosticChain) arguments.get(0),
@@ -1715,8 +1718,8 @@
 		result.append(" (isLeaf: "); //$NON-NLS-1$
 		result.append((eFlags & IS_LEAF_EFLAG) != 0);
 		result.append(", kind: "); //$NON-NLS-1$
-		result
-			.append(KIND_EFLAG_VALUES[(eFlags & KIND_EFLAG) >>> KIND_EFLAG_OFFSET]);
+		result.append(
+			KIND_EFLAG_VALUES[(eFlags & KIND_EFLAG) >>> KIND_EFLAG_OFFSET]);
 		result.append(')');
 		return result.toString();
 	}
@@ -1729,7 +1732,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{UMLPackage.TRANSITION__REDEFINED_TRANSITION};
+	protected static final int[] REDEFINED_ELEMENT_ESUBSETS = new int[]{
+		UMLPackage.TRANSITION__REDEFINED_TRANSITION};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1808,7 +1812,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_RULE_ESUBSETS = new int[]{UMLPackage.TRANSITION__GUARD};
+	protected static final int[] OWNED_RULE_ESUBSETS = new int[]{
+		UMLPackage.TRANSITION__GUARD};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TriggerImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TriggerImpl.java
index 91f111e..419cee2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TriggerImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TriggerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -244,13 +244,13 @@
 		switch (featureID) {
 			case UMLPackage.TRIGGER__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TRIGGER__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TRIGGER__NAME :
 				setName((String) newValue);
@@ -400,7 +400,8 @@
 			case UMLPackage.TRIGGER___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.TRIGGER___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TRIGGER___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.TRIGGER___GET_STEREOTYPE_APPLICATIONS :
@@ -408,7 +409,8 @@
 			case UMLPackage.TRIGGER___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.TRIGGER___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TRIGGER___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypeImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypeImpl.java
index 1e4fe21..2b97065 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypeImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -116,7 +116,8 @@
 	public org.eclipse.uml2.uml.Package getPackage() {
 		org.eclipse.uml2.uml.Package package_ = basicGetPackage();
 		return package_ != null && package_.eIsProxy()
-			? (org.eclipse.uml2.uml.Package) eResolveProxy((InternalEObject) package_)
+			? (org.eclipse.uml2.uml.Package) eResolveProxy(
+				(InternalEObject) package_)
 			: package_;
 	}
 
@@ -150,7 +151,8 @@
 					.basicAdd(this, msgs);
 			msgs = eBasicSetContainer((InternalEObject) newPackage,
 				InternalEObject.EOPPOSITE_FEATURE_BASE
-					- UMLPackage.PACKAGE__PACKAGED_ELEMENT, msgs);
+					- UMLPackage.PACKAGE__PACKAGED_ELEMENT,
+				msgs);
 			if (msgs != null)
 				msgs.dispatch();
 		} else if (eNotificationRequired())
@@ -263,13 +265,13 @@
 		switch (featureID) {
 			case UMLPackage.TYPE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TYPE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TYPE__NAME :
 				setName((String) newValue);
@@ -426,7 +428,8 @@
 			case UMLPackage.TYPE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.TYPE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TYPE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.TYPE___GET_STEREOTYPE_APPLICATIONS :
@@ -434,7 +437,8 @@
 			case UMLPackage.TYPE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.TYPE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.TYPE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -497,7 +501,8 @@
 			case UMLPackage.TYPE___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.TYPE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.TYPE___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.TYPE___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypedElementImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypedElementImpl.java
index a297fd8..67fd771 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypedElementImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TypedElementImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -167,13 +167,13 @@
 		switch (featureID) {
 			case UMLPackage.TYPED_ELEMENT__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.TYPED_ELEMENT__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.TYPED_ELEMENT__NAME :
 				setName((String) newValue);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLFactoryImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLFactoryImpl.java
index 5a8f647..f6e6f1a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLFactoryImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188
- *   Kenn Hussey (CEA) - 327039, 351774, 397324, 418466
+ *   Kenn Hussey (CEA) - 327039, 351774, 397324, 418466, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -663,8 +663,8 @@
 			case UMLPackage.TIME_OBSERVATION :
 				return createTimeObservation();
 			default :
-				throw new IllegalArgumentException(
-					"The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+				throw new IllegalArgumentException("The class '" //$NON-NLS-1$
+					+ eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$
 		}
 	}
 
@@ -708,8 +708,8 @@
 				return createInteractionOperatorKindFromString(eDataType,
 					initialValue);
 			default :
-				throw new IllegalArgumentException(
-					"The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+				throw new IllegalArgumentException("The datatype '" //$NON-NLS-1$
+					+ eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$
 		}
 	}
 
@@ -753,8 +753,8 @@
 				return convertInteractionOperatorKindToString(eDataType,
 					instanceValue);
 			default :
-				throw new IllegalArgumentException(
-					"The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+				throw new IllegalArgumentException("The datatype '" //$NON-NLS-1$
+					+ eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$
 		}
 	}
 
@@ -2697,8 +2697,9 @@
 			String initialValue) {
 		VisibilityKind result = VisibilityKind.get(initialValue);
 		if (result == null)
-			throw new IllegalArgumentException(
-				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			throw new IllegalArgumentException("The value '" + initialValue //$NON-NLS-1$
+				+ "' is not a valid enumerator of '" + eDataType.getName() //$NON-NLS-1$
+				+ "'"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -2723,8 +2724,9 @@
 			EDataType eDataType, String initialValue) {
 		CallConcurrencyKind result = CallConcurrencyKind.get(initialValue);
 		if (result == null)
-			throw new IllegalArgumentException(
-				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			throw new IllegalArgumentException("The value '" + initialValue //$NON-NLS-1$
+				+ "' is not a valid enumerator of '" + eDataType.getName() //$NON-NLS-1$
+				+ "'"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -2749,8 +2751,9 @@
 			String initialValue) {
 		TransitionKind result = TransitionKind.get(initialValue);
 		if (result == null)
-			throw new IllegalArgumentException(
-				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			throw new IllegalArgumentException("The value '" + initialValue //$NON-NLS-1$
+				+ "' is not a valid enumerator of '" + eDataType.getName() //$NON-NLS-1$
+				+ "'"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -2775,8 +2778,9 @@
 			String initialValue) {
 		PseudostateKind result = PseudostateKind.get(initialValue);
 		if (result == null)
-			throw new IllegalArgumentException(
-				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			throw new IllegalArgumentException("The value '" + initialValue //$NON-NLS-1$
+				+ "' is not a valid enumerator of '" + eDataType.getName() //$NON-NLS-1$
+				+ "'"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -2801,8 +2805,9 @@
 			String initialValue) {
 		AggregationKind result = AggregationKind.get(initialValue);
 		if (result == null)
-			throw new IllegalArgumentException(
-				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			throw new IllegalArgumentException("The value '" + initialValue //$NON-NLS-1$
+				+ "' is not a valid enumerator of '" + eDataType.getName() //$NON-NLS-1$
+				+ "'"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -2828,8 +2833,9 @@
 		ParameterDirectionKind result = ParameterDirectionKind
 			.get(initialValue);
 		if (result == null)
-			throw new IllegalArgumentException(
-				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			throw new IllegalArgumentException("The value '" + initialValue //$NON-NLS-1$
+				+ "' is not a valid enumerator of '" + eDataType.getName() //$NON-NLS-1$
+				+ "'"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -2854,8 +2860,9 @@
 			EDataType eDataType, String initialValue) {
 		ParameterEffectKind result = ParameterEffectKind.get(initialValue);
 		if (result == null)
-			throw new IllegalArgumentException(
-				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			throw new IllegalArgumentException("The value '" + initialValue //$NON-NLS-1$
+				+ "' is not a valid enumerator of '" + eDataType.getName() //$NON-NLS-1$
+				+ "'"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -2880,8 +2887,9 @@
 			String initialValue) {
 		ConnectorKind result = ConnectorKind.get(initialValue);
 		if (result == null)
-			throw new IllegalArgumentException(
-				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			throw new IllegalArgumentException("The value '" + initialValue //$NON-NLS-1$
+				+ "' is not a valid enumerator of '" + eDataType.getName() //$NON-NLS-1$
+				+ "'"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -2906,8 +2914,9 @@
 			String initialValue) {
 		MessageKind result = MessageKind.get(initialValue);
 		if (result == null)
-			throw new IllegalArgumentException(
-				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			throw new IllegalArgumentException("The value '" + initialValue //$NON-NLS-1$
+				+ "' is not a valid enumerator of '" + eDataType.getName() //$NON-NLS-1$
+				+ "'"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -2932,8 +2941,9 @@
 			String initialValue) {
 		MessageSort result = MessageSort.get(initialValue);
 		if (result == null)
-			throw new IllegalArgumentException(
-				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			throw new IllegalArgumentException("The value '" + initialValue //$NON-NLS-1$
+				+ "' is not a valid enumerator of '" + eDataType.getName() //$NON-NLS-1$
+				+ "'"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -2959,8 +2969,9 @@
 		ObjectNodeOrderingKind result = ObjectNodeOrderingKind
 			.get(initialValue);
 		if (result == null)
-			throw new IllegalArgumentException(
-				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			throw new IllegalArgumentException("The value '" + initialValue //$NON-NLS-1$
+				+ "' is not a valid enumerator of '" + eDataType.getName() //$NON-NLS-1$
+				+ "'"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -2986,8 +2997,9 @@
 		InteractionOperatorKind result = InteractionOperatorKind
 			.get(initialValue);
 		if (result == null)
-			throw new IllegalArgumentException(
-				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			throw new IllegalArgumentException("The value '" + initialValue //$NON-NLS-1$
+				+ "' is not a valid enumerator of '" + eDataType.getName() //$NON-NLS-1$
+				+ "'"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -3012,8 +3024,9 @@
 			String initialValue) {
 		ExpansionKind result = ExpansionKind.get(initialValue);
 		if (result == null)
-			throw new IllegalArgumentException(
-				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			throw new IllegalArgumentException("The value '" + initialValue //$NON-NLS-1$
+				+ "' is not a valid enumerator of '" + eDataType.getName() //$NON-NLS-1$
+				+ "'"); //$NON-NLS-1$
 		return result;
 	}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLPackageImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLPackageImpl.java
index f27ad15..026c634 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLPackageImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UMLPackageImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188, 247980
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 366083, 382637, 297216, 418466
+ *   Kenn Hussey (CEA) - 327039, 351774, 366083, 382637, 297216, 418466, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -1897,8 +1897,8 @@
 		// Obtain or create and register package
 		UMLPackageImpl theUMLPackage = (UMLPackageImpl) (EPackage.Registry.INSTANCE
 			.get(eNS_URI) instanceof UMLPackageImpl
-			? EPackage.Registry.INSTANCE.get(eNS_URI)
-			: new UMLPackageImpl());
+				? EPackage.Registry.INSTANCE.get(eNS_URI)
+				: new UMLPackageImpl());
 
 		isInited = true;
 
@@ -3579,7 +3579,7 @@
 	 * @generated
 	 */
 	public EOperation getPackage__GetOwnedTypes() {
-		return getPackage().getEOperations().get(22);
+		return getPackage().getEOperations().get(23);
 	}
 
 	/**
@@ -3605,7 +3605,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getPackage__AllApplicableStereotypes() {
+	public EOperation getPackage__ApplyProfiles__EList() {
 		return getPackage().getEOperations().get(17);
 	}
 
@@ -3614,7 +3614,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getPackage__ContainingProfile() {
+	public EOperation getPackage__AllApplicableStereotypes() {
 		return getPackage().getEOperations().get(18);
 	}
 
@@ -3623,6 +3623,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EOperation getPackage__ContainingProfile() {
+		return getPackage().getEOperations().get(19);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EOperation getPackage__GetAppliedProfiles() {
 		return getPackage().getEOperations().get(11);
 	}
@@ -3696,7 +3705,7 @@
 	 * @generated
 	 */
 	public EOperation getPackage__VisibleMembers() {
-		return getPackage().getEOperations().get(23);
+		return getPackage().getEOperations().get(24);
 	}
 
 	/**
@@ -3705,15 +3714,6 @@
 	 * @generated
 	 */
 	public EOperation getPackage__MakesVisible__NamedElement() {
-		return getPackage().getEOperations().get(19);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EOperation getPackage__GetNestedPackages() {
 		return getPackage().getEOperations().get(20);
 	}
 
@@ -3722,7 +3722,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EOperation getPackage__GetOwnedStereotypes() {
+	public EOperation getPackage__GetNestedPackages() {
 		return getPackage().getEOperations().get(21);
 	}
 
@@ -3731,6 +3731,15 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EOperation getPackage__GetOwnedStereotypes() {
+		return getPackage().getEOperations().get(22);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getPackageMerge() {
 		if (packageMergeEClass == null) {
 			packageMergeEClass = (EClass) EPackage.Registry.INSTANCE
@@ -5350,8 +5359,8 @@
 	 * @generated
 	 */
 	public EAttribute getOpaqueExpression_Body() {
-		return (EAttribute) getOpaqueExpression().getEStructuralFeatures().get(
-			1);
+		return (EAttribute) getOpaqueExpression().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -5360,8 +5369,8 @@
 	 * @generated
 	 */
 	public EAttribute getOpaqueExpression_Language() {
-		return (EAttribute) getOpaqueExpression().getEStructuralFeatures().get(
-			2);
+		return (EAttribute) getOpaqueExpression().getEStructuralFeatures()
+			.get(2);
 	}
 
 	/**
@@ -5370,8 +5379,8 @@
 	 * @generated
 	 */
 	public EReference getOpaqueExpression_Result() {
-		return (EReference) getOpaqueExpression().getEStructuralFeatures().get(
-			3);
+		return (EReference) getOpaqueExpression().getEStructuralFeatures()
+			.get(3);
 	}
 
 	/**
@@ -5380,8 +5389,8 @@
 	 * @generated
 	 */
 	public EReference getOpaqueExpression_Behavior() {
-		return (EReference) getOpaqueExpression().getEStructuralFeatures().get(
-			0);
+		return (EReference) getOpaqueExpression().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -6474,8 +6483,8 @@
 	 * @generated
 	 */
 	public EReference getDeploymentTarget_Deployment() {
-		return (EReference) getDeploymentTarget().getEStructuralFeatures().get(
-			1);
+		return (EReference) getDeploymentTarget().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -6493,8 +6502,8 @@
 	 * @generated
 	 */
 	public EReference getDeploymentTarget_DeployedElement() {
-		return (EReference) getDeploymentTarget().getEStructuralFeatures().get(
-			0);
+		return (EReference) getDeploymentTarget().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -8880,8 +8889,8 @@
 	 * @generated
 	 */
 	public EReference getCollaborationUse_Type() {
-		return (EReference) getCollaborationUse().getEStructuralFeatures().get(
-			1);
+		return (EReference) getCollaborationUse().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -8890,8 +8899,8 @@
 	 * @generated
 	 */
 	public EReference getCollaborationUse_RoleBinding() {
-		return (EReference) getCollaborationUse().getEStructuralFeatures().get(
-			0);
+		return (EReference) getCollaborationUse().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -9308,8 +9317,8 @@
 	 * @generated
 	 */
 	public EReference getEncapsulatedClassifier_OwnedPort() {
-		return (EReference) getEncapsulatedClassifier()
-			.getEStructuralFeatures().get(0);
+		return (EReference) getEncapsulatedClassifier().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -9505,8 +9514,8 @@
 	 * @generated
 	 */
 	public EReference getStringExpression_SubExpression() {
-		return (EReference) getStringExpression().getEStructuralFeatures().get(
-			1);
+		return (EReference) getStringExpression().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -9515,8 +9524,8 @@
 	 * @generated
 	 */
 	public EReference getStringExpression_OwningExpression() {
-		return (EReference) getStringExpression().getEStructuralFeatures().get(
-			0);
+		return (EReference) getStringExpression().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -11419,8 +11428,8 @@
 	 * @generated
 	 */
 	public EReference getStructuredActivityNode_Variable() {
-		return (EReference) getStructuredActivityNode()
-			.getEStructuralFeatures().get(4);
+		return (EReference) getStructuredActivityNode().getEStructuralFeatures()
+			.get(4);
 	}
 
 	/**
@@ -11429,8 +11438,8 @@
 	 * @generated
 	 */
 	public EReference getStructuredActivityNode_Node() {
-		return (EReference) getStructuredActivityNode()
-			.getEStructuralFeatures().get(5);
+		return (EReference) getStructuredActivityNode().getEStructuralFeatures()
+			.get(5);
 	}
 
 	/**
@@ -11439,8 +11448,8 @@
 	 * @generated
 	 */
 	public EReference getStructuredActivityNode_StructuredNodeInput() {
-		return (EReference) getStructuredActivityNode()
-			.getEStructuralFeatures().get(2);
+		return (EReference) getStructuredActivityNode().getEStructuralFeatures()
+			.get(2);
 	}
 
 	/**
@@ -11449,8 +11458,8 @@
 	 * @generated
 	 */
 	public EReference getStructuredActivityNode_StructuredNodeOutput() {
-		return (EReference) getStructuredActivityNode()
-			.getEStructuralFeatures().get(3);
+		return (EReference) getStructuredActivityNode().getEStructuralFeatures()
+			.get(3);
 	}
 
 	/**
@@ -11495,8 +11504,8 @@
 	 * @generated
 	 */
 	public EAttribute getStructuredActivityNode_MustIsolate() {
-		return (EAttribute) getStructuredActivityNode()
-			.getEStructuralFeatures().get(1);
+		return (EAttribute) getStructuredActivityNode().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -11505,8 +11514,8 @@
 	 * @generated
 	 */
 	public EReference getStructuredActivityNode_Edge() {
-		return (EReference) getStructuredActivityNode()
-			.getEStructuralFeatures().get(0);
+		return (EReference) getStructuredActivityNode().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -11619,8 +11628,8 @@
 	 * @generated
 	 */
 	public EReference getExceptionHandler_HandlerBody() {
-		return (EReference) getExceptionHandler().getEStructuralFeatures().get(
-			2);
+		return (EReference) getExceptionHandler().getEStructuralFeatures()
+			.get(2);
 	}
 
 	/**
@@ -11629,8 +11638,8 @@
 	 * @generated
 	 */
 	public EReference getExceptionHandler_ExceptionInput() {
-		return (EReference) getExceptionHandler().getEStructuralFeatures().get(
-			0);
+		return (EReference) getExceptionHandler().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -11639,8 +11648,8 @@
 	 * @generated
 	 */
 	public EReference getExceptionHandler_ExceptionType() {
-		return (EReference) getExceptionHandler().getEStructuralFeatures().get(
-			1);
+		return (EReference) getExceptionHandler().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -11649,8 +11658,8 @@
 	 * @generated
 	 */
 	public EReference getExceptionHandler_ProtectedNode() {
-		return (EReference) getExceptionHandler().getEStructuralFeatures().get(
-			3);
+		return (EReference) getExceptionHandler().getEStructuralFeatures()
+			.get(3);
 	}
 
 	/**
@@ -12126,8 +12135,8 @@
 	 * @generated
 	 */
 	public EReference getExecutionSpecification_Start() {
-		return (EReference) getExecutionSpecification()
-			.getEStructuralFeatures().get(1);
+		return (EReference) getExecutionSpecification().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -12136,8 +12145,8 @@
 	 * @generated
 	 */
 	public EReference getExecutionSpecification_Finish() {
-		return (EReference) getExecutionSpecification()
-			.getEStructuralFeatures().get(0);
+		return (EReference) getExecutionSpecification().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -12294,8 +12303,8 @@
 	 * @generated
 	 */
 	public EAttribute getCombinedFragment_InteractionOperator() {
-		return (EAttribute) getCombinedFragment().getEStructuralFeatures().get(
-			1);
+		return (EAttribute) getCombinedFragment().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -12304,8 +12313,8 @@
 	 * @generated
 	 */
 	public EReference getCombinedFragment_Operand() {
-		return (EReference) getCombinedFragment().getEStructuralFeatures().get(
-			2);
+		return (EReference) getCombinedFragment().getEStructuralFeatures()
+			.get(2);
 	}
 
 	/**
@@ -12314,8 +12323,8 @@
 	 * @generated
 	 */
 	public EReference getCombinedFragment_CfragmentGate() {
-		return (EReference) getCombinedFragment().getEStructuralFeatures().get(
-			0);
+		return (EReference) getCombinedFragment().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -12413,8 +12422,8 @@
 	 * @generated
 	 */
 	public EReference getConsiderIgnoreFragment_Message() {
-		return (EReference) getConsiderIgnoreFragment()
-			.getEStructuralFeatures().get(0);
+		return (EReference) getConsiderIgnoreFragment().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -13520,8 +13529,8 @@
 	 * @generated
 	 */
 	public EAttribute getLinkEndDestructionData_IsDestroyDuplicates() {
-		return (EAttribute) getLinkEndDestructionData()
-			.getEStructuralFeatures().get(1);
+		return (EAttribute) getLinkEndDestructionData().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -13539,8 +13548,8 @@
 	 * @generated
 	 */
 	public EReference getLinkEndDestructionData_DestroyAt() {
-		return (EReference) getLinkEndDestructionData()
-			.getEStructuralFeatures().get(0);
+		return (EReference) getLinkEndDestructionData().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -13562,8 +13571,8 @@
 	 * @generated
 	 */
 	public EReference getClearAssociationAction_Object() {
-		return (EReference) getClearAssociationAction()
-			.getEStructuralFeatures().get(1);
+		return (EReference) getClearAssociationAction().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -13572,8 +13581,8 @@
 	 * @generated
 	 */
 	public EReference getClearAssociationAction_Association() {
-		return (EReference) getClearAssociationAction()
-			.getEStructuralFeatures().get(0);
+		return (EReference) getClearAssociationAction().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -13663,8 +13672,8 @@
 	 * @generated
 	 */
 	public EReference getInvocationAction_Argument() {
-		return (EReference) getInvocationAction().getEStructuralFeatures().get(
-			0);
+		return (EReference) getInvocationAction().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -13673,8 +13682,8 @@
 	 * @generated
 	 */
 	public EReference getInvocationAction_OnPort() {
-		return (EReference) getInvocationAction().getEStructuralFeatures().get(
-			1);
+		return (EReference) getInvocationAction().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -13696,8 +13705,8 @@
 	 * @generated
 	 */
 	public EReference getSendObjectAction_Target() {
-		return (EReference) getSendObjectAction().getEStructuralFeatures().get(
-			1);
+		return (EReference) getSendObjectAction().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -13715,8 +13724,8 @@
 	 * @generated
 	 */
 	public EReference getSendObjectAction_Request() {
-		return (EReference) getSendObjectAction().getEStructuralFeatures().get(
-			0);
+		return (EReference) getSendObjectAction().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -14273,8 +14282,8 @@
 	 * @generated
 	 */
 	public EReference getSendSignalAction_Target() {
-		return (EReference) getSendSignalAction().getEStructuralFeatures().get(
-			1);
+		return (EReference) getSendSignalAction().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -14283,8 +14292,8 @@
 	 * @generated
 	 */
 	public EReference getSendSignalAction_Signal() {
-		return (EReference) getSendSignalAction().getEStructuralFeatures().get(
-			0);
+		return (EReference) getSendSignalAction().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -14724,8 +14733,8 @@
 	 * @generated
 	 */
 	public EAttribute getAddVariableValueAction_IsReplaceAll() {
-		return (EAttribute) getAddVariableValueAction()
-			.getEStructuralFeatures().get(1);
+		return (EAttribute) getAddVariableValueAction().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -14752,8 +14761,8 @@
 	 * @generated
 	 */
 	public EReference getAddVariableValueAction_InsertAt() {
-		return (EReference) getAddVariableValueAction()
-			.getEStructuralFeatures().get(0);
+		return (EReference) getAddVariableValueAction().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -14889,8 +14898,8 @@
 	 * @generated
 	 */
 	public EReference getReadExtentAction_Result() {
-		return (EReference) getReadExtentAction().getEStructuralFeatures().get(
-			1);
+		return (EReference) getReadExtentAction().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -14899,8 +14908,8 @@
 	 * @generated
 	 */
 	public EReference getReadExtentAction_Classifier() {
-		return (EReference) getReadExtentAction().getEStructuralFeatures().get(
-			0);
+		return (EReference) getReadExtentAction().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -14940,8 +14949,8 @@
 	 * @generated
 	 */
 	public EAttribute getReclassifyObjectAction_IsReplaceAll() {
-		return (EAttribute) getReclassifyObjectAction()
-			.getEStructuralFeatures().get(0);
+		return (EAttribute) getReclassifyObjectAction().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -14950,8 +14959,8 @@
 	 * @generated
 	 */
 	public EReference getReclassifyObjectAction_OldClassifier() {
-		return (EReference) getReclassifyObjectAction()
-			.getEStructuralFeatures().get(3);
+		return (EReference) getReclassifyObjectAction().getEStructuralFeatures()
+			.get(3);
 	}
 
 	/**
@@ -14960,8 +14969,8 @@
 	 * @generated
 	 */
 	public EReference getReclassifyObjectAction_NewClassifier() {
-		return (EReference) getReclassifyObjectAction()
-			.getEStructuralFeatures().get(1);
+		return (EReference) getReclassifyObjectAction().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -14970,8 +14979,8 @@
 	 * @generated
 	 */
 	public EReference getReclassifyObjectAction_Object() {
-		return (EReference) getReclassifyObjectAction()
-			.getEStructuralFeatures().get(2);
+		return (EReference) getReclassifyObjectAction().getEStructuralFeatures()
+			.get(2);
 	}
 
 	/**
@@ -15371,8 +15380,8 @@
 	 * @generated
 	 */
 	public EReference getCreateLinkObjectAction_Result() {
-		return (EReference) getCreateLinkObjectAction()
-			.getEStructuralFeatures().get(0);
+		return (EReference) getCreateLinkObjectAction().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -15509,8 +15518,8 @@
 	 * @generated
 	 */
 	public EReference getAcceptCallAction_ReturnInformation() {
-		return (EReference) getAcceptCallAction().getEStructuralFeatures().get(
-			0);
+		return (EReference) getAcceptCallAction().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -15617,8 +15626,8 @@
 	 * @generated
 	 */
 	public EReference getUnmarshallAction_Result() {
-		return (EReference) getUnmarshallAction().getEStructuralFeatures().get(
-			1);
+		return (EReference) getUnmarshallAction().getEStructuralFeatures()
+			.get(1);
 	}
 
 	/**
@@ -15627,8 +15636,8 @@
 	 * @generated
 	 */
 	public EReference getUnmarshallAction_UnmarshallType() {
-		return (EReference) getUnmarshallAction().getEStructuralFeatures().get(
-			2);
+		return (EReference) getUnmarshallAction().getEStructuralFeatures()
+			.get(2);
 	}
 
 	/**
@@ -15637,8 +15646,8 @@
 	 * @generated
 	 */
 	public EReference getUnmarshallAction_Object() {
-		return (EReference) getUnmarshallAction().getEStructuralFeatures().get(
-			0);
+		return (EReference) getUnmarshallAction().getEStructuralFeatures()
+			.get(0);
 	}
 
 	/**
@@ -17521,8 +17530,8 @@
 		} catch (IOException exception) {
 			throw new WrappedException(exception);
 		}
-		initializeFromLoadedEPackage(this, (EPackage) resource.getContents()
-			.get(0));
+		initializeFromLoadedEPackage(this,
+			(EPackage) resource.getContents().get(0));
 		createResource(eNS_URI);
 	}
 
@@ -17555,8 +17564,8 @@
 	@Override
 	protected void fixInstanceClass(EClassifier eClassifier) {
 		if (eClassifier.getInstanceClassName() == null) {
-			eClassifier
-				.setInstanceClassName("org.eclipse.uml2.uml." + eClassifier.getName()); //$NON-NLS-1$
+			eClassifier.setInstanceClassName(
+				"org.eclipse.uml2.uml." + eClassifier.getName()); //$NON-NLS-1$
 			setGeneratedClassName(eClassifier);
 		}
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UnmarshallActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UnmarshallActionImpl.java
index 555868c..30d72a8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UnmarshallActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UnmarshallActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -201,7 +201,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		getResults().add(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -304,16 +305,21 @@
 				InternalEObject newObject = (InternalEObject) object;
 				NotificationChain msgs = oldObject.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.UNMARSHALL_ACTION__OBJECT, null, null);
+						- UMLPackage.UNMARSHALL_ACTION__OBJECT,
+					null, null);
 				if (newObject.eInternalContainer() == null) {
-					msgs = newObject.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.UNMARSHALL_ACTION__OBJECT, null, msgs);
+					msgs = newObject
+						.eInverseAdd(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.UNMARSHALL_ACTION__OBJECT,
+							null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						UMLPackage.UNMARSHALL_ACTION__OBJECT, oldObject, object));
+						UMLPackage.UNMARSHALL_ACTION__OBJECT, oldObject,
+						object));
 			}
 		}
 		return object;
@@ -360,11 +366,13 @@
 			if (object != null)
 				msgs = ((InternalEObject) object).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.UNMARSHALL_ACTION__OBJECT, null, msgs);
+						- UMLPackage.UNMARSHALL_ACTION__OBJECT,
+					null, msgs);
 			if (newObject != null)
 				msgs = ((InternalEObject) newObject).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.UNMARSHALL_ACTION__OBJECT, null, msgs);
+						- UMLPackage.UNMARSHALL_ACTION__OBJECT,
+					null, msgs);
 			msgs = basicSetObject(newObject, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -437,8 +445,8 @@
 	 */
 	public boolean validateTypeOrderingAndMultiplicity(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return UnmarshallActionOperations.validateTypeOrderingAndMultiplicity(
-			this, diagnostics, context);
+		return UnmarshallActionOperations
+			.validateTypeOrderingAndMultiplicity(this, diagnostics, context);
 	}
 
 	/**
@@ -462,11 +470,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.UNMARSHALL_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.UNMARSHALL_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.UNMARSHALL_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.UNMARSHALL_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -475,14 +483,14 @@
 			case UMLPackage.UNMARSHALL_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.UNMARSHALL_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.UNMARSHALL_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.UNMARSHALL_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.UNMARSHALL_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -602,13 +610,13 @@
 		switch (featureID) {
 			case UMLPackage.UNMARSHALL_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.UNMARSHALL_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.UNMARSHALL_ACTION__NAME :
 				setName((String) newValue);
@@ -627,50 +635,49 @@
 				return;
 			case UMLPackage.UNMARSHALL_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.UNMARSHALL_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.UNMARSHALL_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.UNMARSHALL_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.UNMARSHALL_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.UNMARSHALL_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.UNMARSHALL_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.UNMARSHALL_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.UNMARSHALL_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.UNMARSHALL_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.UNMARSHALL_ACTION__OBJECT :
 				setObject((InputPin) newValue);
@@ -818,7 +825,8 @@
 			case UMLPackage.UNMARSHALL_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.UNMARSHALL_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.UNMARSHALL_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -894,7 +902,8 @@
 			case UMLPackage.UNMARSHALL_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.UNMARSHALL_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.UNMARSHALL_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.UNMARSHALL_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -902,7 +911,8 @@
 			case UMLPackage.UNMARSHALL_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.UNMARSHALL_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.UNMARSHALL_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -979,8 +989,8 @@
 			case UMLPackage.UNMARSHALL_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.UNMARSHALL_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.UNMARSHALL_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.UNMARSHALL_ACTION___GET_CONTEXT :
@@ -1033,7 +1043,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.UNMARSHALL_ACTION__OBJECT};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.UNMARSHALL_ACTION__OBJECT};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getOutputs() <em>Output</em>}' reference list.
@@ -1043,7 +1054,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.UNMARSHALL_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.UNMARSHALL_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UseCaseImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UseCaseImpl.java
index 3ffa034..9016787 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UseCaseImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/UseCaseImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -218,8 +218,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Include getInclude(String name, UseCase addition,
-			boolean ignoreCase, boolean createOnDemand) {
+	public Include getInclude(String name, UseCase addition, boolean ignoreCase,
+			boolean createOnDemand) {
 		includeLoop : for (Include include : getIncludes()) {
 			if (name != null && !(ignoreCase
 				? name.equalsIgnoreCase(include.getName())
@@ -315,7 +315,8 @@
 	 * @generated
 	 */
 	public ExtensionPoint createExtensionPoint(String name) {
-		ExtensionPoint newExtensionPoint = (ExtensionPoint) create(UMLPackage.Literals.EXTENSION_POINT);
+		ExtensionPoint newExtensionPoint = (ExtensionPoint) create(
+			UMLPackage.Literals.EXTENSION_POINT);
 		getExtensionPoints().add(newExtensionPoint);
 		if (name != null)
 			newExtensionPoint.setName(name);
@@ -378,7 +379,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Classifier getSubject(String name, boolean ignoreCase, EClass eClass) {
+	public Classifier getSubject(String name, boolean ignoreCase,
+			EClass eClass) {
 		subjectLoop : for (Classifier subject : getSubjects()) {
 			if (eClass != null && !eClass.isInstance(subject))
 				continue subjectLoop;
@@ -485,10 +487,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.USE_CASE__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.USE_CASE__TEMPLATE_BINDING :
@@ -497,8 +499,9 @@
 			case UMLPackage.USE_CASE__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-							- UMLPackage.USE_CASE__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this,
+							EOPPOSITE_FEATURE_BASE
+								- UMLPackage.USE_CASE__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
@@ -543,61 +546,61 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.USE_CASE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.USE_CASE__OWNED_RULE :
-				return ((InternalEList<?>) getOwnedRules()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedRules())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__ELEMENT_IMPORT :
-				return ((InternalEList<?>) getElementImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getElementImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__PACKAGE_IMPORT :
-				return ((InternalEList<?>) getPackageImports()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPackageImports())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__OWNING_TEMPLATE_PARAMETER :
 				return basicSetOwningTemplateParameter(null, msgs);
 			case UMLPackage.USE_CASE__TEMPLATE_PARAMETER :
 				return basicSetTemplateParameter(null, msgs);
 			case UMLPackage.USE_CASE__TEMPLATE_BINDING :
-				return ((InternalEList<?>) getTemplateBindings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getTemplateBindings())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__OWNED_TEMPLATE_SIGNATURE :
 				return basicSetOwnedTemplateSignature(null, msgs);
 			case UMLPackage.USE_CASE__COLLABORATION_USE :
-				return ((InternalEList<?>) getCollaborationUses()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getCollaborationUses())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__GENERALIZATION :
-				return ((InternalEList<?>) getGeneralizations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getGeneralizations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__POWERTYPE_EXTENT :
-				return ((InternalEList<?>) getPowertypeExtents()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getPowertypeExtents())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__OWNED_USE_CASE :
-				return ((InternalEList<?>) getOwnedUseCases()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedUseCases())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__USE_CASE :
 				return ((InternalEList<?>) getUseCases()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.USE_CASE__SUBSTITUTION :
-				return ((InternalEList<?>) getSubstitutions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getSubstitutions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__INTERFACE_REALIZATION :
 				return ((InternalEList<?>) getInterfaceRealizations())
 					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__OWNED_BEHAVIOR :
-				return ((InternalEList<?>) getOwnedBehaviors()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedBehaviors())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__EXTEND :
 				return ((InternalEList<?>) getExtends()).basicRemove(otherEnd,
 					msgs);
 			case UMLPackage.USE_CASE__EXTENSION_POINT :
-				return ((InternalEList<?>) getExtensionPoints()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getExtensionPoints())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.USE_CASE__INCLUDE :
 				return ((InternalEList<?>) getIncludes()).basicRemove(otherEnd,
 					msgs);
@@ -739,13 +742,13 @@
 		switch (featureID) {
 			case UMLPackage.USE_CASE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.USE_CASE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.USE_CASE__NAME :
 				setName((String) newValue);
@@ -758,18 +761,18 @@
 				return;
 			case UMLPackage.USE_CASE__OWNED_RULE :
 				getOwnedRules().clear();
-				getOwnedRules().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getOwnedRules()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.USE_CASE__ELEMENT_IMPORT :
 				getElementImports().clear();
-				getElementImports().addAll(
-					(Collection<? extends ElementImport>) newValue);
+				getElementImports()
+					.addAll((Collection<? extends ElementImport>) newValue);
 				return;
 			case UMLPackage.USE_CASE__PACKAGE_IMPORT :
 				getPackageImports().clear();
-				getPackageImports().addAll(
-					(Collection<? extends PackageImport>) newValue);
+				getPackageImports()
+					.addAll((Collection<? extends PackageImport>) newValue);
 				return;
 			case UMLPackage.USE_CASE__IS_LEAF :
 				setIsLeaf((Boolean) newValue);
@@ -785,31 +788,31 @@
 				return;
 			case UMLPackage.USE_CASE__TEMPLATE_BINDING :
 				getTemplateBindings().clear();
-				getTemplateBindings().addAll(
-					(Collection<? extends TemplateBinding>) newValue);
+				getTemplateBindings()
+					.addAll((Collection<? extends TemplateBinding>) newValue);
 				return;
 			case UMLPackage.USE_CASE__OWNED_TEMPLATE_SIGNATURE :
 				setOwnedTemplateSignature((TemplateSignature) newValue);
 				return;
 			case UMLPackage.USE_CASE__COLLABORATION_USE :
 				getCollaborationUses().clear();
-				getCollaborationUses().addAll(
-					(Collection<? extends CollaborationUse>) newValue);
+				getCollaborationUses()
+					.addAll((Collection<? extends CollaborationUse>) newValue);
 				return;
 			case UMLPackage.USE_CASE__GENERAL :
 				getGenerals().clear();
-				getGenerals().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getGenerals()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.USE_CASE__GENERALIZATION :
 				getGeneralizations().clear();
-				getGeneralizations().addAll(
-					(Collection<? extends Generalization>) newValue);
+				getGeneralizations()
+					.addAll((Collection<? extends Generalization>) newValue);
 				return;
 			case UMLPackage.USE_CASE__POWERTYPE_EXTENT :
 				getPowertypeExtents().clear();
-				getPowertypeExtents().addAll(
-					(Collection<? extends GeneralizationSet>) newValue);
+				getPowertypeExtents()
+					.addAll((Collection<? extends GeneralizationSet>) newValue);
 				return;
 			case UMLPackage.USE_CASE__IS_ABSTRACT :
 				setIsAbstract((Boolean) newValue);
@@ -819,8 +822,8 @@
 				return;
 			case UMLPackage.USE_CASE__OWNED_USE_CASE :
 				getOwnedUseCases().clear();
-				getOwnedUseCases().addAll(
-					(Collection<? extends UseCase>) newValue);
+				getOwnedUseCases()
+					.addAll((Collection<? extends UseCase>) newValue);
 				return;
 			case UMLPackage.USE_CASE__USE_CASE :
 				getUseCases().clear();
@@ -828,16 +831,16 @@
 				return;
 			case UMLPackage.USE_CASE__REDEFINED_CLASSIFIER :
 				getRedefinedClassifiers().clear();
-				getRedefinedClassifiers().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getRedefinedClassifiers()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 			case UMLPackage.USE_CASE__REPRESENTATION :
 				setRepresentation((CollaborationUse) newValue);
 				return;
 			case UMLPackage.USE_CASE__SUBSTITUTION :
 				getSubstitutions().clear();
-				getSubstitutions().addAll(
-					(Collection<? extends Substitution>) newValue);
+				getSubstitutions()
+					.addAll((Collection<? extends Substitution>) newValue);
 				return;
 			case UMLPackage.USE_CASE__CLASSIFIER_BEHAVIOR :
 				setClassifierBehavior((Behavior) newValue);
@@ -849,8 +852,8 @@
 				return;
 			case UMLPackage.USE_CASE__OWNED_BEHAVIOR :
 				getOwnedBehaviors().clear();
-				getOwnedBehaviors().addAll(
-					(Collection<? extends Behavior>) newValue);
+				getOwnedBehaviors()
+					.addAll((Collection<? extends Behavior>) newValue);
 				return;
 			case UMLPackage.USE_CASE__EXTEND :
 				getExtends().clear();
@@ -858,8 +861,8 @@
 				return;
 			case UMLPackage.USE_CASE__EXTENSION_POINT :
 				getExtensionPoints().clear();
-				getExtensionPoints().addAll(
-					(Collection<? extends ExtensionPoint>) newValue);
+				getExtensionPoints()
+					.addAll((Collection<? extends ExtensionPoint>) newValue);
 				return;
 			case UMLPackage.USE_CASE__INCLUDE :
 				getIncludes().clear();
@@ -867,8 +870,8 @@
 				return;
 			case UMLPackage.USE_CASE__SUBJECT :
 				getSubjects().clear();
-				getSubjects().addAll(
-					(Collection<? extends Classifier>) newValue);
+				getSubjects()
+					.addAll((Collection<? extends Classifier>) newValue);
 				return;
 		}
 		eDynamicSet(featureID, newValue);
@@ -1056,9 +1059,11 @@
 			case UMLPackage.USE_CASE__INHERITED_MEMBER :
 				return !getInheritedMembers().isEmpty();
 			case UMLPackage.USE_CASE__IS_ABSTRACT :
-				return ((eFlags & IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
+				return ((eFlags
+					& IS_ABSTRACT_EFLAG) != 0) != IS_ABSTRACT_EDEFAULT;
 			case UMLPackage.USE_CASE__IS_FINAL_SPECIALIZATION :
-				return ((eFlags & IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
+				return ((eFlags
+					& IS_FINAL_SPECIALIZATION_EFLAG) != 0) != IS_FINAL_SPECIALIZATION_EDEFAULT;
 			case UMLPackage.USE_CASE__OWNED_USE_CASE :
 				return ownedUseCases != null && !ownedUseCases.isEmpty();
 			case UMLPackage.USE_CASE__USE_CASE :
@@ -1146,7 +1151,8 @@
 			case UMLPackage.USE_CASE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.USE_CASE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.USE_CASE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.USE_CASE___GET_STEREOTYPE_APPLICATIONS :
@@ -1154,7 +1160,8 @@
 			case UMLPackage.USE_CASE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.USE_CASE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.USE_CASE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1243,13 +1250,13 @@
 			case UMLPackage.USE_CASE___GET_OWNED_MEMBERS :
 				return getOwnedMembers();
 			case UMLPackage.USE_CASE___EXCLUDE_COLLISIONS__ELIST :
-				return excludeCollisions((EList<PackageableElement>) arguments
-					.get(0));
+				return excludeCollisions(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.USE_CASE___GET_NAMES_OF_MEMBER__NAMEDELEMENT :
 				return getNamesOfMember((NamedElement) arguments.get(0));
 			case UMLPackage.USE_CASE___IMPORT_MEMBERS__ELIST :
-				return importMembers((EList<PackageableElement>) arguments
-					.get(0));
+				return importMembers(
+					(EList<PackageableElement>) arguments.get(0));
 			case UMLPackage.USE_CASE___GET_IMPORTED_MEMBERS :
 				return getImportedMembers();
 			case UMLPackage.USE_CASE___MEMBERS_ARE_DISTINGUISHABLE :
@@ -1269,10 +1276,11 @@
 			case UMLPackage.USE_CASE___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.USE_CASE___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.USE_CASE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.USE_CASE___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.USE_CASE___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
@@ -1363,8 +1371,7 @@
 			case UMLPackage.USE_CASE___ALL_SLOTTABLE_FEATURES :
 				return allSlottableFeatures();
 			case UMLPackage.USE_CASE___VALIDATE_CLASS_BEHAVIOR__DIAGNOSTICCHAIN_MAP :
-				return validateClassBehavior(
-					(DiagnosticChain) arguments.get(0),
+				return validateClassBehavior((DiagnosticChain) arguments.get(0),
 					(Map<Object, Object>) arguments.get(1));
 			case UMLPackage.USE_CASE___GET_ALL_IMPLEMENTED_INTERFACES :
 				return getAllImplementedInterfaces();
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValuePinImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValuePinImpl.java
index 53142bf..14d5068 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValuePinImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValuePinImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -118,8 +118,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
@@ -163,8 +163,9 @@
 					EOPPOSITE_FEATURE_BASE - UMLPackage.VALUE_PIN__VALUE, null,
 					null);
 				if (newValue.eInternalContainer() == null) {
-					msgs = newValue.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.VALUE_PIN__VALUE, null, msgs);
+					msgs = newValue.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - UMLPackage.VALUE_PIN__VALUE,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -235,7 +236,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ValueSpecification createValue(String name, Type type, EClass eClass) {
+	public ValueSpecification createValue(String name, Type type,
+			EClass eClass) {
 		ValueSpecification newValue = (ValueSpecification) create(eClass);
 		setValue(newValue);
 		if (name != null)
@@ -277,11 +279,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.VALUE_PIN__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.VALUE_PIN__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.VALUE_PIN__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.VALUE_PIN__IN_INTERRUPTIBLE_REGION :
@@ -290,14 +292,14 @@
 			case UMLPackage.VALUE_PIN__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.VALUE_PIN__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.VALUE_PIN__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.VALUE_PIN__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.VALUE_PIN__UPPER_BOUND :
 				return basicSetUpperBound(null, msgs);
 			case UMLPackage.VALUE_PIN__LOWER_VALUE :
@@ -425,13 +427,13 @@
 		switch (featureID) {
 			case UMLPackage.VALUE_PIN__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.VALUE_PIN__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.VALUE_PIN__NAME :
 				setName((String) newValue);
@@ -450,32 +452,31 @@
 				return;
 			case UMLPackage.VALUE_PIN__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.VALUE_PIN__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.VALUE_PIN__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.VALUE_PIN__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.VALUE_PIN__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.VALUE_PIN__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.VALUE_PIN__TYPE :
 				setType((Type) newValue);
@@ -675,7 +676,8 @@
 			case UMLPackage.VALUE_PIN__IN_STATE :
 				return inStates != null && !inStates.isEmpty();
 			case UMLPackage.VALUE_PIN__IS_CONTROL_TYPE :
-				return ((eFlags & IS_CONTROL_TYPE_EFLAG) != 0) != IS_CONTROL_TYPE_EDEFAULT;
+				return ((eFlags
+					& IS_CONTROL_TYPE_EFLAG) != 0) != IS_CONTROL_TYPE_EDEFAULT;
 			case UMLPackage.VALUE_PIN__ORDERING :
 				return (eFlags & ORDERING_EFLAG) != ORDERING_EFLAG_DEFAULT;
 			case UMLPackage.VALUE_PIN__SELECTION :
@@ -683,7 +685,8 @@
 			case UMLPackage.VALUE_PIN__UPPER_BOUND :
 				return upperBound != null;
 			case UMLPackage.VALUE_PIN__IS_ORDERED :
-				return ((eFlags & IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
+				return ((eFlags
+					& IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
 			case UMLPackage.VALUE_PIN__IS_UNIQUE :
 				return ((eFlags & IS_UNIQUE_EFLAG) != 0) != IS_UNIQUE_EDEFAULT;
 			case UMLPackage.VALUE_PIN__LOWER :
@@ -695,7 +698,8 @@
 			case UMLPackage.VALUE_PIN__UPPER_VALUE :
 				return upperValue != null;
 			case UMLPackage.VALUE_PIN__IS_CONTROL :
-				return ((eFlags & IS_CONTROL_EFLAG) != 0) != IS_CONTROL_EDEFAULT;
+				return ((eFlags
+					& IS_CONTROL_EFLAG) != 0) != IS_CONTROL_EDEFAULT;
 			case UMLPackage.VALUE_PIN__VALUE :
 				return value != null;
 		}
@@ -759,7 +763,8 @@
 			case UMLPackage.VALUE_PIN___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.VALUE_PIN___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.VALUE_PIN___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.VALUE_PIN___GET_STEREOTYPE_APPLICATIONS :
@@ -767,7 +772,8 @@
 			case UMLPackage.VALUE_PIN___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.VALUE_PIN___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.VALUE_PIN___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -844,8 +850,8 @@
 			case UMLPackage.VALUE_PIN___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.VALUE_PIN___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.VALUE_PIN___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.VALUE_PIN___VALIDATE_INPUT_OUTPUT_PARAMETER__DIAGNOSTICCHAIN_MAP :
@@ -891,8 +897,8 @@
 			case UMLPackage.VALUE_PIN___COMPATIBLE_WITH__MULTIPLICITYELEMENT :
 				return compatibleWith((MultiplicityElement) arguments.get(0));
 			case UMLPackage.VALUE_PIN___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT :
-				return includesMultiplicity((MultiplicityElement) arguments
-					.get(0));
+				return includesMultiplicity(
+					(MultiplicityElement) arguments.get(0));
 			case UMLPackage.VALUE_PIN___IS__INT_INT :
 				return is((Integer) arguments.get(0),
 					(Integer) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationActionImpl.java
index ceae440..545c37b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -159,12 +159,13 @@
 				InternalEObject newValue = (InternalEObject) value;
 				NotificationChain msgs = oldValue.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.VALUE_SPECIFICATION_ACTION__VALUE, null,
-					null);
+						- UMLPackage.VALUE_SPECIFICATION_ACTION__VALUE,
+					null, null);
 				if (newValue.eInternalContainer() == null) {
-					msgs = newValue.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.VALUE_SPECIFICATION_ACTION__VALUE, null,
-						msgs);
+					msgs = newValue.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.VALUE_SPECIFICATION_ACTION__VALUE,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -218,13 +219,13 @@
 			if (value != null)
 				msgs = ((InternalEObject) value).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.VALUE_SPECIFICATION_ACTION__VALUE, null,
-					msgs);
+						- UMLPackage.VALUE_SPECIFICATION_ACTION__VALUE,
+					null, msgs);
 			if (newValue != null)
 				msgs = ((InternalEObject) newValue).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.VALUE_SPECIFICATION_ACTION__VALUE, null,
-					msgs);
+						- UMLPackage.VALUE_SPECIFICATION_ACTION__VALUE,
+					null, msgs);
 			msgs = basicSetValue(newValue, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -239,7 +240,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ValueSpecification createValue(String name, Type type, EClass eClass) {
+	public ValueSpecification createValue(String name, Type type,
+			EClass eClass) {
 		ValueSpecification newValue = (ValueSpecification) create(eClass);
 		setValue(newValue);
 		if (name != null)
@@ -262,12 +264,13 @@
 				InternalEObject newResult = (InternalEObject) result;
 				NotificationChain msgs = oldResult.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.VALUE_SPECIFICATION_ACTION__RESULT, null,
-					null);
+						- UMLPackage.VALUE_SPECIFICATION_ACTION__RESULT,
+					null, null);
 				if (newResult.eInternalContainer() == null) {
-					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.VALUE_SPECIFICATION_ACTION__RESULT, null,
-						msgs);
+					msgs = newResult.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.VALUE_SPECIFICATION_ACTION__RESULT,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -300,9 +303,8 @@
 		result = newResult;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this,
-				Notification.SET,
-				UMLPackage.VALUE_SPECIFICATION_ACTION__RESULT, oldResult,
-				newResult);
+				Notification.SET, UMLPackage.VALUE_SPECIFICATION_ACTION__RESULT,
+				oldResult, newResult);
 			if (msgs == null)
 				msgs = notification;
 			else
@@ -322,13 +324,13 @@
 			if (result != null)
 				msgs = ((InternalEObject) result).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.VALUE_SPECIFICATION_ACTION__RESULT, null,
-					msgs);
+						- UMLPackage.VALUE_SPECIFICATION_ACTION__RESULT,
+					null, msgs);
 			if (newResult != null)
 				msgs = ((InternalEObject) newResult).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.VALUE_SPECIFICATION_ACTION__RESULT, null,
-					msgs);
+						- UMLPackage.VALUE_SPECIFICATION_ACTION__RESULT,
+					null, msgs);
 			msgs = basicSetResult(newResult, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -344,7 +346,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -385,11 +388,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -398,14 +401,14 @@
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -522,13 +525,13 @@
 		switch (featureID) {
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__NAME :
 				setName((String) newValue);
@@ -547,50 +550,49 @@
 				return;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__RESULT :
 				setResult((OutputPin) newValue);
@@ -731,7 +733,8 @@
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.VALUE_SPECIFICATION_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -805,7 +808,8 @@
 			case UMLPackage.VALUE_SPECIFICATION_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.VALUE_SPECIFICATION_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.VALUE_SPECIFICATION_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.VALUE_SPECIFICATION_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -813,7 +817,8 @@
 			case UMLPackage.VALUE_SPECIFICATION_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.VALUE_SPECIFICATION_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.VALUE_SPECIFICATION_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -890,8 +895,8 @@
 			case UMLPackage.VALUE_SPECIFICATION_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.VALUE_SPECIFICATION_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.VALUE_SPECIFICATION_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.VALUE_SPECIFICATION_ACTION___GET_CONTEXT :
@@ -921,7 +926,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.VALUE_SPECIFICATION_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.VALUE_SPECIFICATION_ACTION__RESULT};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -934,8 +940,8 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationImpl.java
index 50fada3..6dec562 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ValueSpecificationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -261,13 +261,13 @@
 		switch (featureID) {
 			case UMLPackage.VALUE_SPECIFICATION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.VALUE_SPECIFICATION__NAME :
 				setName((String) newValue);
@@ -373,7 +373,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == TypedElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.VALUE_SPECIFICATION__TYPE :
@@ -391,7 +392,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == TypedElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.TYPED_ELEMENT__TYPE :
@@ -460,7 +462,8 @@
 			case UMLPackage.VALUE_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.VALUE_SPECIFICATION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.VALUE_SPECIFICATION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.VALUE_SPECIFICATION___GET_STEREOTYPE_APPLICATIONS :
@@ -468,7 +471,8 @@
 			case UMLPackage.VALUE_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.VALUE_SPECIFICATION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.VALUE_SPECIFICATION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -531,7 +535,8 @@
 			case UMLPackage.VALUE_SPECIFICATION___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.VALUE_SPECIFICATION___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.VALUE_SPECIFICATION___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.VALUE_SPECIFICATION___VALIDATE_NAMESPACE_NEEDS_VISIBILITY__DIAGNOSTICCHAIN_MAP :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableActionImpl.java
index ac795e9..d84350f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -242,13 +242,13 @@
 		switch (featureID) {
 			case UMLPackage.VARIABLE_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.VARIABLE_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.VARIABLE_ACTION__NAME :
 				setName((String) newValue);
@@ -267,50 +267,49 @@
 				return;
 			case UMLPackage.VARIABLE_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.VARIABLE_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.VARIABLE_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.VARIABLE_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.VARIABLE_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.VARIABLE_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.VARIABLE_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.VARIABLE_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.VARIABLE_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.VARIABLE_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.VARIABLE_ACTION__VARIABLE :
 				setVariable((Variable) newValue);
@@ -445,7 +444,8 @@
 			case UMLPackage.VARIABLE_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.VARIABLE_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.VARIABLE_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -517,7 +517,8 @@
 			case UMLPackage.VARIABLE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.VARIABLE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.VARIABLE_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.VARIABLE_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -525,7 +526,8 @@
 			case UMLPackage.VARIABLE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.VARIABLE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.VARIABLE_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -602,8 +604,8 @@
 			case UMLPackage.VARIABLE_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.VARIABLE_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.VARIABLE_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.VARIABLE_ACTION___GET_CONTEXT :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableImpl.java
index 826f03b..abd76a6 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VariableImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 204200
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -197,14 +197,13 @@
 		if (cache != null) {
 			Resource eResource = eResource();
 			@SuppressWarnings("unchecked")
-			EList<Element> ownedElements = (EList<Element>) cache.get(
-				eResource, this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
+			EList<Element> ownedElements = (EList<Element>) cache.get(eResource,
+				this, UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 			if (ownedElements == null) {
 				cache.put(eResource, this,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT,
 					ownedElements = new DerivedUnionEObjectEList<Element>(
-						Element.class, this,
-						UMLPackage.VARIABLE__OWNED_ELEMENT,
+						Element.class, this, UMLPackage.VARIABLE__OWNED_ELEMENT,
 						OWNED_ELEMENT_ESUBSETS));
 			}
 			return ownedElements;
@@ -316,7 +315,8 @@
 				if (newUpperValue.eInternalContainer() == null) {
 					msgs = newUpperValue.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.VARIABLE__UPPER_VALUE, null, msgs);
+							- UMLPackage.VARIABLE__UPPER_VALUE,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -380,7 +380,8 @@
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.VARIABLE__UPPER_VALUE, newUpperValue, newUpperValue));
+				UMLPackage.VARIABLE__UPPER_VALUE, newUpperValue,
+				newUpperValue));
 	}
 
 	/**
@@ -416,7 +417,8 @@
 				if (newLowerValue.eInternalContainer() == null) {
 					msgs = newLowerValue.eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
-							- UMLPackage.VARIABLE__LOWER_VALUE, null, msgs);
+							- UMLPackage.VARIABLE__LOWER_VALUE,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -480,7 +482,8 @@
 				msgs.dispatch();
 		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				UMLPackage.VARIABLE__LOWER_VALUE, newLowerValue, newLowerValue));
+				UMLPackage.VARIABLE__LOWER_VALUE, newLowerValue,
+				newLowerValue));
 	}
 
 	/**
@@ -553,7 +556,8 @@
 	 */
 	public void setActivityScope(Activity newActivityScope) {
 		if (newActivityScope != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.VARIABLE__ACTIVITY_SCOPE && newActivityScope != null)) {
+			|| (eContainerFeatureID() != UMLPackage.VARIABLE__ACTIVITY_SCOPE
+				&& newActivityScope != null)) {
 			if (EcoreUtil.isAncestor(this, newActivityScope))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -613,7 +617,8 @@
 	 */
 	public void setScope(StructuredActivityNode newScope) {
 		if (newScope != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.VARIABLE__SCOPE && newScope != null)) {
+			|| (eContainerFeatureID() != UMLPackage.VARIABLE__SCOPE
+				&& newScope != null)) {
 			if (EcoreUtil.isAncestor(this, newScope))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -639,8 +644,8 @@
 	 */
 	public boolean validateLowerGe0(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return MultiplicityElementOperations.validateLowerGe0(this,
-			diagnostics, context);
+		return MultiplicityElementOperations.validateLowerGe0(this, diagnostics,
+			context);
 	}
 
 	/**
@@ -662,7 +667,8 @@
 	public boolean validateValueSpecificationNoSideEffects(
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return MultiplicityElementOperations
-			.validateValueSpecificationNoSideEffects(this, diagnostics, context);
+			.validateValueSpecificationNoSideEffects(this, diagnostics,
+				context);
 	}
 
 	/**
@@ -694,8 +700,8 @@
 	 */
 	public boolean validateUpperIsUnlimitedNatural(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return MultiplicityElementOperations.validateUpperIsUnlimitedNatural(
-			this, diagnostics, context);
+		return MultiplicityElementOperations
+			.validateUpperIsUnlimitedNatural(this, diagnostics, context);
 	}
 
 	/**
@@ -781,10 +787,10 @@
 					(TemplateParameter) otherEnd, msgs);
 			case UMLPackage.VARIABLE__TEMPLATE_PARAMETER :
 				if (templateParameter != null)
-					msgs = ((InternalEObject) templateParameter)
-						.eInverseRemove(this,
-							UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
-							TemplateParameter.class, msgs);
+					msgs = ((InternalEObject) templateParameter).eInverseRemove(
+						this,
+						UMLPackage.TEMPLATE_PARAMETER__PARAMETERED_ELEMENT,
+						TemplateParameter.class, msgs);
 				return basicSetTemplateParameter((TemplateParameter) otherEnd,
 					msgs);
 			case UMLPackage.VARIABLE__ACTIVITY_SCOPE :
@@ -809,11 +815,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.VARIABLE__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.VARIABLE__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.VARIABLE__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.VARIABLE__OWNING_TEMPLATE_PARAMETER :
@@ -943,13 +949,13 @@
 		switch (featureID) {
 			case UMLPackage.VARIABLE__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.VARIABLE__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.VARIABLE__NAME :
 				setName((String) newValue);
@@ -1096,7 +1102,8 @@
 			case UMLPackage.VARIABLE__END :
 				return !getEnds().isEmpty();
 			case UMLPackage.VARIABLE__IS_ORDERED :
-				return ((eFlags & IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
+				return ((eFlags
+					& IS_ORDERED_EFLAG) != 0) != IS_ORDERED_EDEFAULT;
 			case UMLPackage.VARIABLE__IS_UNIQUE :
 				return ((eFlags & IS_UNIQUE_EFLAG) != 0) != IS_UNIQUE_EDEFAULT;
 			case UMLPackage.VARIABLE__LOWER :
@@ -1121,7 +1128,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+	public int eBaseStructuralFeatureID(int derivedFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == MultiplicityElement.class) {
 			switch (derivedFeatureID) {
 				case UMLPackage.VARIABLE__IS_ORDERED :
@@ -1149,7 +1157,8 @@
 	 * @generated
 	 */
 	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+	public int eDerivedStructuralFeatureID(int baseFeatureID,
+			Class<?> baseClass) {
 		if (baseClass == MultiplicityElement.class) {
 			switch (baseFeatureID) {
 				case UMLPackage.MULTIPLICITY_ELEMENT__IS_ORDERED :
@@ -1276,7 +1285,8 @@
 			case UMLPackage.VARIABLE___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.VARIABLE___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.VARIABLE___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.VARIABLE___GET_STEREOTYPE_APPLICATIONS :
@@ -1284,7 +1294,8 @@
 			case UMLPackage.VARIABLE___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.VARIABLE___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.VARIABLE___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -1347,7 +1358,8 @@
 			case UMLPackage.VARIABLE___GET_CLIENT_DEPENDENCIES :
 				return getClientDependencies();
 			case UMLPackage.VARIABLE___IS_COMPATIBLE_WITH__PARAMETERABLEELEMENT :
-				return isCompatibleWith((ParameterableElement) arguments.get(0));
+				return isCompatibleWith(
+					(ParameterableElement) arguments.get(0));
 			case UMLPackage.VARIABLE___IS_TEMPLATE_PARAMETER :
 				return isTemplateParameter();
 			case UMLPackage.VARIABLE___GET_ENDS :
@@ -1383,8 +1395,8 @@
 			case UMLPackage.VARIABLE___COMPATIBLE_WITH__MULTIPLICITYELEMENT :
 				return compatibleWith((MultiplicityElement) arguments.get(0));
 			case UMLPackage.VARIABLE___INCLUDES_MULTIPLICITY__MULTIPLICITYELEMENT :
-				return includesMultiplicity((MultiplicityElement) arguments
-					.get(0));
+				return includesMultiplicity(
+					(MultiplicityElement) arguments.get(0));
 			case UMLPackage.VARIABLE___IS__INT_INT :
 				return is((Integer) arguments.get(0),
 					(Integer) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VertexImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VertexImpl.java
index d6051a5..3902342 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VertexImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/VertexImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -121,7 +121,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Transition getOutgoing(String name, boolean ignoreCase, EClass eClass) {
+	public Transition getOutgoing(String name, boolean ignoreCase,
+			EClass eClass) {
 		outgoingLoop : for (Transition outgoing : getOutgoings()) {
 			if (eClass != null && !eClass.isInstance(outgoing))
 				continue outgoingLoop;
@@ -157,7 +158,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Transition getIncoming(String name, boolean ignoreCase, EClass eClass) {
+	public Transition getIncoming(String name, boolean ignoreCase,
+			EClass eClass) {
 		incomingLoop : for (Transition incoming : getIncomings()) {
 			if (eClass != null && !eClass.isInstance(incoming))
 				continue incomingLoop;
@@ -211,7 +213,8 @@
 	 */
 	public void setContainer(Region newContainer) {
 		if (newContainer != eInternalContainer()
-			|| (eContainerFeatureID() != UMLPackage.VERTEX__CONTAINER && newContainer != null)) {
+			|| (eContainerFeatureID() != UMLPackage.VERTEX__CONTAINER
+				&& newContainer != null)) {
 			if (EcoreUtil.isAncestor(this, newContainer))
 				throw new IllegalArgumentException(
 					"Recursive containment not allowed for " + toString()); //$NON-NLS-1$
@@ -287,11 +290,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.VERTEX__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.VERTEX__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.VERTEX__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.VERTEX__CONTAINER :
@@ -373,13 +376,13 @@
 		switch (featureID) {
 			case UMLPackage.VERTEX__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.VERTEX__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.VERTEX__NAME :
 				setName((String) newValue);
@@ -524,7 +527,8 @@
 			case UMLPackage.VERTEX___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.VERTEX___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.VERTEX___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.VERTEX___GET_STEREOTYPE_APPLICATIONS :
@@ -532,7 +536,8 @@
 			case UMLPackage.VERTEX___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.VERTEX___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.VERTEX___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteLinkActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteLinkActionImpl.java
index 5128c9a..0df8c65 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteLinkActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteLinkActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -128,7 +128,8 @@
 			case UMLPackage.WRITE_LINK_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.WRITE_LINK_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.WRITE_LINK_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.WRITE_LINK_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -136,7 +137,8 @@
 			case UMLPackage.WRITE_LINK_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.WRITE_LINK_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.WRITE_LINK_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -213,8 +215,8 @@
 			case UMLPackage.WRITE_LINK_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.WRITE_LINK_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.WRITE_LINK_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.WRITE_LINK_ACTION___GET_CONTEXT :
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteStructuralFeatureActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteStructuralFeatureActionImpl.java
index 65b4e0b..feada96 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteStructuralFeatureActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteStructuralFeatureActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -162,8 +162,9 @@
 						- UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__VALUE,
 					null, null);
 				if (newValue.eInternalContainer() == null) {
-					msgs = newValue.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__VALUE,
+					msgs = newValue.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__VALUE,
 						null, msgs);
 				}
 				if (msgs != null)
@@ -275,8 +276,9 @@
 						- 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,
+					msgs = newResult.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT,
 						null, msgs);
 				}
 				if (msgs != null)
@@ -354,7 +356,8 @@
 	 * @generated
 	 */
 	public OutputPin createResult(String name, Type type) {
-		OutputPin newResult = (OutputPin) create(UMLPackage.Literals.OUTPUT_PIN);
+		OutputPin newResult = (OutputPin) create(
+			UMLPackage.Literals.OUTPUT_PIN);
 		setResult(newResult);
 		if (name != null)
 			newResult.setName(name);
@@ -370,8 +373,8 @@
 	 */
 	public boolean validateTypeOfResult(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return WriteStructuralFeatureActionOperations.validateTypeOfResult(
-			this, diagnostics, context);
+		return WriteStructuralFeatureActionOperations.validateTypeOfResult(this,
+			diagnostics, context);
 	}
 
 	/**
@@ -417,11 +420,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -430,14 +433,14 @@
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -564,13 +567,13 @@
 		switch (featureID) {
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__NAME :
 				setName((String) newValue);
@@ -589,50 +592,49 @@
 				return;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__OBJECT :
 				setObject((InputPin) newValue);
@@ -785,7 +787,8 @@
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -863,7 +866,8 @@
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -871,7 +875,8 @@
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -948,8 +953,8 @@
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION___GET_CONTEXT :
@@ -1017,7 +1022,8 @@
 			return outputs;
 		}
 		return new DerivedUnionEObjectEList<OutputPin>(OutputPin.class, this,
-			UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__OUTPUT, OUTPUT_ESUBSETS);
+			UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__OUTPUT,
+			OUTPUT_ESUBSETS);
 	}
 
 	/**
@@ -1028,7 +1034,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OUTPUT_ESUBSETS = new int[]{UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT};
+	protected static final int[] OUTPUT_ESUBSETS = new int[]{
+		UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION__RESULT};
 
 	/**
 	 * The array of subset feature identifiers for the '{@link #getInputs() <em>Input</em>}' reference list.
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteVariableActionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteVariableActionImpl.java
index 326e9af..0b9b7ae 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteVariableActionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/WriteVariableActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 286329, 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.impl;
@@ -121,12 +121,11 @@
 			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.WRITE_VARIABLE_ACTION__INPUT,
-							INPUT_ESUBSETS));
+				cache.put(eResource, this, UMLPackage.Literals.ACTION__INPUT,
+					inputs = new DerivedUnionEObjectEList<InputPin>(
+						InputPin.class, this,
+						UMLPackage.WRITE_VARIABLE_ACTION__INPUT,
+						INPUT_ESUBSETS));
 			}
 			return inputs;
 		}
@@ -145,12 +144,16 @@
 			value = (InputPin) eResolveProxy(oldValue);
 			if (value != oldValue) {
 				InternalEObject newValue = (InternalEObject) value;
-				NotificationChain msgs = oldValue.eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.WRITE_VARIABLE_ACTION__VALUE, null, null);
+				NotificationChain msgs = oldValue
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.WRITE_VARIABLE_ACTION__VALUE,
+						null, null);
 				if (newValue.eInternalContainer() == null) {
-					msgs = newValue.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- UMLPackage.WRITE_VARIABLE_ACTION__VALUE, null, msgs);
+					msgs = newValue.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.WRITE_VARIABLE_ACTION__VALUE,
+						null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -202,13 +205,17 @@
 		if (newValue != value) {
 			NotificationChain msgs = null;
 			if (value != null)
-				msgs = ((InternalEObject) value).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.WRITE_VARIABLE_ACTION__VALUE, null, msgs);
+				msgs = ((InternalEObject) value)
+					.eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.WRITE_VARIABLE_ACTION__VALUE,
+						null, msgs);
 			if (newValue != null)
-				msgs = ((InternalEObject) newValue).eInverseAdd(this,
-					EOPPOSITE_FEATURE_BASE
-						- UMLPackage.WRITE_VARIABLE_ACTION__VALUE, null, msgs);
+				msgs = ((InternalEObject) newValue)
+					.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+							- UMLPackage.WRITE_VARIABLE_ACTION__VALUE,
+						null, msgs);
 			msgs = basicSetValue(newValue, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -273,11 +280,11 @@
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
 			case UMLPackage.WRITE_VARIABLE_ACTION__EANNOTATIONS :
-				return ((InternalEList<?>) getEAnnotations()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getEAnnotations())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.WRITE_VARIABLE_ACTION__OWNED_COMMENT :
-				return ((InternalEList<?>) getOwnedComments()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOwnedComments())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.WRITE_VARIABLE_ACTION__NAME_EXPRESSION :
 				return basicSetNameExpression(null, msgs);
 			case UMLPackage.WRITE_VARIABLE_ACTION__IN_INTERRUPTIBLE_REGION :
@@ -286,14 +293,14 @@
 			case UMLPackage.WRITE_VARIABLE_ACTION__IN_STRUCTURED_NODE :
 				return basicSetInStructuredNode(null, msgs);
 			case UMLPackage.WRITE_VARIABLE_ACTION__INCOMING :
-				return ((InternalEList<?>) getIncomings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getIncomings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.WRITE_VARIABLE_ACTION__OUTGOING :
-				return ((InternalEList<?>) getOutgoings()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getOutgoings()).basicRemove(otherEnd,
+					msgs);
 			case UMLPackage.WRITE_VARIABLE_ACTION__IN_PARTITION :
-				return ((InternalEList<?>) getInPartitions()).basicRemove(
-					otherEnd, msgs);
+				return ((InternalEList<?>) getInPartitions())
+					.basicRemove(otherEnd, msgs);
 			case UMLPackage.WRITE_VARIABLE_ACTION__HANDLER :
 				return ((InternalEList<?>) getHandlers()).basicRemove(otherEnd,
 					msgs);
@@ -408,13 +415,13 @@
 		switch (featureID) {
 			case UMLPackage.WRITE_VARIABLE_ACTION__EANNOTATIONS :
 				getEAnnotations().clear();
-				getEAnnotations().addAll(
-					(Collection<? extends EAnnotation>) newValue);
+				getEAnnotations()
+					.addAll((Collection<? extends EAnnotation>) newValue);
 				return;
 			case UMLPackage.WRITE_VARIABLE_ACTION__OWNED_COMMENT :
 				getOwnedComments().clear();
-				getOwnedComments().addAll(
-					(Collection<? extends Comment>) newValue);
+				getOwnedComments()
+					.addAll((Collection<? extends Comment>) newValue);
 				return;
 			case UMLPackage.WRITE_VARIABLE_ACTION__NAME :
 				setName((String) newValue);
@@ -433,50 +440,49 @@
 				return;
 			case UMLPackage.WRITE_VARIABLE_ACTION__IN_INTERRUPTIBLE_REGION :
 				getInInterruptibleRegions().clear();
-				getInInterruptibleRegions()
-					.addAll(
-						(Collection<? extends InterruptibleActivityRegion>) newValue);
+				getInInterruptibleRegions().addAll(
+					(Collection<? extends InterruptibleActivityRegion>) newValue);
 				return;
 			case UMLPackage.WRITE_VARIABLE_ACTION__IN_STRUCTURED_NODE :
 				setInStructuredNode((StructuredActivityNode) newValue);
 				return;
 			case UMLPackage.WRITE_VARIABLE_ACTION__INCOMING :
 				getIncomings().clear();
-				getIncomings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getIncomings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.WRITE_VARIABLE_ACTION__OUTGOING :
 				getOutgoings().clear();
-				getOutgoings().addAll(
-					(Collection<? extends ActivityEdge>) newValue);
+				getOutgoings()
+					.addAll((Collection<? extends ActivityEdge>) newValue);
 				return;
 			case UMLPackage.WRITE_VARIABLE_ACTION__REDEFINED_NODE :
 				getRedefinedNodes().clear();
-				getRedefinedNodes().addAll(
-					(Collection<? extends ActivityNode>) newValue);
+				getRedefinedNodes()
+					.addAll((Collection<? extends ActivityNode>) newValue);
 				return;
 			case UMLPackage.WRITE_VARIABLE_ACTION__IN_PARTITION :
 				getInPartitions().clear();
-				getInPartitions().addAll(
-					(Collection<? extends ActivityPartition>) newValue);
+				getInPartitions()
+					.addAll((Collection<? extends ActivityPartition>) newValue);
 				return;
 			case UMLPackage.WRITE_VARIABLE_ACTION__HANDLER :
 				getHandlers().clear();
-				getHandlers().addAll(
-					(Collection<? extends ExceptionHandler>) newValue);
+				getHandlers()
+					.addAll((Collection<? extends ExceptionHandler>) newValue);
 				return;
 			case UMLPackage.WRITE_VARIABLE_ACTION__IS_LOCALLY_REENTRANT :
 				setIsLocallyReentrant((Boolean) newValue);
 				return;
 			case UMLPackage.WRITE_VARIABLE_ACTION__LOCAL_POSTCONDITION :
 				getLocalPostconditions().clear();
-				getLocalPostconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPostconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.WRITE_VARIABLE_ACTION__LOCAL_PRECONDITION :
 				getLocalPreconditions().clear();
-				getLocalPreconditions().addAll(
-					(Collection<? extends Constraint>) newValue);
+				getLocalPreconditions()
+					.addAll((Collection<? extends Constraint>) newValue);
 				return;
 			case UMLPackage.WRITE_VARIABLE_ACTION__VARIABLE :
 				setVariable((Variable) newValue);
@@ -617,7 +623,8 @@
 			case UMLPackage.WRITE_VARIABLE_ACTION__INPUT :
 				return isSetInputs();
 			case UMLPackage.WRITE_VARIABLE_ACTION__IS_LOCALLY_REENTRANT :
-				return ((eFlags & IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
+				return ((eFlags
+					& IS_LOCALLY_REENTRANT_EFLAG) != 0) != IS_LOCALLY_REENTRANT_EDEFAULT;
 			case UMLPackage.WRITE_VARIABLE_ACTION__LOCAL_POSTCONDITION :
 				return localPostconditions != null
 					&& !localPostconditions.isEmpty();
@@ -691,7 +698,8 @@
 			case UMLPackage.WRITE_VARIABLE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS :
 				return getSourceDirectedRelationships();
 			case UMLPackage.WRITE_VARIABLE_ACTION___GET_SOURCE_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getSourceDirectedRelationships((EClass) arguments.get(0));
+				return getSourceDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.WRITE_VARIABLE_ACTION___GET_STEREOTYPE_APPLICATION__STEREOTYPE :
 				return getStereotypeApplication((Stereotype) arguments.get(0));
 			case UMLPackage.WRITE_VARIABLE_ACTION___GET_STEREOTYPE_APPLICATIONS :
@@ -699,7 +707,8 @@
 			case UMLPackage.WRITE_VARIABLE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS :
 				return getTargetDirectedRelationships();
 			case UMLPackage.WRITE_VARIABLE_ACTION___GET_TARGET_DIRECTED_RELATIONSHIPS__ECLASS :
-				return getTargetDirectedRelationships((EClass) arguments.get(0));
+				return getTargetDirectedRelationships(
+					(EClass) arguments.get(0));
 			case UMLPackage.WRITE_VARIABLE_ACTION___GET_VALUE__STEREOTYPE_STRING :
 				return getValue((Stereotype) arguments.get(0),
 					(String) arguments.get(1));
@@ -776,8 +785,8 @@
 			case UMLPackage.WRITE_VARIABLE_ACTION___IS_CONSISTENT_WITH__REDEFINABLEELEMENT :
 				return isConsistentWith((RedefinableElement) arguments.get(0));
 			case UMLPackage.WRITE_VARIABLE_ACTION___IS_REDEFINITION_CONTEXT_VALID__REDEFINABLEELEMENT :
-				return isRedefinitionContextValid((RedefinableElement) arguments
-					.get(0));
+				return isRedefinitionContextValid(
+					(RedefinableElement) arguments.get(0));
 			case UMLPackage.WRITE_VARIABLE_ACTION___CONTAINING_ACTIVITY :
 				return containingActivity();
 			case UMLPackage.WRITE_VARIABLE_ACTION___GET_CONTEXT :
@@ -810,7 +819,8 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] INPUT_ESUBSETS = new int[]{UMLPackage.WRITE_VARIABLE_ACTION__VALUE};
+	protected static final int[] INPUT_ESUBSETS = new int[]{
+		UMLPackage.WRITE_VARIABLE_ACTION__VALUE};
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/uml.ecore b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/uml.ecore
index 6a4e4c0..8964c0c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/uml.ecore
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/uml.ecore
@@ -933,6 +933,10 @@
     <eOperations name="unapplyProfile" ordered="false" upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject">
       <eParameters name="profile" ordered="false" lowerBound="1" eType="#//Profile"/>
     </eOperations>
+    <eOperations name="applyProfiles" ordered="false" upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject">
+      <eParameters name="profiles" ordered="false" lowerBound="1" upperBound="-1"
+          eType="#//Profile"/>
+    </eOperations>
     <eOperations name="allApplicableStereotypes" ordered="false" upperBound="-1" eType="#//Stereotype"/>
     <eOperations name="containingProfile" ordered="false" eType="#//Profile"/>
     <eOperations name="makesVisible" ordered="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/uml2/5.0.0/Types#//Boolean">
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AcceptCallActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AcceptCallActionOperations.java
index 7bcfc3d..0a2b019 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AcceptCallActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AcceptCallActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -79,15 +79,15 @@
 		// 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.ACCEPT_CALL_ACTION__RESULT_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateResultPins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(acceptCallAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{acceptCallAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACCEPT_CALL_ACTION__RESULT_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateResultPins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(acceptCallAction, context)}),
+					new Object[]{acceptCallAction}));
 			}
 			return false;
 		}
@@ -116,15 +116,13 @@
 			&& triggers.get(0).getEvent() instanceof CallEvent;
 
 		if (!result && diagnostics != null) {
-			diagnostics
-				.add(new BasicDiagnostic(
-					Diagnostic.WARNING,
-					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.ACCEPT_CALL_ACTION__TRIGGER_CALL_EVENT,
-					UMLPlugin.INSTANCE
-						.getString(
-							"_UI_AcceptCallAction_TriggerCallEvent_diagnostic", getMessageSubstitutions(context, acceptCallAction)), //$NON-NLS-1$
-					new Object[]{acceptCallAction}));
+			diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+				UMLValidator.DIAGNOSTIC_SOURCE,
+				UMLValidator.ACCEPT_CALL_ACTION__TRIGGER_CALL_EVENT,
+				UMLPlugin.INSTANCE.getString(
+					"_UI_AcceptCallAction_TriggerCallEvent_diagnostic", //$NON-NLS-1$
+					getMessageSubstitutions(context, acceptCallAction)),
+				new Object[]{acceptCallAction}));
 		}
 
 		return result;
@@ -147,15 +145,13 @@
 		boolean result = acceptCallAction.isUnmarshall();
 
 		if (!result && diagnostics != null) {
-			diagnostics
-				.add(new BasicDiagnostic(
-					Diagnostic.WARNING,
-					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.ACCEPT_CALL_ACTION__UNMARSHALL,
-					UMLPlugin.INSTANCE
-						.getString(
-							"_UI_AcceptCallAction_Unmarshall_diagnostic", getMessageSubstitutions(context, acceptCallAction)), //$NON-NLS-1$
-					new Object[]{acceptCallAction}));
+			diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+				UMLValidator.DIAGNOSTIC_SOURCE,
+				UMLValidator.ACCEPT_CALL_ACTION__UNMARSHALL,
+				UMLPlugin.INSTANCE.getString(
+					"_UI_AcceptCallAction_Unmarshall_diagnostic", //$NON-NLS-1$
+					getMessageSubstitutions(context, acceptCallAction)),
+				new Object[]{acceptCallAction}));
 		}
 
 		return result;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AcceptEventActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AcceptEventActionOperations.java
index 3d48830..3bb964f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AcceptEventActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AcceptEventActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -74,15 +74,15 @@
 		// 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.ACCEPT_EVENT_ACTION__ONE_OUTPUT_PIN,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOneOutputPin", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(acceptEventAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{acceptEventAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACCEPT_EVENT_ACTION__ONE_OUTPUT_PIN,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOneOutputPin", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(acceptEventAction, context)}),
+					new Object[]{acceptEventAction}));
 			}
 			return false;
 		}
@@ -110,15 +110,15 @@
 		// 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.ACCEPT_EVENT_ACTION__NO_INPUT_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoInputPins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(acceptEventAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{acceptEventAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACCEPT_EVENT_ACTION__NO_INPUT_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoInputPins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(acceptEventAction, context)}),
+					new Object[]{acceptEventAction}));
 			}
 			return false;
 		}
@@ -149,15 +149,15 @@
 		// 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.ACCEPT_EVENT_ACTION__NO_OUTPUT_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoOutputPins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(acceptEventAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{acceptEventAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACCEPT_EVENT_ACTION__NO_OUTPUT_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoOutputPins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(acceptEventAction, context)}),
+					new Object[]{acceptEventAction}));
 			}
 			return false;
 		}
@@ -193,15 +193,15 @@
 		// 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.ACCEPT_EVENT_ACTION__UNMARSHALL_SIGNAL_EVENTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateUnmarshallSignalEvents", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(acceptEventAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{acceptEventAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACCEPT_EVENT_ACTION__UNMARSHALL_SIGNAL_EVENTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateUnmarshallSignalEvents", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(acceptEventAction, context)}),
+					new Object[]{acceptEventAction}));
 			}
 			return false;
 		}
@@ -234,15 +234,15 @@
 		// 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.ACCEPT_EVENT_ACTION__CONFORMING_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateConformingType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(acceptEventAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{acceptEventAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACCEPT_EVENT_ACTION__CONFORMING_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateConformingType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(acceptEventAction, context)}),
+					new Object[]{acceptEventAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActionExecutionSpecificationOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActionExecutionSpecificationOperations.java
index 68cbb9a..cb81a2a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActionExecutionSpecificationOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActionExecutionSpecificationOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -73,15 +73,16 @@
 		// 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.ACTION_EXECUTION_SPECIFICATION__ACTION_REFERENCED,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateActionReferenced", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(actionExecutionSpecification, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{actionExecutionSpecification}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTION_EXECUTION_SPECIFICATION__ACTION_REFERENCED,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateActionReferenced", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(actionExecutionSpecification,
+									context)}),
+					new Object[]{actionExecutionSpecification}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActionInputPinOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActionInputPinOperations.java
index 6eadf96..8480974 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActionInputPinOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActionInputPinOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,15 @@
 		// 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.ACTION_INPUT_PIN__ONE_OUTPUT_PIN,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOneOutputPin", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(actionInputPin, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{actionInputPin}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTION_INPUT_PIN__ONE_OUTPUT_PIN,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOneOutputPin", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(actionInputPin, context)}),
+					new Object[]{actionInputPin}));
 			}
 			return false;
 		}
@@ -108,15 +108,15 @@
 		// 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.ACTION_INPUT_PIN__NO_CONTROL_OR_OBJECT_FLOW,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoControlOrObjectFlow", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(actionInputPin, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{actionInputPin}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTION_INPUT_PIN__NO_CONTROL_OR_OBJECT_FLOW,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoControlOrObjectFlow", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(actionInputPin, context)}),
+					new Object[]{actionInputPin}));
 			}
 			return false;
 		}
@@ -143,15 +143,15 @@
 		// 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.ACTION_INPUT_PIN__INPUT_PIN,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInputPin", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(actionInputPin, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{actionInputPin}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTION_INPUT_PIN__INPUT_PIN,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInputPin", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(actionInputPin, context)}),
+					new Object[]{actionInputPin}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityEdgeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityEdgeOperations.java
index b9cbd87..f2daf55 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityEdgeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityEdgeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,15 @@
 		// 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_EDGE__SOURCE_AND_TARGET,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSourceAndTarget", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityEdge, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activityEdge}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY_EDGE__SOURCE_AND_TARGET,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSourceAndTarget", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activityEdge, context)}),
+					new Object[]{activityEdge}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityGroupOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityGroupOperations.java
index 60f2741..3e43a88 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityGroupOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityGroupOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -93,15 +93,15 @@
 		// 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_GROUP__NODES_AND_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNodesAndEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityGroup, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activityGroup}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY_GROUP__NODES_AND_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNodesAndEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activityGroup, context)}),
+					new Object[]{activityGroup}));
 			}
 			return false;
 		}
@@ -131,15 +131,15 @@
 		// 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_GROUP__NOT_CONTAINED,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNotContained", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityGroup, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activityGroup}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY_GROUP__NOT_CONTAINED,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNotContained", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activityGroup, context)}),
+					new Object[]{activityGroup}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityOperations.java
index 4c77c91..13bf17f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -71,15 +71,15 @@
 		// 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__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(activity, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activity}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY__MAXIMUM_ONE_PARAMETER_NODE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMaximumOneParameterNode", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activity, context)}),
+					new Object[]{activity}));
 			}
 			return false;
 		}
@@ -113,15 +113,15 @@
 		// 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__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(activity, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activity}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY__MAXIMUM_TWO_PARAMETER_NODES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMaximumTwoParameterNodes", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activity, context)}),
+					new Object[]{activity}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityParameterNodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityParameterNodeOperations.java
index e37ad2f..a65819c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityParameterNodeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityParameterNodeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -73,15 +73,16 @@
 		// 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__HAS_PARAMETERS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateHasParameters", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityParameterNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activityParameterNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY_PARAMETER_NODE__HAS_PARAMETERS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateHasParameters", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activityParameterNode,
+									context)}),
+					new Object[]{activityParameterNode}));
 			}
 			return false;
 		}
@@ -109,15 +110,16 @@
 		// 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__SAME_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSameType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityParameterNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activityParameterNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY_PARAMETER_NODE__SAME_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSameType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activityParameterNode,
+									context)}),
+					new Object[]{activityParameterNode}));
 			}
 			return false;
 		}
@@ -145,15 +147,16 @@
 		// 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__NO_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityParameterNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activityParameterNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY_PARAMETER_NODE__NO_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activityParameterNode,
+									context)}),
+					new Object[]{activityParameterNode}));
 			}
 			return false;
 		}
@@ -183,15 +186,16 @@
 		// 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__NO_INCOMING_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoIncomingEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityParameterNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activityParameterNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY_PARAMETER_NODE__NO_INCOMING_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoIncomingEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activityParameterNode,
+									context)}),
+					new Object[]{activityParameterNode}));
 			}
 			return false;
 		}
@@ -222,15 +226,16 @@
 		// 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__NO_OUTGOING_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoOutgoingEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityParameterNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activityParameterNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY_PARAMETER_NODE__NO_OUTGOING_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoOutgoingEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activityParameterNode,
+									context)}),
+					new Object[]{activityParameterNode}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityPartitionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityPartitionOperations.java
index f8c1abd..3737952 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityPartitionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActivityPartitionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -72,15 +72,15 @@
 		// 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_PARTITION__DIMENSION_NOT_CONTAINED,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateDimensionNotContained", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityPartition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activityPartition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY_PARTITION__DIMENSION_NOT_CONTAINED,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateDimensionNotContained", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activityPartition, context)}),
+					new Object[]{activityPartition}));
 			}
 			return false;
 		}
@@ -120,15 +120,15 @@
 		// 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_PARTITION__REPRESENTS_CLASSIFIER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateRepresentsClassifier", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityPartition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activityPartition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY_PARTITION__REPRESENTS_CLASSIFIER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateRepresentsClassifier", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activityPartition, context)}),
+					new Object[]{activityPartition}));
 			}
 			return false;
 		}
@@ -160,15 +160,15 @@
 		// 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_PARTITION__REPRESENTS_PROPERTY_AND_IS_CONTAINED,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateRepresentsPropertyAndIsContained", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityPartition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activityPartition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY_PARTITION__REPRESENTS_PROPERTY_AND_IS_CONTAINED,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateRepresentsPropertyAndIsContained", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activityPartition, context)}),
+					new Object[]{activityPartition}));
 			}
 			return false;
 		}
@@ -202,15 +202,15 @@
 		// 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_PARTITION__REPRESENTS_PROPERTY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateRepresentsProperty", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(activityPartition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{activityPartition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ACTIVITY_PARTITION__REPRESENTS_PROPERTY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateRepresentsProperty", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(activityPartition, context)}),
+					new Object[]{activityPartition}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActorOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActorOperations.java
index 93737e6..fa7f26c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActorOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ActorOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -91,21 +91,21 @@
 					: actorEnd.getType();
 
 				result &= actorEndType instanceof UseCase
-					|| (actorEndType instanceof org.eclipse.uml2.uml.Class && !(actorEndType instanceof Behavior));
+					|| (actorEndType instanceof org.eclipse.uml2.uml.Class
+						&& !(actorEndType instanceof Behavior));
 			}
 
 			if (!result) {
 
 				if (diagnostics != null) {
-					diagnostics
-						.add(new BasicDiagnostic(
-							Diagnostic.WARNING,
-							UMLValidator.DIAGNOSTIC_SOURCE,
-							UMLValidator.ACTOR__ASSOCIATIONS,
-							UMLPlugin.INSTANCE
-								.getString(
-									"_UI_Actor_Associations_diagnostic", getMessageSubstitutions(context, actor, association)), //$NON-NLS-1$
-							new Object[]{actor, association}));
+					diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+						UMLValidator.DIAGNOSTIC_SOURCE,
+						UMLValidator.ACTOR__ASSOCIATIONS,
+						UMLPlugin.INSTANCE.getString(
+							"_UI_Actor_Associations_diagnostic", //$NON-NLS-1$
+							getMessageSubstitutions(context, actor,
+								association)),
+						new Object[]{actor, association}));
 				}
 
 				break;
@@ -132,15 +132,13 @@
 		boolean result = !isEmpty(actor.getName());
 
 		if (!result && diagnostics != null) {
-			diagnostics
-				.add(new BasicDiagnostic(
-					Diagnostic.WARNING,
-					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.ACTOR__MUST_HAVE_NAME,
-					UMLPlugin.INSTANCE
-						.getString(
-							"_UI_Actor_MustHaveName_diagnostic", getMessageSubstitutions(context, actor)), //$NON-NLS-1$
-					new Object[]{actor}));
+			diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+				UMLValidator.DIAGNOSTIC_SOURCE,
+				UMLValidator.ACTOR__MUST_HAVE_NAME,
+				UMLPlugin.INSTANCE.getString(
+					"_UI_Actor_MustHaveName_diagnostic", //$NON-NLS-1$
+					getMessageSubstitutions(context, actor)),
+				new Object[]{actor}));
 		}
 
 		return result;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AddStructuralFeatureValueActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AddStructuralFeatureValueActionOperations.java
index 474432f..5a7ba32 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AddStructuralFeatureValueActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AddStructuralFeatureValueActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -68,15 +68,14 @@
 		boolean result = addStructuralFeatureValueAction.getValue() != null;
 
 		if (!result && diagnostics != null) {
-			diagnostics
-				.add(new BasicDiagnostic(
-					Diagnostic.WARNING,
-					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__REQUIRED_VALUE,
-					UMLPlugin.INSTANCE
-						.getString(
-							"_UI_AddStructuralFeatureValueAction_RequiredValue_diagnostic", getMessageSubstitutions(context, addStructuralFeatureValueAction)), //$NON-NLS-1$
-					new Object[]{addStructuralFeatureValueAction}));
+			diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+				UMLValidator.DIAGNOSTIC_SOURCE,
+				UMLValidator.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__REQUIRED_VALUE,
+				UMLPlugin.INSTANCE.getString(
+					"_UI_AddStructuralFeatureValueAction_RequiredValue_diagnostic", //$NON-NLS-1$
+					getMessageSubstitutions(context,
+						addStructuralFeatureValueAction)),
+				new Object[]{addStructuralFeatureValueAction}));
 		}
 
 		return result;
@@ -108,15 +107,16 @@
 		// 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.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT_PIN,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInsertAtPin", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(addStructuralFeatureValueAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{addStructuralFeatureValueAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT_PIN,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInsertAtPin", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(addStructuralFeatureValueAction,
+									context)}),
+					new Object[]{addStructuralFeatureValueAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AddVariableValueActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AddVariableValueActionOperations.java
index 680d223..9a78b93 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AddVariableValueActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AddVariableValueActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,14 +69,14 @@
 
 		if (!result && diagnostics != null) {
 			diagnostics
-				.add(new BasicDiagnostic(
-					Diagnostic.WARNING,
+				.add(new BasicDiagnostic(Diagnostic.WARNING,
 					UMLValidator.DIAGNOSTIC_SOURCE,
 					UMLValidator.ADD_VARIABLE_VALUE_ACTION__REQUIRED_VALUE,
-					UMLPlugin.INSTANCE
-						.getString(
-							"_UI_AddVariableValueAction_RequiredValue_diagnostic", getMessageSubstitutions(context, addVariableValueAction)), //$NON-NLS-1$
-					new Object[]{addVariableValueAction}));
+					UMLPlugin.INSTANCE.getString(
+						"_UI_AddVariableValueAction_RequiredValue_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context,
+							addVariableValueAction)),
+				new Object[]{addVariableValueAction}));
 		}
 
 		return result;
@@ -108,15 +108,16 @@
 		// 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.ADD_VARIABLE_VALUE_ACTION__INSERT_AT_PIN,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInsertAtPin", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(addVariableValueAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{addVariableValueAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ADD_VARIABLE_VALUE_ACTION__INSERT_AT_PIN,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInsertAtPin", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(addVariableValueAction,
+									context)}),
+					new Object[]{addVariableValueAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ArtifactOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ArtifactOperations.java
index 31e60ef..d84037f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ArtifactOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ArtifactOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 451350
+ *   Kenn Hussey (CEA) - 327039, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -59,9 +59,9 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static Operation createOwnedOperation(Artifact artifact,
-			String name, EList<String> parameterNames,
-			EList<Type> parameterTypes, Type returnType) {
+	public static Operation createOwnedOperation(Artifact artifact, String name,
+			EList<String> parameterNames, EList<Type> parameterTypes,
+			Type returnType) {
 		return TypeOperations.createOwnedOperation(artifact, name,
 			parameterNames, parameterTypes, returnType);
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AssociationClassOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AssociationClassOperations.java
index 7f6be7d..0bbb791 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AssociationClassOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AssociationClassOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -82,15 +82,13 @@
 		}
 
 		if (!result && diagnostics != null) {
-			diagnostics
-				.add(new BasicDiagnostic(
-					Diagnostic.WARNING,
-					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.ASSOCIATION_CLASS__CANNOT_BE_DEFINED,
-					UMLPlugin.INSTANCE
-						.getString(
-							"_UI_AssociationClass_CannotBeDefined_diagnostic", getMessageSubstitutions(context, associationClass)), //$NON-NLS-1$
-					new Object[]{associationClass}));
+			diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+				UMLValidator.DIAGNOSTIC_SOURCE,
+				UMLValidator.ASSOCIATION_CLASS__CANNOT_BE_DEFINED,
+				UMLPlugin.INSTANCE.getString(
+					"_UI_AssociationClass_CannotBeDefined_diagnostic", //$NON-NLS-1$
+					getMessageSubstitutions(context, associationClass)),
+				new Object[]{associationClass}));
 		}
 
 		return result;
@@ -116,15 +114,13 @@
 			associationClass.getOwnedEnds());
 
 		if (!result && diagnostics != null) {
-			diagnostics
-				.add(new BasicDiagnostic(
-					Diagnostic.WARNING,
-					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.ASSOCIATION_CLASS__DISJOINT_ATTRIBUTES_ENDS,
-					UMLPlugin.INSTANCE
-						.getString(
-							"_UI_AssociationClass_DisjointAttributesEnds_diagnostic", getMessageSubstitutions(context, associationClass)), //$NON-NLS-1$
-					new Object[]{associationClass}));
+			diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+				UMLValidator.DIAGNOSTIC_SOURCE,
+				UMLValidator.ASSOCIATION_CLASS__DISJOINT_ATTRIBUTES_ENDS,
+				UMLPlugin.INSTANCE.getString(
+					"_UI_AssociationClass_DisjointAttributesEnds_diagnostic", //$NON-NLS-1$
+					getMessageSubstitutions(context, associationClass)),
+				new Object[]{associationClass}));
 		}
 
 		return result;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AssociationOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AssociationOperations.java
index dce0b6f..b7ff346 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AssociationOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/AssociationOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -82,15 +82,15 @@
 		// 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.ASSOCIATION__SPECIALIZED_END_NUMBER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSpecializedEndNumber", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(association, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{association}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ASSOCIATION__SPECIALIZED_END_NUMBER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSpecializedEndNumber", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(association, context)}),
+					new Object[]{association}));
 			}
 			return false;
 		}
@@ -119,15 +119,15 @@
 		// 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.ASSOCIATION__SPECIALIZED_END_TYPES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSpecializedEndTypes", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(association, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{association}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ASSOCIATION__SPECIALIZED_END_TYPES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSpecializedEndTypes", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(association, context)}),
+					new Object[]{association}));
 			}
 			return false;
 		}
@@ -154,15 +154,15 @@
 		// 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.ASSOCIATION__BINARY_ASSOCIATIONS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateBinaryAssociations", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(association, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{association}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ASSOCIATION__BINARY_ASSOCIATIONS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateBinaryAssociations", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(association, context)}),
+					new Object[]{association}));
 			}
 			return false;
 		}
@@ -189,15 +189,15 @@
 		// 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.ASSOCIATION__ASSOCIATION_ENDS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateAssociationEnds", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(association, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{association}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ASSOCIATION__ASSOCIATION_ENDS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateAssociationEnds", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(association, context)}),
+					new Object[]{association}));
 			}
 			return false;
 		}
@@ -223,15 +223,15 @@
 		// 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.ASSOCIATION__ENDS_MUST_BE_TYPED,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEndsMustBeTyped", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(association, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{association}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ASSOCIATION__ENDS_MUST_BE_TYPED,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEndsMustBeTyped", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(association, context)}),
+					new Object[]{association}));
 			}
 			return false;
 		}
@@ -266,8 +266,8 @@
 		EList<Type> endTypes = new UniqueEList.FastCompare<Type>();
 
 		for (Property memberEnd : association.getMemberEnds()) {
-			Type endType = (Type) memberEnd.eGet(
-				UMLPackage.Literals.TYPED_ELEMENT__TYPE, false);
+			Type endType = (Type) memberEnd
+				.eGet(UMLPackage.Literals.TYPED_ELEMENT__TYPE, false);
 
 			if (endType != null) {
 				endTypes.add(endType);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BehaviorOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BehaviorOperations.java
index f4ee2f3..86c9287 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BehaviorOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BehaviorOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 383550, 418466, 432898, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 383550, 418466, 432898, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -87,15 +87,15 @@
 		// 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.BEHAVIOR__MOST_ONE_BEHAVIOR,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMostOneBehavior", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(behavior, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{behavior}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.BEHAVIOR__MOST_ONE_BEHAVIOR,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMostOneBehavior", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(behavior, context)}),
+					new Object[]{behavior}));
 			}
 			return false;
 		}
@@ -146,9 +146,10 @@
 			if (!result && diagnostics != null) {
 				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
 					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.BEHAVIOR__PARAMETERS_MATCH, UMLPlugin.INSTANCE
-						.getString("_UI_Behavior_ParametersMatch_diagnostic", //$NON-NLS-1$
-							getMessageSubstitutions(context, behavior)),
+					UMLValidator.BEHAVIOR__PARAMETERS_MATCH,
+					UMLPlugin.INSTANCE.getString(
+						"_UI_Behavior_ParametersMatch_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, behavior)),
 					new Object[]{behavior}));
 			}
 		}
@@ -179,16 +180,13 @@
 				|| !contextClassifier.allFeatures().contains(specification)) {
 
 				if (diagnostics != null) {
-					diagnostics
-						.add(new BasicDiagnostic(
-							Diagnostic.WARNING,
-							UMLValidator.DIAGNOSTIC_SOURCE,
-							UMLValidator.BEHAVIOR__FEATURE_OF_CONTEXT_CLASSIFIER,
-							UMLPlugin.INSTANCE
-								.getString(
-									"_UI_Behavior_FeatureOfContextClassifier_diagnostic", //$NON-NLS-1$
-									getMessageSubstitutions(context, behavior)),
-							new Object[]{behavior}));
+					diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+						UMLValidator.DIAGNOSTIC_SOURCE,
+						UMLValidator.BEHAVIOR__FEATURE_OF_CONTEXT_CLASSIFIER,
+						UMLPlugin.INSTANCE.getString(
+							"_UI_Behavior_FeatureOfContextClassifier_diagnostic", //$NON-NLS-1$
+							getMessageSubstitutions(context, behavior)),
+						new Object[]{behavior}));
 				}
 
 				return false;
@@ -226,8 +224,8 @@
 		if (containmentFeature != UMLPackage.Literals.CLASS__NESTED_CLASSIFIER
 			&& containmentFeature != UMLPackage.Literals.INTERFACE__NESTED_CLASSIFIER) {
 
-			BehavioredClassifier b = behavior.behavioredClassifier(behavior
-				.getOwner());
+			BehavioredClassifier b = behavior
+				.behavioredClassifier(behavior.getOwner());
 
 			if (b != null) {
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BehavioralFeatureOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BehavioralFeatureOperations.java
index e5f6d63..7a6de31 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BehavioralFeatureOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BehavioralFeatureOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -80,15 +80,15 @@
 		// 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.BEHAVIORAL_FEATURE__ABSTRACT_NO_METHOD,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateAbstractNoMethod", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(behavioralFeature, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{behavioralFeature}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.BEHAVIORAL_FEATURE__ABSTRACT_NO_METHOD,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateAbstractNoMethod", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(behavioralFeature, context)}),
+					new Object[]{behavioralFeature}));
 			}
 			return false;
 		}
@@ -129,7 +129,8 @@
 			BehavioralFeature behavioralFeature) {
 		EList<Parameter> inputParameters = new UniqueEList.FastCompare<Parameter>();
 
-		for (Parameter ownedParameter : behavioralFeature.getOwnedParameters()) {
+		for (Parameter ownedParameter : behavioralFeature
+			.getOwnedParameters()) {
 			ParameterDirectionKind direction = ownedParameter.getDirection();
 
 			if (direction == ParameterDirectionKind.IN_LITERAL
@@ -157,7 +158,8 @@
 			BehavioralFeature behavioralFeature) {
 		EList<Parameter> outputParameters = new UniqueEList.FastCompare<Parameter>();
 
-		for (Parameter ownedParameter : behavioralFeature.getOwnedParameters()) {
+		for (Parameter ownedParameter : behavioralFeature
+			.getOwnedParameters()) {
 			ParameterDirectionKind direction = ownedParameter.getDirection();
 
 			if (direction == ParameterDirectionKind.OUT_LITERAL
@@ -192,7 +194,8 @@
 		if (n instanceof BehavioralFeature) {
 			EList<String> namesOfMemberN = ns.getNamesOfMember(n);
 
-			for (String nameOfMemberBF : ns.getNamesOfMember(behavioralFeature)) {
+			for (String nameOfMemberBF : ns
+				.getNamesOfMember(behavioralFeature)) {
 
 				if (namesOfMemberN.contains(nameOfMemberBF)) {
 					Iterator<Parameter> bfParameters = behavioralFeature
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BehavioredClassifierOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BehavioredClassifierOperations.java
index 8f7fc7d..086d208 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BehavioredClassifierOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BehavioredClassifierOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -77,15 +77,16 @@
 		// 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.BEHAVIORED_CLASSIFIER__CLASS_BEHAVIOR,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateClassBehavior", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(behavioredClassifier, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{behavioredClassifier}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.BEHAVIORED_CLASSIFIER__CLASS_BEHAVIOR,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateClassBehavior", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(behavioredClassifier,
+									context)}),
+					new Object[]{behavioredClassifier}));
 			}
 			return false;
 		}
@@ -142,7 +143,8 @@
 	protected static EList<Interface> getAllImplementedInterfaces(
 			BehavioredClassifier behavioredClassifier,
 			EList<Interface> allImplementedInterfaces) {
-		getImplementedInterfaces(behavioredClassifier, allImplementedInterfaces);
+		getImplementedInterfaces(behavioredClassifier,
+			allImplementedInterfaces);
 
 		for (Classifier parent : behavioredClassifier.allParents()) {
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BroadcastSignalActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BroadcastSignalActionOperations.java
index ce7d746..af7effb 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BroadcastSignalActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/BroadcastSignalActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -71,15 +71,16 @@
 		// 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.BROADCAST_SIGNAL_ACTION__NUMBER_OF_ARGUMENTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNumberOfArguments", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(broadcastSignalAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{broadcastSignalAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.BROADCAST_SIGNAL_ACTION__NUMBER_OF_ARGUMENTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNumberOfArguments", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(broadcastSignalAction,
+									context)}),
+					new Object[]{broadcastSignalAction}));
 			}
 			return false;
 		}
@@ -111,15 +112,16 @@
 		// 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.BROADCAST_SIGNAL_ACTION__TYPE_ORDERING_MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeOrderingMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(broadcastSignalAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{broadcastSignalAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.BROADCAST_SIGNAL_ACTION__TYPE_ORDERING_MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeOrderingMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(broadcastSignalAction,
+									context)}),
+					new Object[]{broadcastSignalAction}));
 			}
 			return false;
 		}
@@ -147,15 +149,16 @@
 		// 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.BROADCAST_SIGNAL_ACTION__NO_ONPORT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoOnport", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(broadcastSignalAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{broadcastSignalAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.BROADCAST_SIGNAL_ACTION__NO_ONPORT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoOnport", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(broadcastSignalAction,
+									context)}),
+					new Object[]{broadcastSignalAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CallActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CallActionOperations.java
index bfe9335..6c23942 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CallActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CallActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -80,15 +80,15 @@
 		// 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.CALL_ACTION__ARGUMENT_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateArgumentPins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(callAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{callAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CALL_ACTION__ARGUMENT_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateArgumentPins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(callAction, context)}),
+					new Object[]{callAction}));
 			}
 			return false;
 		}
@@ -120,15 +120,15 @@
 		// 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.CALL_ACTION__RESULT_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateResultPins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(callAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{callAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CALL_ACTION__RESULT_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateResultPins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(callAction, context)}),
+					new Object[]{callAction}));
 			}
 			return false;
 		}
@@ -155,15 +155,15 @@
 		// 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.CALL_ACTION__SYNCHRONOUS_CALL,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSynchronousCall", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(callAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{callAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CALL_ACTION__SYNCHRONOUS_CALL,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSynchronousCall", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(callAction, context)}),
+					new Object[]{callAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CallBehaviorActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CallBehaviorActionOperations.java
index 4cabb1c..7fd23dd 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CallBehaviorActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CallBehaviorActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -75,15 +75,15 @@
 		// 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.CALL_BEHAVIOR_ACTION__NO_ONPORT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoOnport", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(callBehaviorAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{callBehaviorAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CALL_BEHAVIOR_ACTION__NO_ONPORT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoOnport", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(callBehaviorAction, context)}),
+					new Object[]{callBehaviorAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CallOperationActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CallOperationActionOperations.java
index 2eeb57b..b3073c8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CallOperationActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CallOperationActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -77,15 +77,15 @@
 		// 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.CALL_OPERATION_ACTION__TYPE_TARGET_PIN,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeTargetPin", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(callOperationAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{callOperationAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CALL_OPERATION_ACTION__TYPE_TARGET_PIN,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeTargetPin", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(callOperationAction, context)}),
+					new Object[]{callOperationAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassOperations.java
index 4c3d292..c613956 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 323181
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -84,16 +84,16 @@
 			org.eclipse.uml2.uml.Class class_, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
 
-		if (!class_.isActive()
-			&& !(class_.getOwnedReceptions().isEmpty() && class_
-				.getClassifierBehavior() == null)) {
+		if (!class_.isActive() && !(class_.getOwnedReceptions().isEmpty()
+			&& class_.getClassifierBehavior() == null)) {
 
 			if (diagnostics != null) {
 				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
 					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.CLASS__PASSIVE_CLASS, UMLPlugin.INSTANCE
-						.getString("_UI_Class_PassiveClass_diagnostic", //$NON-NLS-1$
-							getMessageSubstitutions(context, class_)),
+					UMLValidator.CLASS__PASSIVE_CLASS,
+					UMLPlugin.INSTANCE.getString(
+						"_UI_Class_PassiveClass_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, class_)),
 					new Object[]{class_}));
 			}
 
@@ -139,9 +139,11 @@
 
 		if (class_.isMetaclass()) {
 
-			for (EStructuralFeature.Setting nonNavigableInverseReference : getNonNavigableInverseReferences(class_)) {
+			for (EStructuralFeature.Setting nonNavigableInverseReference : getNonNavigableInverseReferences(
+				class_)) {
 
-				if (nonNavigableInverseReference.getEStructuralFeature() == UMLPackage.Literals.TYPED_ELEMENT__TYPE) {
+				if (nonNavigableInverseReference
+					.getEStructuralFeature() == UMLPackage.Literals.TYPED_ELEMENT__TYPE) {
 					EObject eObject = nonNavigableInverseReference.getEObject();
 
 					if (eObject instanceof Property) {
@@ -192,8 +194,8 @@
 			org.eclipse.uml2.uml.Class class_, String name,
 			EList<String> parameterNames, EList<Type> parameterTypes,
 			Type returnType) {
-		return TypeOperations.createOwnedOperation(class_, name,
-			parameterNames, parameterTypes, returnType);
+		return TypeOperations.createOwnedOperation(class_, name, parameterNames,
+			parameterTypes, returnType);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassifierOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassifierOperations.java
index a891d48..8992d3e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassifierOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassifierOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 394623, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 394623, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -194,7 +194,8 @@
 							UMLPlugin.INSTANCE.getString(
 								"_UI_Classifier_SpecializeType_diagnostic", //$NON-NLS-1$
 								getMessageSubstitutions(context, classifier,
-									parent)), new Object[]{classifier, parent}));
+									parent)),
+						new Object[]{classifier, parent}));
 				}
 			}
 		}
@@ -217,24 +218,23 @@
 	 * <!-- end-model-doc -->
 	 * @generated
 	 */
-	public static boolean validateMapsToGeneralizationSet(
-			Classifier classifier, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public static boolean validateMapsToGeneralizationSet(Classifier classifier,
+			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.CLASSIFIER__MAPS_TO_GENERALIZATION_SET,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMapsToGeneralizationSet", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(classifier, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{classifier}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CLASSIFIER__MAPS_TO_GENERALIZATION_SET,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMapsToGeneralizationSet", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(classifier, context)}),
+					new Object[]{classifier}));
 			}
 			return false;
 		}
@@ -261,15 +261,15 @@
 		// 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.CLASSIFIER__NON_FINAL_PARENTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNonFinalParents", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(classifier, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{classifier}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CLASSIFIER__NON_FINAL_PARENTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNonFinalParents", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(classifier, context)}),
+					new Object[]{classifier}));
 			}
 			return false;
 		}
@@ -390,19 +390,18 @@
 
 			if (parameterNames != null
 				&& parameterNames.size() != ownedParameterListSize
-				|| (parameterTypes != null && parameterTypes.size() != ownedParameterListSize))
+				|| (parameterTypes != null
+					&& parameterTypes.size() != ownedParameterListSize))
 
 				continue operationLoop;
 
 			for (int j = 0; j < ownedParameterListSize; j++) {
 				Parameter ownedParameter = ownedParameterList.get(j);
 
-				if (parameterNames != null
-					&& !(ignoreCase
-						? parameterNames.get(j).equalsIgnoreCase(
-							ownedParameter.getName())
-						: parameterNames.get(j)
-							.equals(ownedParameter.getName())))
+				if (parameterNames != null && !(ignoreCase
+					? parameterNames.get(j)
+						.equalsIgnoreCase(ownedParameter.getName())
+					: parameterNames.get(j).equals(ownedParameter.getName())))
 
 					continue operationLoop;
 
@@ -455,7 +454,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static boolean maySpecializeType(Classifier classifier, Classifier c) {
+	public static boolean maySpecializeType(Classifier classifier,
+			Classifier c) {
 		return c.eClass().isSuperTypeOf(classifier.eClass());
 	}
 
@@ -493,14 +493,15 @@
 		protected Object validate(int index, Object object) {
 			Generalization generalization = UMLFactory.eINSTANCE
 				.createGeneralization();
-			generalization.setGeneral((Classifier) super
-				.validate(index, object));
+			generalization
+				.setGeneral((Classifier) super.validate(index, object));
 			return generalization;
 		}
 
 	}
 
-	protected static final int[] GENERAL_ESUPERSETS = new int[]{UMLPackage.CLASSIFIER__GENERALIZATION};
+	protected static final int[] GENERAL_ESUPERSETS = new int[]{
+		UMLPackage.CLASSIFIER__GENERALIZATION};
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -531,7 +532,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static EList<NamedElement> getInheritedMembers(Classifier classifier) {
+	public static EList<NamedElement> getInheritedMembers(
+			Classifier classifier) {
 		EList<NamedElement> inheritedMembers = new UniqueEList.FastCompare<NamedElement>();
 
 		for (Classifier parent : classifier.parents()) {
@@ -540,8 +542,7 @@
 
 		EList<NamedElement> inherit = classifier.inherit(inheritedMembers);
 
-		return new UnionEObjectEList<NamedElement>(
-			(InternalEObject) classifier,
+		return new UnionEObjectEList<NamedElement>((InternalEObject) classifier,
 			UMLPackage.Literals.CLASSIFIER__INHERITED_MEMBER, inherit.size(),
 			inherit.toArray());
 	}
@@ -610,8 +611,8 @@
 	 */
 	public static EList<Interface> directlyRealizedInterfaces(
 			Classifier classifier) {
-		return ECollections.unmodifiableEList(directlyRealizedInterfaces(
-			classifier, true));
+		return ECollections
+			.unmodifiableEList(directlyRealizedInterfaces(classifier, true));
 	}
 
 	protected static EList<Interface> directlyRealizedInterfaces(
@@ -658,9 +659,10 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static EList<Interface> directlyUsedInterfaces(Classifier classifier) {
-		return ECollections.unmodifiableEList(directlyUsedInterfaces(
-			classifier, true));
+	public static EList<Interface> directlyUsedInterfaces(
+			Classifier classifier) {
+		return ECollections
+			.unmodifiableEList(directlyUsedInterfaces(classifier, true));
 	}
 
 	protected static EList<Interface> directlyUsedInterfaces(
@@ -705,7 +707,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static EList<Interface> allRealizedInterfaces(Classifier classifier) {
+	public static EList<Interface> allRealizedInterfaces(
+			Classifier classifier) {
 		return allRealizedInterfaces(classifier, true,
 			new UniqueEList.FastCompare<Interface>());
 	}
@@ -793,8 +796,8 @@
 
 		EList<NamedElement> members = classifier.getMembers();
 
-		for (ListIterator<Property> attribute = allAttributes.listIterator(); attribute
-			.hasNext();) {
+		for (ListIterator<Property> attribute = allAttributes
+			.listIterator(); attribute.hasNext();) {
 
 			if (!members.contains(attribute.next())) {
 				attribute.remove();
@@ -836,9 +839,9 @@
 			parentAttributes.addAll(parent.getAttributes());
 		}
 
-		allSlottableFeatures
-			.addAll((Collection<? extends StructuralFeature>) inherit(
-				classifier, parentAttributes));
+		allSlottableFeatures.addAll(
+			(Collection<? extends StructuralFeature>) inherit(classifier,
+				parentAttributes));
 
 		return ECollections.unmodifiableEList(allSlottableFeatures);
 	}
@@ -887,7 +890,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static boolean hasVisibilityOf(Classifier classifier, NamedElement n) {
+	public static boolean hasVisibilityOf(Classifier classifier,
+			NamedElement n) {
 
 		for (Classifier parent : classifier.allParents()) {
 
@@ -925,8 +929,8 @@
 		for (NamedElement ownedMember : classifier.getOwnedMembers()) {
 
 			if (ownedMember instanceof RedefinableElement) {
-				redefinedElements.addAll(((RedefinableElement) ownedMember)
-					.getRedefinedElements());
+				redefinedElements.addAll(
+					((RedefinableElement) ownedMember).getRedefinedElements());
 			}
 		}
 
@@ -965,8 +969,8 @@
 	 * @generated NOT
 	 */
 	public static EList<Classifier> allParents(Classifier classifier) {
-		return ECollections.unmodifiableEList(allParents(classifier,
-			new UniqueEList.FastCompare<Classifier>()));
+		return ECollections.unmodifiableEList(
+			allParents(classifier, new UniqueEList.FastCompare<Classifier>()));
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassifierTemplateParameterOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassifierTemplateParameterOperations.java
index 484a9f0..387c60b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassifierTemplateParameterOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClassifierTemplateParameterOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -74,15 +74,16 @@
 		// 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.CLASSIFIER_TEMPLATE_PARAMETER__HAS_CONSTRAINING_CLASSIFIER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateHasConstrainingClassifier", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(classifierTemplateParameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{classifierTemplateParameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CLASSIFIER_TEMPLATE_PARAMETER__HAS_CONSTRAINING_CLASSIFIER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateHasConstrainingClassifier", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(classifierTemplateParameter,
+									context)}),
+					new Object[]{classifierTemplateParameter}));
 			}
 			return false;
 		}
@@ -110,15 +111,16 @@
 		// 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.CLASSIFIER_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT_NO_FEATURES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateParameteredElementNoFeatures", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(classifierTemplateParameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{classifierTemplateParameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CLASSIFIER_TEMPLATE_PARAMETER__PARAMETERED_ELEMENT_NO_FEATURES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateParameteredElementNoFeatures", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(classifierTemplateParameter,
+									context)}),
+					new Object[]{classifierTemplateParameter}));
 			}
 			return false;
 		}
@@ -146,15 +148,16 @@
 		// 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.CLASSIFIER_TEMPLATE_PARAMETER__MATCHING_ABSTRACT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMatchingAbstract", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(classifierTemplateParameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{classifierTemplateParameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CLASSIFIER_TEMPLATE_PARAMETER__MATCHING_ABSTRACT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMatchingAbstract", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(classifierTemplateParameter,
+									context)}),
+					new Object[]{classifierTemplateParameter}));
 			}
 			return false;
 		}
@@ -182,15 +185,16 @@
 		// 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.CLASSIFIER_TEMPLATE_PARAMETER__ACTUAL_IS_CLASSIFIER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateActualIsClassifier", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(classifierTemplateParameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{classifierTemplateParameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CLASSIFIER_TEMPLATE_PARAMETER__ACTUAL_IS_CLASSIFIER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateActualIsClassifier", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(classifierTemplateParameter,
+									context)}),
+					new Object[]{classifierTemplateParameter}));
 			}
 			return false;
 		}
@@ -224,15 +228,17 @@
 		// 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.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIERS_CONSTRAIN_ARGS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateConstrainingClassifiersConstrainArgs", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(classifierTemplateParameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{classifierTemplateParameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIERS_CONSTRAIN_ARGS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{
+							"validateConstrainingClassifiersConstrainArgs", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(classifierTemplateParameter,
+									context)}),
+					new Object[]{classifierTemplateParameter}));
 			}
 			return false;
 		}
@@ -262,15 +268,17 @@
 		// 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.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIERS_CONSTRAIN_PARAMETERED_ELEMENT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateConstrainingClassifiersConstrainParameteredElement", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(classifierTemplateParameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{classifierTemplateParameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CLASSIFIER_TEMPLATE_PARAMETER__CONSTRAINING_CLASSIFIERS_CONSTRAIN_PARAMETERED_ELEMENT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{
+							"validateConstrainingClassifiersConstrainParameteredElement", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(classifierTemplateParameter,
+									context)}),
+					new Object[]{classifierTemplateParameter}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClauseOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClauseOperations.java
index 5d223ca..cf940f3 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClauseOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClauseOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -72,15 +72,15 @@
 		// 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.CLAUSE__DECIDER_OUTPUT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateDeciderOutput", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(clause, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{clause}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CLAUSE__DECIDER_OUTPUT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateDeciderOutput", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(clause, context)}),
+					new Object[]{clause}));
 			}
 			return false;
 		}
@@ -107,15 +107,15 @@
 		// 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.CLAUSE__TEST_AND_BODY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTestAndBody", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(clause, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{clause}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CLAUSE__TEST_AND_BODY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTestAndBody", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(clause, context)}),
+					new Object[]{clause}));
 			}
 			return false;
 		}
@@ -142,15 +142,15 @@
 		// 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.CLAUSE__BODY_OUTPUT_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateBodyOutputPins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(clause, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{clause}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CLAUSE__BODY_OUTPUT_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateBodyOutputPins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(clause, context)}),
+					new Object[]{clause}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClearAssociationActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClearAssociationActionOperations.java
index f959c55..a60952b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClearAssociationActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClearAssociationActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,16 @@
 		// 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_ASSOCIATION_ACTION__SAME_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSameType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(clearAssociationAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{clearAssociationAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CLEAR_ASSOCIATION_ACTION__SAME_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSameType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(clearAssociationAction,
+									context)}),
+					new Object[]{clearAssociationAction}));
 			}
 			return false;
 		}
@@ -106,15 +107,16 @@
 		// 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_ASSOCIATION_ACTION__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(clearAssociationAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{clearAssociationAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CLEAR_ASSOCIATION_ACTION__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(clearAssociationAction,
+									context)}),
+					new Object[]{clearAssociationAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClearStructuralFeatureActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClearStructuralFeatureActionOperations.java
index e4b4c28..211327c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClearStructuralFeatureActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ClearStructuralFeatureActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2008, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,16 @@
 		// 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}));
+				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", //$NON-NLS-1$
+						new Object[]{"validateTypeOfResult", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(clearStructuralFeatureAction,
+									context)}),
+					new Object[]{clearStructuralFeatureAction}));
 			}
 			return false;
 		}
@@ -106,15 +107,16 @@
 		// 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}));
+				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", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfResult", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(clearStructuralFeatureAction,
+									context)}),
+					new Object[]{clearStructuralFeatureAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CollaborationUseOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CollaborationUseOperations.java
index be64616..6d6af7d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CollaborationUseOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CollaborationUseOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -79,15 +79,15 @@
 		// 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.COLLABORATION_USE__CLIENT_ELEMENTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateClientElements", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(collaborationUse, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{collaborationUse}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.COLLABORATION_USE__CLIENT_ELEMENTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateClientElements", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(collaborationUse, context)}),
+					new Object[]{collaborationUse}));
 			}
 			return false;
 		}
@@ -114,15 +114,15 @@
 		// 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.COLLABORATION_USE__EVERY_ROLE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEveryRole", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(collaborationUse, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{collaborationUse}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.COLLABORATION_USE__EVERY_ROLE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEveryRole", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(collaborationUse, context)}),
+					new Object[]{collaborationUse}));
 			}
 			return false;
 		}
@@ -157,15 +157,15 @@
 		// 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.COLLABORATION_USE__CONNECTORS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateConnectors", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(collaborationUse, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{collaborationUse}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.COLLABORATION_USE__CONNECTORS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateConnectors", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(collaborationUse, context)}),
+					new Object[]{collaborationUse}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CombinedFragmentOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CombinedFragmentOperations.java
index c464a37..a661687 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CombinedFragmentOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CombinedFragmentOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -80,17 +80,14 @@
 				if (combinedFragment.getOperands().size() != 1) {
 
 					if (diagnostics != null) {
-						diagnostics
-							.add(new BasicDiagnostic(
-								Diagnostic.WARNING,
-								UMLValidator.DIAGNOSTIC_SOURCE,
-								UMLValidator.COMBINED_FRAGMENT__OPT_LOOP_BREAK_NEG,
-								UMLPlugin.INSTANCE
-									.getString(
-										"_UI_CombinedFragment_OptLoopBreakNeg_diagnostic", //$NON-NLS-1$
-										getMessageSubstitutions(context,
-											combinedFragment)),
-								new Object[]{combinedFragment}));
+						diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+							UMLValidator.DIAGNOSTIC_SOURCE,
+							UMLValidator.COMBINED_FRAGMENT__OPT_LOOP_BREAK_NEG,
+							UMLPlugin.INSTANCE.getString(
+								"_UI_CombinedFragment_OptLoopBreakNeg_diagnostic", //$NON-NLS-1$
+								getMessageSubstitutions(context,
+									combinedFragment)),
+							new Object[]{combinedFragment}));
 					}
 
 					return false;
@@ -122,15 +119,15 @@
 		// 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.COMBINED_FRAGMENT__BREAK,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateBreak", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(combinedFragment, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{combinedFragment}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.COMBINED_FRAGMENT__BREAK,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateBreak", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(combinedFragment, context)}),
+					new Object[]{combinedFragment}));
 			}
 			return false;
 		}
@@ -158,15 +155,15 @@
 		// 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.COMBINED_FRAGMENT__CONSIDER_AND_IGNORE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateConsiderAndIgnore", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(combinedFragment, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{combinedFragment}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.COMBINED_FRAGMENT__CONSIDER_AND_IGNORE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateConsiderAndIgnore", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(combinedFragment, context)}),
+					new Object[]{combinedFragment}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CommunicationPathOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CommunicationPathOperations.java
index caa5317..c660cd3 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CommunicationPathOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CommunicationPathOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.COMMUNICATION_PATH__ASSOCIATION_ENDS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateAssociationEnds", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(communicationPath, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{communicationPath}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.COMMUNICATION_PATH__ASSOCIATION_ENDS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateAssociationEnds", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(communicationPath, context)}),
+					new Object[]{communicationPath}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ComponentOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ComponentOperations.java
index e214966..68b1fb8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ComponentOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ComponentOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -86,15 +86,15 @@
 		// 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.COMPONENT__NO_NESTED_CLASSIFIERS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoNestedClassifiers", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(component, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{component}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.COMPONENT__NO_NESTED_CLASSIFIERS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoNestedClassifiers", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(component, context)}),
+					new Object[]{component}));
 			}
 			return false;
 		}
@@ -121,15 +121,15 @@
 		// 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.COMPONENT__NO_PACKAGED_ELEMENTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoPackagedElements", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(component, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{component}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.COMPONENT__NO_PACKAGED_ELEMENTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoPackagedElements", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(component, context)}),
+					new Object[]{component}));
 			}
 			return false;
 		}
@@ -243,7 +243,8 @@
 					.getRealizingClassifiers()) {
 
 					if (realizingClassifier != null) {
-						allUsedInterfaces(realizingClassifier, false, requireds);
+						allUsedInterfaces(realizingClassifier, false,
+							requireds);
 					}
 				}
 			}
@@ -262,8 +263,9 @@
 		for (EncapsulatedClassifier c : classifiers) {
 
 			for (Port ownedPort : c.getOwnedPorts()) {
-				requireds.addAll(((InternalEList<Interface>) ownedPort
-					.getRequireds()).basicList());
+				requireds.addAll(
+					((InternalEList<Interface>) ownedPort.getRequireds())
+						.basicList());
 			}
 		}
 
@@ -331,8 +333,9 @@
 		for (EncapsulatedClassifier c : classifiers) {
 
 			for (Port ownedPort : c.getOwnedPorts()) {
-				provideds.addAll(((InternalEList<Interface>) ownedPort
-					.getProvideds()).basicList());
+				provideds.addAll(
+					((InternalEList<Interface>) ownedPort.getProvideds())
+						.basicList());
 			}
 		}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConditionalNodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConditionalNodeOperations.java
index dfb9bcb..9d03fcc 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConditionalNodeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConditionalNodeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -79,15 +79,15 @@
 		// 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.CONDITIONAL_NODE__RESULT_NO_INCOMING,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateResultNoIncoming", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(conditionalNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{conditionalNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONDITIONAL_NODE__RESULT_NO_INCOMING,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateResultNoIncoming", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(conditionalNode, context)}),
+					new Object[]{conditionalNode}));
 			}
 			return false;
 		}
@@ -114,15 +114,15 @@
 		// 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.CONDITIONAL_NODE__NO_INPUT_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoInputPins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(conditionalNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{conditionalNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONDITIONAL_NODE__NO_INPUT_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoInputPins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(conditionalNode, context)}),
+					new Object[]{conditionalNode}));
 			}
 			return false;
 		}
@@ -151,15 +151,15 @@
 		// 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.CONDITIONAL_NODE__ONE_CLAUSE_WITH_EXECUTABLE_NODE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOneClauseWithExecutableNode", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(conditionalNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{conditionalNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONDITIONAL_NODE__ONE_CLAUSE_WITH_EXECUTABLE_NODE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOneClauseWithExecutableNode", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(conditionalNode, context)}),
+					new Object[]{conditionalNode}));
 			}
 			return false;
 		}
@@ -193,15 +193,15 @@
 		// 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.CONDITIONAL_NODE__MATCHING_OUTPUT_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMatchingOutputPins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(conditionalNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{conditionalNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONDITIONAL_NODE__MATCHING_OUTPUT_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMatchingOutputPins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(conditionalNode, context)}),
+					new Object[]{conditionalNode}));
 			}
 			return false;
 		}
@@ -229,15 +229,15 @@
 		// 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.CONDITIONAL_NODE__EXECUTABLE_NODES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateExecutableNodes", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(conditionalNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{conditionalNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONDITIONAL_NODE__EXECUTABLE_NODES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateExecutableNodes", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(conditionalNode, context)}),
+					new Object[]{conditionalNode}));
 			}
 			return false;
 		}
@@ -265,15 +265,15 @@
 		// 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.CONDITIONAL_NODE__CLAUSE_NO_PREDECESSOR,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateClauseNoPredecessor", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(conditionalNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{conditionalNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONDITIONAL_NODE__CLAUSE_NO_PREDECESSOR,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateClauseNoPredecessor", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(conditionalNode, context)}),
+					new Object[]{conditionalNode}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectableElementOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectableElementOperations.java
index fa495f4..158c652 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectableElementOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectableElementOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014 IBM Corporation and others.
+ * Copyright (c) 2006, 2016 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey - 323181, 418466
+ *   Kenn Hussey - 323181, 418466, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -123,9 +123,11 @@
 			ConnectableElement connectableElement) {
 		EList<ConnectorEnd> ends = new UniqueEList.FastCompare<ConnectorEnd>();
 
-		for (EStructuralFeature.Setting setting : getNonNavigableInverseReferences(connectableElement)) {
+		for (EStructuralFeature.Setting setting : getNonNavigableInverseReferences(
+			connectableElement)) {
 
-			if (setting.getEStructuralFeature() == UMLPackage.Literals.CONNECTOR_END__ROLE) {
+			if (setting
+				.getEStructuralFeature() == UMLPackage.Literals.CONNECTOR_END__ROLE) {
 				ends.add((ConnectorEnd) setting.getEObject());
 			}
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectionPointReferenceOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectionPointReferenceOperations.java
index 51641eb..1af9d7e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectionPointReferenceOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectionPointReferenceOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,16 @@
 		// 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.CONNECTION_POINT_REFERENCE__ENTRY_PSEUDOSTATES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEntryPseudostates", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(connectionPointReference, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{connectionPointReference}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONNECTION_POINT_REFERENCE__ENTRY_PSEUDOSTATES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEntryPseudostates", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(connectionPointReference,
+									context)}),
+					new Object[]{connectionPointReference}));
 			}
 			return false;
 		}
@@ -106,15 +107,16 @@
 		// 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.CONNECTION_POINT_REFERENCE__EXIT_PSEUDOSTATES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateExitPseudostates", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(connectionPointReference, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{connectionPointReference}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONNECTION_POINT_REFERENCE__EXIT_PSEUDOSTATES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateExitPseudostates", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(connectionPointReference,
+									context)}),
+					new Object[]{connectionPointReference}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectorEndOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectorEndOperations.java
index 8015bf1..be6cf4d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectorEndOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectorEndOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -79,15 +79,15 @@
 		// 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.CONNECTOR_END__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(connectorEnd, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{connectorEnd}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONNECTOR_END__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(connectorEnd, context)}),
+					new Object[]{connectorEnd}));
 			}
 			return false;
 		}
@@ -114,15 +114,15 @@
 		// 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.CONNECTOR_END__PART_WITH_PORT_EMPTY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validatePartWithPortEmpty", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(connectorEnd, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{connectorEnd}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONNECTOR_END__PART_WITH_PORT_EMPTY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validatePartWithPortEmpty", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(connectorEnd, context)}),
+					new Object[]{connectorEnd}));
 			}
 			return false;
 		}
@@ -142,24 +142,23 @@
 	 * <!-- end-model-doc -->
 	 * @generated
 	 */
-	public static boolean validateRoleAndPartWithPort(
-			ConnectorEnd connectorEnd, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public static boolean validateRoleAndPartWithPort(ConnectorEnd connectorEnd,
+			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.CONNECTOR_END__ROLE_AND_PART_WITH_PORT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateRoleAndPartWithPort", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(connectorEnd, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{connectorEnd}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONNECTOR_END__ROLE_AND_PART_WITH_PORT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateRoleAndPartWithPort", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(connectorEnd, context)}),
+					new Object[]{connectorEnd}));
 			}
 			return false;
 		}
@@ -186,15 +185,15 @@
 		// 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.CONNECTOR_END__SELF_PART_WITH_PORT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSelfPartWithPort", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(connectorEnd, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{connectorEnd}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONNECTOR_END__SELF_PART_WITH_PORT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSelfPartWithPort", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(connectorEnd, context)}),
+					new Object[]{connectorEnd}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectorOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectorOperations.java
index 11b8523..6031638 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectorOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConnectorOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 412684, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 412684, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -186,14 +186,14 @@
 							|| !(allRoles.contains(e.getPartWithPort()))) {
 
 							if (diagnostics != null) {
-								diagnostics.add(new BasicDiagnostic(
-									Diagnostic.WARNING,
-									UMLValidator.DIAGNOSTIC_SOURCE,
-									UMLValidator.CONNECTOR__ROLES,
-									UMLPlugin.INSTANCE.getString(
-										"_UI_Connector_Roles_diagnostic", //$NON-NLS-1$
-										getMessageSubstitutions(context,
-											connector)),
+								diagnostics
+									.add(new BasicDiagnostic(Diagnostic.WARNING,
+										UMLValidator.DIAGNOSTIC_SOURCE,
+										UMLValidator.CONNECTOR__ROLES,
+										UMLPlugin.INSTANCE.getString(
+											"_UI_Connector_Roles_diagnostic", //$NON-NLS-1$
+											getMessageSubstitutions(context,
+												connector)),
 									new Object[]{connector}));
 							}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConsiderIgnoreFragmentOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConsiderIgnoreFragmentOperations.java
index eb1caf9..722b0f3 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConsiderIgnoreFragmentOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConsiderIgnoreFragmentOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,16 @@
 		// 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.CONSIDER_IGNORE_FRAGMENT__CONSIDER_OR_IGNORE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateConsiderOrIgnore", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(considerIgnoreFragment, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{considerIgnoreFragment}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONSIDER_IGNORE_FRAGMENT__CONSIDER_OR_IGNORE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateConsiderOrIgnore", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(considerIgnoreFragment,
+									context)}),
+					new Object[]{considerIgnoreFragment}));
 			}
 			return false;
 		}
@@ -106,15 +107,16 @@
 		// 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.CONSIDER_IGNORE_FRAGMENT__TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(considerIgnoreFragment, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{considerIgnoreFragment}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONSIDER_IGNORE_FRAGMENT__TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(considerIgnoreFragment,
+									context)}),
+					new Object[]{considerIgnoreFragment}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConstraintOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConstraintOperations.java
index 253e071..c882eda 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConstraintOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ConstraintOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -103,15 +103,15 @@
 		// 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.CONSTRAINT__BOOLEAN_VALUE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateBooleanValue", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(constraint, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{constraint}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONSTRAINT__BOOLEAN_VALUE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateBooleanValue", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(constraint, context)}),
+					new Object[]{constraint}));
 			}
 			return false;
 		}
@@ -137,15 +137,15 @@
 		// 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.CONSTRAINT__NO_SIDE_EFFECTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoSideEffects", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(constraint, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{constraint}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONSTRAINT__NO_SIDE_EFFECTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoSideEffects", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(constraint, context)}),
+					new Object[]{constraint}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ContinuationOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ContinuationOperations.java
index ab3770f..682f107 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ContinuationOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ContinuationOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -93,15 +93,15 @@
 		// 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.CONTINUATION__SAME_NAME,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSameName", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(continuation, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{continuation}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONTINUATION__SAME_NAME,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSameName", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(continuation, context)}),
+					new Object[]{continuation}));
 			}
 			return false;
 		}
@@ -131,15 +131,15 @@
 		// 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.CONTINUATION__GLOBAL,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateGlobal", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(continuation, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{continuation}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONTINUATION__GLOBAL,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateGlobal", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(continuation, context)}),
+					new Object[]{continuation}));
 			}
 			return false;
 		}
@@ -170,15 +170,15 @@
 		// 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.CONTINUATION__FIRST_OR_LAST_INTERACTION_FRAGMENT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateFirstOrLastInteractionFragment", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(continuation, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{continuation}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONTINUATION__FIRST_OR_LAST_INTERACTION_FRAGMENT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateFirstOrLastInteractionFragment", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(continuation, context)}),
+					new Object[]{continuation}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ControlFlowOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ControlFlowOperations.java
index 40686d8..0f610d8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ControlFlowOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ControlFlowOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.CONTROL_FLOW__OBJECT_NODES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateObjectNodes", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(controlFlow, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{controlFlow}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CONTROL_FLOW__OBJECT_NODES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateObjectNodes", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(controlFlow, context)}),
+					new Object[]{controlFlow}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CreateLinkActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CreateLinkActionOperations.java
index d9292ba..0b707cd 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CreateLinkActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CreateLinkActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.CREATE_LINK_ACTION__ASSOCIATION_NOT_ABSTRACT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateAssociationNotAbstract", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(createLinkAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{createLinkAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CREATE_LINK_ACTION__ASSOCIATION_NOT_ABSTRACT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateAssociationNotAbstract", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(createLinkAction, context)}),
+					new Object[]{createLinkAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CreateLinkObjectActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CreateLinkObjectActionOperations.java
index 06bfe6e..311a683 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CreateLinkObjectActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CreateLinkObjectActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -71,15 +71,16 @@
 		// 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.CREATE_LINK_OBJECT_ACTION__ASSOCIATION_CLASS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateAssociationClass", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(createLinkObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{createLinkObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CREATE_LINK_OBJECT_ACTION__ASSOCIATION_CLASS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateAssociationClass", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(createLinkObjectAction,
+									context)}),
+					new Object[]{createLinkObjectAction}));
 			}
 			return false;
 		}
@@ -107,15 +108,16 @@
 		// 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.CREATE_LINK_OBJECT_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(createLinkObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{createLinkObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CREATE_LINK_OBJECT_ACTION__TYPE_OF_RESULT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeOfResult", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(createLinkObjectAction,
+									context)}),
+					new Object[]{createLinkObjectAction}));
 			}
 			return false;
 		}
@@ -143,15 +145,16 @@
 		// 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.CREATE_LINK_OBJECT_ACTION__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(createLinkObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{createLinkObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CREATE_LINK_OBJECT_ACTION__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(createLinkObjectAction,
+									context)}),
+					new Object[]{createLinkObjectAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CreateObjectActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CreateObjectActionOperations.java
index d70d2eb..a7c809a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CreateObjectActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/CreateObjectActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -72,15 +72,15 @@
 		// 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.CREATE_OBJECT_ACTION__CLASSIFIER_NOT_ABSTRACT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateClassifierNotAbstract", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(createObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{createObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CREATE_OBJECT_ACTION__CLASSIFIER_NOT_ABSTRACT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateClassifierNotAbstract", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(createObjectAction, context)}),
+					new Object[]{createObjectAction}));
 			}
 			return false;
 		}
@@ -108,15 +108,15 @@
 		// 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.CREATE_OBJECT_ACTION__CLASSIFIER_NOT_ASSOCIATION_CLASS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateClassifierNotAssociationClass", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(createObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{createObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CREATE_OBJECT_ACTION__CLASSIFIER_NOT_ASSOCIATION_CLASS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateClassifierNotAssociationClass", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(createObjectAction, context)}),
+					new Object[]{createObjectAction}));
 			}
 			return false;
 		}
@@ -144,15 +144,15 @@
 		// 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.CREATE_OBJECT_ACTION__SAME_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSameType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(createObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{createObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CREATE_OBJECT_ACTION__SAME_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSameType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(createObjectAction, context)}),
+					new Object[]{createObjectAction}));
 			}
 			return false;
 		}
@@ -180,15 +180,15 @@
 		// 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.CREATE_OBJECT_ACTION__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(createObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{createObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.CREATE_OBJECT_ACTION__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(createObjectAction, context)}),
+					new Object[]{createObjectAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DataTypeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DataTypeOperations.java
index 58684c4..c646506 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DataTypeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DataTypeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -59,9 +59,9 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static Operation createOwnedOperation(DataType dataType,
-			String name, EList<String> parameterNames,
-			EList<Type> parameterTypes, Type returnType) {
+	public static Operation createOwnedOperation(DataType dataType, String name,
+			EList<String> parameterNames, EList<Type> parameterTypes,
+			Type returnType) {
 		return TypeOperations.createOwnedOperation(dataType, name,
 			parameterNames, parameterTypes, returnType);
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DecisionNodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DecisionNodeOperations.java
index afe6904..c8d29d5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DecisionNodeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DecisionNodeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -76,15 +76,15 @@
 		// 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}));
+				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", //$NON-NLS-1$
+						new Object[]{"validateIncomingOutgoingEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(decisionNode, context)}),
+					new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -114,15 +114,15 @@
 		// 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}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.DECISION_NODE__EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(decisionNode, context)}),
+					new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -150,15 +150,15 @@
 		// 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}));
+				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", //$NON-NLS-1$
+						new Object[]{"validateDecisionInputFlowIncoming", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(decisionNode, context)}),
+					new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -190,15 +190,15 @@
 		// 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__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}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.DECISION_NODE__PARAMETERS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateParameters", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(decisionNode, context)}),
+					new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -218,24 +218,23 @@
 	 * <!-- end-model-doc -->
 	 * @generated
 	 */
-	public static boolean validateZeroInputParameters(
-			DecisionNode decisionNode, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	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}));
+				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", //$NON-NLS-1$
+						new Object[]{"validateZeroInputParameters", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(decisionNode, context)}),
+					new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -264,15 +263,15 @@
 		// 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}));
+				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", //$NON-NLS-1$
+						new Object[]{"validateIncomingObjectOneInputParameter", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(decisionNode, context)}),
+					new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -301,15 +300,15 @@
 		// 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_CONTROL_ONE_INPUT_PARAMETER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateIncomingControlOneInputParameter", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(decisionNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{decisionNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.DECISION_NODE__INCOMING_CONTROL_ONE_INPUT_PARAMETER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateIncomingControlOneInputParameter", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(decisionNode, context)}),
+					new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -337,15 +336,15 @@
 		// 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__TWO_INPUT_PARAMETERS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTwoInputParameters", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(decisionNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{decisionNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.DECISION_NODE__TWO_INPUT_PARAMETERS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTwoInputParameters", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(decisionNode, context)}),
+					new Object[]{decisionNode}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DeploymentSpecificationOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DeploymentSpecificationOperations.java
index 2d16cbc..f4b21c9 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DeploymentSpecificationOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DeploymentSpecificationOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,16 @@
 		// 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.DEPLOYMENT_SPECIFICATION__DEPLOYED_ELEMENTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateDeployedElements", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(deploymentSpecification, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{deploymentSpecification}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.DEPLOYMENT_SPECIFICATION__DEPLOYED_ELEMENTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateDeployedElements", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(deploymentSpecification,
+									context)}),
+					new Object[]{deploymentSpecification}));
 			}
 			return false;
 		}
@@ -106,15 +107,16 @@
 		// 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.DEPLOYMENT_SPECIFICATION__DEPLOYMENT_TARGET,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateDeploymentTarget", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(deploymentSpecification, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{deploymentSpecification}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.DEPLOYMENT_SPECIFICATION__DEPLOYMENT_TARGET,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateDeploymentTarget", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(deploymentSpecification,
+									context)}),
+					new Object[]{deploymentSpecification}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DestroyObjectActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DestroyObjectActionOperations.java
index b5d600a..1a0449f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DestroyObjectActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DestroyObjectActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,15 @@
 		// 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.DESTROY_OBJECT_ACTION__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(destroyObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{destroyObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.DESTROY_OBJECT_ACTION__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(destroyObjectAction, context)}),
+					new Object[]{destroyObjectAction}));
 			}
 			return false;
 		}
@@ -106,15 +106,15 @@
 		// 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.DESTROY_OBJECT_ACTION__NO_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(destroyObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{destroyObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.DESTROY_OBJECT_ACTION__NO_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(destroyObjectAction, context)}),
+					new Object[]{destroyObjectAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DestructionOccurrenceSpecificationOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DestructionOccurrenceSpecificationOperations.java
index 2a66ca7..c473b97 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DestructionOccurrenceSpecificationOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DestructionOccurrenceSpecificationOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015 CEA and others.
+ * Copyright (c) 2011, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 297216, 418466, 451350
+ *   Kenn Hussey (CEA) - 297216, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -71,15 +71,17 @@
 		// 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.DESTRUCTION_OCCURRENCE_SPECIFICATION__NO_OCCURRENCE_SPECIFICATIONS_BELOW,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoOccurrenceSpecificationsBelow", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(destructionOccurrenceSpecification, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{destructionOccurrenceSpecification}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.DESTRUCTION_OCCURRENCE_SPECIFICATION__NO_OCCURRENCE_SPECIFICATIONS_BELOW,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoOccurrenceSpecificationsBelow", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(
+									destructionOccurrenceSpecification,
+									context)}),
+					new Object[]{destructionOccurrenceSpecification}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DurationConstraintOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DurationConstraintOperations.java
index 8fb5c27..3d360af 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DurationConstraintOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DurationConstraintOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -72,15 +72,15 @@
 		// 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.DURATION_CONSTRAINT__FIRST_EVENT_MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateFirstEventMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(durationConstraint, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{durationConstraint}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.DURATION_CONSTRAINT__FIRST_EVENT_MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateFirstEventMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(durationConstraint, context)}),
+					new Object[]{durationConstraint}));
 			}
 			return false;
 		}
@@ -108,15 +108,15 @@
 		// 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.DURATION_CONSTRAINT__HAS_ONE_OR_TWO_CONSTRAINED_ELEMENTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateHasOneOrTwoConstrainedElements", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(durationConstraint, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{durationConstraint}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.DURATION_CONSTRAINT__HAS_ONE_OR_TWO_CONSTRAINED_ELEMENTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateHasOneOrTwoConstrainedElements", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(durationConstraint, context)}),
+					new Object[]{durationConstraint}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DurationObservationOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DurationObservationOperations.java
index 543dc72..3c21dc7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DurationObservationOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DurationObservationOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -71,15 +71,15 @@
 		// 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.DURATION_OBSERVATION__FIRST_EVENT_MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateFirstEventMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(durationObservation, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{durationObservation}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.DURATION_OBSERVATION__FIRST_EVENT_MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateFirstEventMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(durationObservation, context)}),
+					new Object[]{durationObservation}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DurationOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DurationOperations.java
index ec3e545..d398fed 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DurationOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/DurationOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -67,15 +67,15 @@
 		// 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.DURATION__NO_EXPR_REQUIRES_OBSERVATION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoExprRequiresObservation", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(duration, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{duration}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.DURATION__NO_EXPR_REQUIRES_OBSERVATION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoExprRequiresObservation", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(duration, context)}),
+					new Object[]{duration}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ElementImportOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ElementImportOperations.java
index 73380a1..4dda491 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ElementImportOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ElementImportOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -78,16 +78,13 @@
 			result = false;
 
 			if (diagnostics != null) {
-				diagnostics
-					.add(new BasicDiagnostic(
-						Diagnostic.WARNING,
-						UMLValidator.DIAGNOSTIC_SOURCE,
-						UMLValidator.ELEMENT_IMPORT__VISIBILITY_PUBLIC_OR_PRIVATE,
-						UMLPlugin.INSTANCE
-							.getString(
-								"_UI_ElementImport_VisibilityPublicOrPrivate_diagnostic", //$NON-NLS-1$
-								getMessageSubstitutions(context, elementImport)),
-						new Object[]{elementImport}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ELEMENT_IMPORT__VISIBILITY_PUBLIC_OR_PRIVATE,
+					UMLPlugin.INSTANCE.getString(
+						"_UI_ElementImport_VisibilityPublicOrPrivate_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, elementImport)),
+					new Object[]{elementImport}));
 			}
 		}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ElementOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ElementOperations.java
index 750b4e4..1cb8ff1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ElementOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ElementOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -10,6 +10,7 @@
  *   Kenn Hussey (Embarcadero Technologie) - 247980
  *   Kenn Hussey - 323181, 418466
  *   Christian W. Damus (CEA) - 300957
+ *   Kenn Hussey (CEA) - 485756
  */
 package org.eclipse.uml2.uml.internal.operations;
 
@@ -149,9 +150,10 @@
 			if (diagnostics != null) {
 				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
 					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.ELEMENT__NOT_OWN_SELF, UMLPlugin.INSTANCE
-						.getString("_UI_Element_NotOwnSelf_diagnostic", //$NON-NLS-1$
-							getMessageSubstitutions(context, element)),
+					UMLValidator.ELEMENT__NOT_OWN_SELF,
+					UMLPlugin.INSTANCE.getString(
+						"_UI_Element_NotOwnSelf_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, element)),
 					new Object[]{element}));
 			}
 		}
@@ -181,9 +183,10 @@
 			if (diagnostics != null) {
 				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
 					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.ELEMENT__HAS_OWNER, UMLPlugin.INSTANCE
-						.getString("_UI_Element_HasOwner_diagnostic", //$NON-NLS-1$
-							getMessageSubstitutions(context, element)),
+					UMLValidator.ELEMENT__HAS_OWNER,
+					UMLPlugin.INSTANCE.getString(
+						"_UI_Element_HasOwner_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, element)),
 					new Object[]{element}));
 			}
 		}
@@ -203,7 +206,8 @@
 	public static EList<EObject> getStereotypeApplications(Element element) {
 		EList<EObject> stereotypeApplications = new UniqueEList.FastCompare<EObject>();
 
-		for (EStructuralFeature.Setting setting : getNonNavigableInverseReferences(element)) {
+		for (EStructuralFeature.Setting setting : getNonNavigableInverseReferences(
+			element)) {
 
 			if (setting.getEStructuralFeature().getName()
 				.startsWith(Extension.METACLASS_ROLE_PREFIX)) {
@@ -306,7 +310,8 @@
 
 		for (Stereotype requiredStereotype : element.getRequiredStereotypes()) {
 
-			if (safeEquals(requiredStereotype.getQualifiedName(), qualifiedName)) {
+			if (safeEquals(requiredStereotype.getQualifiedName(),
+				qualifiedName)) {
 				return requiredStereotype;
 			}
 		}
@@ -326,7 +331,8 @@
 	public static EList<Stereotype> getAppliedStereotypes(Element element) {
 		EList<Stereotype> appliedStereotypes = new UniqueEList.FastCompare<Stereotype>();
 
-		for (EStructuralFeature.Setting setting : getNonNavigableInverseReferences(element)) {
+		for (EStructuralFeature.Setting setting : getNonNavigableInverseReferences(
+			element)) {
 
 			if (setting.getEStructuralFeature().getName()
 				.startsWith(Extension.METACLASS_ROLE_PREFIX)) {
@@ -357,7 +363,8 @@
 
 		for (Stereotype appliedStereotype : element.getAppliedStereotypes()) {
 
-			if (safeEquals(appliedStereotype.getQualifiedName(), qualifiedName)) {
+			if (safeEquals(appliedStereotype.getQualifiedName(),
+				qualifiedName)) {
 				return appliedStereotype;
 			}
 		}
@@ -445,8 +452,8 @@
 						.getEStructuralFeature(getValidJavaIdentifier(segment));
 				} else {
 					eStructuralFeature = eClass
-						.getEStructuralFeature(getValidJavaIdentifier(segment
-							.substring(0, segment.indexOf('['))));
+						.getEStructuralFeature(getValidJavaIdentifier(
+							segment.substring(0, segment.indexOf('['))));
 
 					try {
 						index = Integer.parseInt(segment.substring(
@@ -549,8 +556,8 @@
 					.getEStructuralFeature(getValidJavaIdentifier(segment));
 			} else {
 				eStructuralFeature = eClass
-					.getEStructuralFeature(getValidJavaIdentifier(segment
-						.substring(0, segment.indexOf('['))));
+					.getEStructuralFeature(getValidJavaIdentifier(
+						segment.substring(0, segment.indexOf('['))));
 
 				try {
 					index = Integer.parseInt(segment.substring(
@@ -562,7 +569,8 @@
 			}
 
 			if (eStructuralFeature == null) {
-				throw new IllegalArgumentException(String.valueOf(propertyName));
+				throw new IllegalArgumentException(
+					String.valueOf(propertyName));
 			}
 
 			EClassifier eType = eStructuralFeature.getEType();
@@ -615,8 +623,8 @@
 
 							if (reference instanceof Enumeration) {
 								value = ((Enumeration) reference)
-									.getOwnedLiteral(((EEnumLiteral) value)
-										.getName());
+									.getOwnedLiteral(
+										((EEnumLiteral) value).getName());
 							}
 						}
 					}
@@ -671,8 +679,8 @@
 					.getEStructuralFeature(getValidJavaIdentifier(segment));
 			} else {
 				eStructuralFeature = eClass
-					.getEStructuralFeature(getValidJavaIdentifier(segment
-						.substring(0, segment.indexOf('['))));
+					.getEStructuralFeature(getValidJavaIdentifier(
+						segment.substring(0, segment.indexOf('['))));
 
 				try {
 					index = Integer.parseInt(segment.substring(
@@ -684,7 +692,8 @@
 			}
 
 			if (eStructuralFeature == null) {
-				throw new IllegalArgumentException(String.valueOf(propertyName));
+				throw new IllegalArgumentException(
+					String.valueOf(propertyName));
 			}
 
 			EClassifier eType = eStructuralFeature.getEType();
@@ -706,7 +715,8 @@
 
 					if (size <= index) {
 
-						if (!((EReference) eStructuralFeature).isContainment()) {
+						if (!((EReference) eStructuralFeature)
+							.isContainment()) {
 							throw new IllegalArgumentException(
 								String.valueOf(propertyName));
 						}
@@ -722,7 +732,8 @@
 
 					if (value == null) {
 
-						if (!((EReference) eStructuralFeature).isContainment()) {
+						if (!((EReference) eStructuralFeature)
+							.isContainment()) {
 							throw new IllegalArgumentException(
 								String.valueOf(propertyName));
 						}
@@ -775,9 +786,12 @@
 									Object item = li.next();
 
 									if (item instanceof EnumerationLiteral) {
-										li.set(eEnum.getEEnumLiteral(
-											((EnumerationLiteral) item)
-												.getName()).getInstance());
+										li.set(
+											eEnum
+												.getEEnumLiteral(
+													((EnumerationLiteral) item)
+														.getName())
+												.getInstance());
 									}
 								}
 							}
@@ -790,9 +804,9 @@
 								if (item instanceof String) {
 
 									try {
-										li.set(eFactoryInstance
-											.createFromString(eDataType,
-												(String) item));
+										li.set(
+											eFactoryInstance.createFromString(
+												eDataType, (String) item));
 									} catch (Exception e) {
 										// ignore
 									}
@@ -808,7 +822,8 @@
 								if (newValue instanceof EnumerationLiteral) {
 									newValue = eEnum.getEEnumLiteral(
 										((EnumerationLiteral) newValue)
-											.getName()).getInstance();
+											.getName())
+										.getInstance();
 								}
 							}
 
@@ -873,7 +888,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static EAnnotation createEAnnotation(Element element, String source) {
+	public static EAnnotation createEAnnotation(Element element,
+			String source) {
 		return createEAnnotation((EModelElement) element, source);
 	}
 
@@ -904,7 +920,8 @@
 			EClass eClass) {
 		EList<Relationship> relationships = new UniqueEList.FastCompare<Relationship>();
 
-		for (EStructuralFeature.Setting setting : getNonNavigableInverseReferences(element)) {
+		for (EStructuralFeature.Setting setting : getNonNavigableInverseReferences(
+			element)) {
 
 			EObject eObject = setting.getEObject();
 
@@ -932,8 +949,8 @@
 							.eGet(eReference);
 						relationships.addAll(values);
 					} else {
-						relationships.add((Relationship) element
-							.eGet(eReference));
+						relationships
+							.add((Relationship) element.eGet(eReference));
 					}
 				} else if (eReferenceType.isSuperTypeOf(eClass)) {
 					Object value = element.eGet(eReference);
@@ -1064,8 +1081,8 @@
 			if (!details.isEmpty()) {
 				EList<String> keywords = new UniqueEList<String>();
 
-				for (Iterator<Map.Entry<String, String>> d = details.iterator(); d
-					.hasNext();) {
+				for (Iterator<Map.Entry<String, String>> d = details
+					.iterator(); d.hasNext();) {
 
 					keywords.add(d.next().getKey());
 				}
@@ -1134,7 +1151,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static org.eclipse.uml2.uml.Package getNearestPackage(Element element) {
+	public static org.eclipse.uml2.uml.Package getNearestPackage(
+			Element element) {
 		return (org.eclipse.uml2.uml.Package) (element instanceof org.eclipse.uml2.uml.Package
 			? element
 			: getOwningElement(element, UMLPackage.Literals.PACKAGE, true));
@@ -1170,7 +1188,8 @@
 					Type type = attribute.getType();
 
 					if (type instanceof org.eclipse.uml2.uml.Class) {
-						EClassifier eClassifier = getEClassifier((org.eclipse.uml2.uml.Class) type);
+						EClassifier eClassifier = getEClassifier(
+							(org.eclipse.uml2.uml.Class) type);
 
 						if (eClassifier != null
 							&& eClassifier.isInstance(element)) {
@@ -1185,7 +1204,8 @@
 		return null;
 	}
 
-	protected static EClass getDefinition(Element element, Stereotype stereotype) {
+	protected static EClass getDefinition(Element element,
+			Stereotype stereotype) {
 		return getDefinition(element, stereotype, false);
 	}
 
@@ -1222,9 +1242,9 @@
 
 			if (profile == null) {
 				if (required) {
-					throw new IllegalArgumentException(String.format(
-						"stereotype \"%s\" is not in a profile", //$NON-NLS-1$
-						stereotype.getQualifiedName()));
+					throw new IllegalArgumentException(
+						String.format("stereotype \"%s\" is not in a profile", //$NON-NLS-1$
+							stereotype.getQualifiedName()));
 				}
 			} else {
 				org.eclipse.uml2.uml.Package package_ = element
@@ -1232,9 +1252,9 @@
 
 				if (package_ == null) {
 					if (required) {
-						throw new IllegalArgumentException(String.format(
-							"element \"%s\" is not in a package", //$NON-NLS-1$
-							getQualifiedText(element)));
+						throw new IllegalArgumentException(
+							String.format("element \"%s\" is not in a package", //$NON-NLS-1$
+								getQualifiedText(element)));
 					}
 				} else {
 					ProfileApplication profileApplication = package_
@@ -1242,9 +1262,9 @@
 
 					if (profileApplication == null) {
 						if (required) {
-							throw new IllegalArgumentException(String.format(
-								"profile \"%s\" is not applied", //$NON-NLS-1$
-								profile.getQualifiedName()));
+							throw new IllegalArgumentException(
+								String.format("profile \"%s\" is not applied", //$NON-NLS-1$
+									profile.getQualifiedName()));
 						}
 					} else {
 						ENamedElement appliedDefinition = profileApplication
@@ -1253,18 +1273,16 @@
 						if (appliedDefinition == null) {
 							if (required) {
 								throw new IllegalArgumentException(
-									String
-										.format(
-											"stereotype \"%s\" has no Ecore definition", //$NON-NLS-1$
-											stereotype.getQualifiedName()));
+									String.format(
+										"stereotype \"%s\" has no Ecore definition", //$NON-NLS-1$
+										stereotype.getQualifiedName()));
 							}
 						} else if (!(appliedDefinition instanceof EClass)) {
 							if (required) {
 								throw new IllegalArgumentException(
-									String
-										.format(
-											"stereotype \"%s\" definition is not an EClass", //$NON-NLS-1$
-											stereotype.getQualifiedName()));
+									String.format(
+										"stereotype \"%s\" definition is not an EClass", //$NON-NLS-1$
+										stereotype.getQualifiedName()));
 							}
 						} else {
 							EClass eClass = (EClass) appliedDefinition;
@@ -1272,10 +1290,9 @@
 							if (eClass.isAbstract()) {
 								if (required) {
 									throw new IllegalArgumentException(
-										String
-											.format(
-												"stereotype \"%s\" Ecore definition is abstract", //$NON-NLS-1$
-												stereotype.getQualifiedName()));
+										String.format(
+											"stereotype \"%s\" Ecore definition is abstract", //$NON-NLS-1$
+											stereotype.getQualifiedName()));
 								}
 							} else {
 								return eClass;
@@ -1356,8 +1373,8 @@
 					for (Map.Entry<Stereotype, EClass> definitionEntry : stereotypeEntry
 						.getValue().entrySet()) {
 
-						if (!element.isStereotypeApplied(definitionEntry
-							.getKey())) {
+						if (!element
+							.isStereotypeApplied(definitionEntry.getKey())) {
 
 							stereotypeApplications.add(applyStereotype(element,
 								definitionEntry.getValue()));
@@ -1379,8 +1396,8 @@
 
 		if (!element.eContents().isEmpty()) {
 
-			for (TreeIterator<EObject> allContents = EcoreUtil.getAllContents(
-				element, resolve); allContents.hasNext();) {
+			for (TreeIterator<EObject> allContents = EcoreUtil
+				.getAllContents(element, resolve); allContents.hasNext();) {
 
 				EObject eObject = allContents.next();
 
@@ -1437,10 +1454,8 @@
 											.get(eClassifier);
 
 										if (stereotypes == null) {
-											definitions
-												.put(
-													eClassifier,
-													stereotypes = new HashMap<Stereotype, EClass>());
+											definitions.put(eClassifier,
+												stereotypes = new HashMap<Stereotype, EClass>());
 										}
 
 										if (!stereotypes
@@ -1475,19 +1490,20 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static EObject applyStereotype(Element element, Stereotype stereotype) {
+	public static EObject applyStereotype(Element element,
+			Stereotype stereotype) {
 		EClass definition = getDefinition(element, stereotype, true);
 
 		if (getExtension(element, stereotype) == null) {
-			throw new IllegalArgumentException(String.format(
-				"stereotype \"%s\" is not applicable to %s", //$NON-NLS-1$
-				stereotype.getQualifiedName(), element.eClass().getName()));
+			throw new IllegalArgumentException(
+				String.format("stereotype \"%s\" is not applicable to %s", //$NON-NLS-1$
+					stereotype.getQualifiedName(), element.eClass().getName()));
 		}
 
 		if (element.getStereotypeApplication(stereotype) != null) {
-			throw new IllegalArgumentException(String.format(
-				"stereotype \"%s\" is already applied", //$NON-NLS-1$
-				stereotype.getQualifiedName()));
+			throw new IllegalArgumentException(
+				String.format("stereotype \"%s\" is already applied", //$NON-NLS-1$
+					stereotype.getQualifiedName()));
 		}
 
 		return applyStereotype(element, definition);
@@ -1501,8 +1517,8 @@
 			for (EObject stereotypeApplication : element
 				.getStereotypeApplications()) {
 
-				if (!element
-					.isStereotypeApplicable(getStereotype(stereotypeApplication))) {
+				if (!element.isStereotypeApplicable(
+					getStereotype(stereotypeApplication))) {
 
 					nonApplicableStereotypes.add(stereotypeApplication);
 
@@ -1527,8 +1543,8 @@
 
 		if (!element.eContents().isEmpty()) {
 
-			for (TreeIterator<EObject> allContents = EcoreUtil.getAllContents(
-				element, resolve); allContents.hasNext();) {
+			for (TreeIterator<EObject> allContents = EcoreUtil
+				.getAllContents(element, resolve); allContents.hasNext();) {
 
 				EObject eObject = allContents.next();
 
@@ -1560,18 +1576,18 @@
 		}
 
 		if (element.isStereotypeRequired(stereotype)) {
-			throw new IllegalArgumentException(String.format(
-				"stereotype \"%s\" is a required extension of %s", //$NON-NLS-1$
-				stereotype.getQualifiedName(), element.eClass().getName()));
+			throw new IllegalArgumentException(
+				String.format("stereotype \"%s\" is a required extension of %s", //$NON-NLS-1$
+					stereotype.getQualifiedName(), element.eClass().getName()));
 		}
 
 		EObject stereotypeApplication = element
 			.getStereotypeApplication(stereotype);
 
 		if (stereotypeApplication == null) {
-			throw new IllegalArgumentException(String.format(
-				"stereotype \"%s\" is not applied", //$NON-NLS-1$
-				stereotype.getQualifiedName()));
+			throw new IllegalArgumentException(
+				String.format("stereotype \"%s\" is not applied", //$NON-NLS-1$
+					stereotype.getQualifiedName()));
 		}
 
 		destroy(stereotypeApplication);
@@ -1685,8 +1701,8 @@
 		if (ancestorEObject.eContents().isEmpty()) {
 
 			if (ancestorEObject instanceof Element) {
-				destroyAll(((Element) ancestorEObject)
-					.getStereotypeApplications());
+				destroyAll(
+					((Element) ancestorEObject).getStereotypeApplications());
 				removeReferences(ancestorEObject, ancestorEObject);
 				ancestorEObject.eAdapters().clear();
 			} else {
@@ -1762,8 +1778,8 @@
 	 * @generated NOT
 	 */
 	public static EList<Element> allOwnedElements(Element element) {
-		return ECollections.unmodifiableEList(allOwnedElements(element,
-			new UniqueEList.FastCompare<Element>()));
+		return ECollections.unmodifiableEList(
+			allOwnedElements(element, new UniqueEList.FastCompare<Element>()));
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/EnumerationOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/EnumerationOperations.java
index 3d039a4..7b2cb9a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/EnumerationOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/EnumerationOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey (CEA) - 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -67,15 +67,15 @@
 		// 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.ENUMERATION__IMMUTABLE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateImmutable", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(enumeration, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{enumeration}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.ENUMERATION__IMMUTABLE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateImmutable", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(enumeration, context)}),
+					new Object[]{enumeration}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExceptionHandlerOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExceptionHandlerOperations.java
index 1a4928c..3c28f94 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExceptionHandlerOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExceptionHandlerOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -74,15 +74,15 @@
 		// 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.EXCEPTION_HANDLER__HANDLER_BODY_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateHandlerBodyEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(exceptionHandler, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{exceptionHandler}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.EXCEPTION_HANDLER__HANDLER_BODY_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateHandlerBodyEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(exceptionHandler, context)}),
+					new Object[]{exceptionHandler}));
 			}
 			return false;
 		}
@@ -119,15 +119,15 @@
 		// 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.EXCEPTION_HANDLER__OUTPUT_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOutputPins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(exceptionHandler, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{exceptionHandler}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.EXCEPTION_HANDLER__OUTPUT_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOutputPins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(exceptionHandler, context)}),
+					new Object[]{exceptionHandler}));
 			}
 			return false;
 		}
@@ -156,15 +156,15 @@
 		// 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.EXCEPTION_HANDLER__ONE_INPUT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOneInput", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(exceptionHandler, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{exceptionHandler}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.EXCEPTION_HANDLER__ONE_INPUT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOneInput", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(exceptionHandler, context)}),
+					new Object[]{exceptionHandler}));
 			}
 			return false;
 		}
@@ -194,15 +194,15 @@
 		// 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.EXCEPTION_HANDLER__EDGE_SOURCE_TARGET,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEdgeSourceTarget", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(exceptionHandler, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{exceptionHandler}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.EXCEPTION_HANDLER__EDGE_SOURCE_TARGET,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEdgeSourceTarget", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(exceptionHandler, context)}),
+					new Object[]{exceptionHandler}));
 			}
 			return false;
 		}
@@ -230,15 +230,15 @@
 		// 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.EXCEPTION_HANDLER__HANDLER_BODY_OWNER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateHandlerBodyOwner", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(exceptionHandler, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{exceptionHandler}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.EXCEPTION_HANDLER__HANDLER_BODY_OWNER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateHandlerBodyOwner", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(exceptionHandler, context)}),
+					new Object[]{exceptionHandler}));
 			}
 			return false;
 		}
@@ -267,15 +267,15 @@
 		// 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.EXCEPTION_HANDLER__EXCEPTION_INPUT_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateExceptionInputType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(exceptionHandler, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{exceptionHandler}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.EXCEPTION_HANDLER__EXCEPTION_INPUT_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateExceptionInputType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(exceptionHandler, context)}),
+					new Object[]{exceptionHandler}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExecutionSpecificationOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExecutionSpecificationOperations.java
index df1e398..8051a38 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExecutionSpecificationOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExecutionSpecificationOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -78,17 +78,14 @@
 					|| !finishCovereds.containsAll(startCovereds)) {
 
 					if (diagnostics != null) {
-						diagnostics
-							.add(new BasicDiagnostic(
-								Diagnostic.WARNING,
-								UMLValidator.DIAGNOSTIC_SOURCE,
-								UMLValidator.EXECUTION_SPECIFICATION__SAME_LIFELINE,
-								UMLPlugin.INSTANCE
-									.getString(
-										"_UI_ExecutionSpecification_SameLifeline_diagnostic", //$NON-NLS-1$
-										getMessageSubstitutions(context,
-											executionSpecification)),
-								new Object[]{executionSpecification}));
+						diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+							UMLValidator.DIAGNOSTIC_SOURCE,
+							UMLValidator.EXECUTION_SPECIFICATION__SAME_LIFELINE,
+							UMLPlugin.INSTANCE.getString(
+								"_UI_ExecutionSpecification_SameLifeline_diagnostic", //$NON-NLS-1$
+								getMessageSubstitutions(context,
+									executionSpecification)),
+							new Object[]{executionSpecification}));
 					}
 
 					return false;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExpansionNodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExpansionNodeOperations.java
index ad61f04..b13e860 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExpansionNodeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExpansionNodeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015 CEA and others.
+ * Copyright (c) 2011, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.EXPANSION_NODE__REGION_AS_INPUT_OR_OUTPUT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateRegionAsInputOrOutput", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(expansionNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{expansionNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.EXPANSION_NODE__REGION_AS_INPUT_OR_OUTPUT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateRegionAsInputOrOutput", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(expansionNode, context)}),
+					new Object[]{expansionNode}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtendOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtendOperations.java
index e7e9bde..1054b46 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtendOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtendOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -68,15 +68,15 @@
 		// 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.EXTEND__EXTENSION_POINTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateExtensionPoints", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(extend, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{extend}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.EXTEND__EXTENSION_POINTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateExtensionPoints", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(extend, context)}),
+					new Object[]{extend}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtensionEndOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtensionEndOperations.java
index 427e859..66acb67 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtensionEndOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtensionEndOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -73,15 +73,15 @@
 		// 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.EXTENSION_END__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(extensionEnd, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{extensionEnd}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.EXTENSION_END__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(extensionEnd, context)}),
+					new Object[]{extensionEnd}));
 			}
 			return false;
 		}
@@ -108,15 +108,15 @@
 		// 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.EXTENSION_END__AGGREGATION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateAggregation", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(extensionEnd, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{extensionEnd}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.EXTENSION_END__AGGREGATION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateAggregation", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(extensionEnd, context)}),
+					new Object[]{extensionEnd}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtensionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtensionOperations.java
index 5e41e55..3fc6f22 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtensionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtensionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -80,15 +80,15 @@
 		// 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.EXTENSION__NON_OWNED_END,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNonOwnedEnd", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(extension, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{extension}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.EXTENSION__NON_OWNED_END,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNonOwnedEnd", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(extension, context)}),
+					new Object[]{extension}));
 			}
 			return false;
 		}
@@ -115,15 +115,15 @@
 		// 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.EXTENSION__IS_BINARY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateIsBinary", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(extension, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{extension}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.EXTENSION__IS_BINARY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateIsBinary", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(extension, context)}),
+					new Object[]{extension}));
 			}
 			return false;
 		}
@@ -208,8 +208,8 @@
 		Property metaclassEnd = extension.metaclassEnd();
 
 		if (metaclassEnd != null) {
-			Object type = metaclassEnd.eGet(
-				UMLPackage.Literals.TYPED_ELEMENT__TYPE, false);
+			Object type = metaclassEnd
+				.eGet(UMLPackage.Literals.TYPED_ELEMENT__TYPE, false);
 
 			if (type instanceof org.eclipse.uml2.uml.Class) {
 				return (org.eclipse.uml2.uml.Class) type;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtensionPointOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtensionPointOperations.java
index 866b9aa..3806db7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtensionPointOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ExtensionPointOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -68,15 +68,15 @@
 		// 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.EXTENSION_POINT__MUST_HAVE_NAME,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMustHaveName", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(extensionPoint, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{extensionPoint}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.EXTENSION_POINT__MUST_HAVE_NAME,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMustHaveName", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(extensionPoint, context)}),
+					new Object[]{extensionPoint}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/FinalNodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/FinalNodeOperations.java
index 63c5010..88b12af 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/FinalNodeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/FinalNodeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -68,15 +68,15 @@
 		// 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.FINAL_NODE__NO_OUTGOING_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoOutgoingEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(finalNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{finalNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.FINAL_NODE__NO_OUTGOING_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoOutgoingEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(finalNode, context)}),
+					new Object[]{finalNode}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/FinalStateOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/FinalStateOperations.java
index a106352..881cf34 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/FinalStateOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/FinalStateOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -73,15 +73,15 @@
 		// 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.FINAL_STATE__NO_OUTGOING_TRANSITIONS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoOutgoingTransitions", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(finalState, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{finalState}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.FINAL_STATE__NO_OUTGOING_TRANSITIONS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoOutgoingTransitions", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(finalState, context)}),
+					new Object[]{finalState}));
 			}
 			return false;
 		}
@@ -108,15 +108,15 @@
 		// 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.FINAL_STATE__NO_REGIONS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoRegions", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(finalState, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{finalState}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.FINAL_STATE__NO_REGIONS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoRegions", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(finalState, context)}),
+					new Object[]{finalState}));
 			}
 			return false;
 		}
@@ -144,15 +144,15 @@
 		// 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.FINAL_STATE__CANNOT_REFERENCE_SUBMACHINE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateCannotReferenceSubmachine", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(finalState, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{finalState}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.FINAL_STATE__CANNOT_REFERENCE_SUBMACHINE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateCannotReferenceSubmachine", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(finalState, context)}),
+					new Object[]{finalState}));
 			}
 			return false;
 		}
@@ -179,15 +179,15 @@
 		// 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.FINAL_STATE__NO_ENTRY_BEHAVIOR,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoEntryBehavior", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(finalState, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{finalState}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.FINAL_STATE__NO_ENTRY_BEHAVIOR,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoEntryBehavior", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(finalState, context)}),
+					new Object[]{finalState}));
 			}
 			return false;
 		}
@@ -214,15 +214,15 @@
 		// 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.FINAL_STATE__NO_EXIT_BEHAVIOR,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoExitBehavior", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(finalState, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{finalState}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.FINAL_STATE__NO_EXIT_BEHAVIOR,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoExitBehavior", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(finalState, context)}),
+					new Object[]{finalState}));
 			}
 			return false;
 		}
@@ -249,15 +249,15 @@
 		// 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.FINAL_STATE__NO_STATE_BEHAVIOR,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoStateBehavior", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(finalState, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{finalState}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.FINAL_STATE__NO_STATE_BEHAVIOR,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoStateBehavior", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(finalState, context)}),
+					new Object[]{finalState}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ForkNodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ForkNodeOperations.java
index 0ee2c30..8e5a428 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ForkNodeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ForkNodeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.FORK_NODE__ONE_INCOMING_EDGE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOneIncomingEdge", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(forkNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{forkNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.FORK_NODE__ONE_INCOMING_EDGE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOneIncomingEdge", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(forkNode, context)}),
+					new Object[]{forkNode}));
 			}
 			return false;
 		}
@@ -105,15 +105,15 @@
 		// 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.FORK_NODE__EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(forkNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{forkNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.FORK_NODE__EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(forkNode, context)}),
+					new Object[]{forkNode}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/FunctionBehaviorOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/FunctionBehaviorOperations.java
index 48d398d..436a962 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/FunctionBehaviorOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/FunctionBehaviorOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -75,15 +75,15 @@
 		// 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.FUNCTION_BEHAVIOR__ONE_OUTPUT_PARAMETER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOneOutputParameter", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(functionBehavior, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{functionBehavior}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.FUNCTION_BEHAVIOR__ONE_OUTPUT_PARAMETER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOneOutputParameter", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(functionBehavior, context)}),
+					new Object[]{functionBehavior}));
 			}
 			return false;
 		}
@@ -112,15 +112,15 @@
 		// 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.FUNCTION_BEHAVIOR__TYPES_OF_PARAMETERS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypesOfParameters", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(functionBehavior, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{functionBehavior}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.FUNCTION_BEHAVIOR__TYPES_OF_PARAMETERS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypesOfParameters", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(functionBehavior, context)}),
+					new Object[]{functionBehavior}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/GateOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/GateOperations.java
index 2a36b90..05ce06a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/GateOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/GateOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -94,15 +94,15 @@
 		// 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.GATE__ACTUAL_GATE_MATCHED,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateActualGateMatched", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(gate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{gate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.GATE__ACTUAL_GATE_MATCHED,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateActualGateMatched", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(gate, context)}),
+					new Object[]{gate}));
 			}
 			return false;
 		}
@@ -129,15 +129,15 @@
 		// 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.GATE__INSIDE_CF_MATCHED,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInsideCfMatched", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(gate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{gate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.GATE__INSIDE_CF_MATCHED,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInsideCfMatched", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(gate, context)}),
+					new Object[]{gate}));
 			}
 			return false;
 		}
@@ -170,15 +170,15 @@
 		// 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.GATE__OUTSIDE_CF_MATCHED,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOutsideCfMatched", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(gate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{gate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.GATE__OUTSIDE_CF_MATCHED,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOutsideCfMatched", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(gate, context)}),
+					new Object[]{gate}));
 			}
 			return false;
 		}
@@ -205,15 +205,15 @@
 		// 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.GATE__FORMAL_GATE_DISTINGUISHABLE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateFormalGateDistinguishable", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(gate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{gate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.GATE__FORMAL_GATE_DISTINGUISHABLE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateFormalGateDistinguishable", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(gate, context)}),
+					new Object[]{gate}));
 			}
 			return false;
 		}
@@ -240,15 +240,15 @@
 		// 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.GATE__ACTUAL_GATE_DISTINGUISHABLE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateActualGateDistinguishable", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(gate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{gate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.GATE__ACTUAL_GATE_DISTINGUISHABLE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateActualGateDistinguishable", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(gate, context)}),
+					new Object[]{gate}));
 			}
 			return false;
 		}
@@ -275,15 +275,15 @@
 		// 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.GATE__OUTSIDE_CF_GATE_DISTINGUISHABLE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOutsideCfGateDistinguishable", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(gate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{gate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.GATE__OUTSIDE_CF_GATE_DISTINGUISHABLE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOutsideCfGateDistinguishable", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(gate, context)}),
+					new Object[]{gate}));
 			}
 			return false;
 		}
@@ -312,15 +312,15 @@
 		// 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.GATE__INSIDE_CF_GATE_DISTINGUISHABLE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInsideCfGateDistinguishable", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(gate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{gate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.GATE__INSIDE_CF_GATE_DISTINGUISHABLE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInsideCfGateDistinguishable", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(gate, context)}),
+					new Object[]{gate}));
 			}
 			return false;
 		}
@@ -484,7 +484,8 @@
 	 * @generated NOT
 	 */
 	public static boolean isActual(Gate gate) {
-		return gate.eContainingFeature() == UMLPackage.Literals.INTERACTION_USE__ACTUAL_GATE;
+		return gate
+			.eContainingFeature() == UMLPackage.Literals.INTERACTION_USE__ACTUAL_GATE;
 	}
 
 	/**
@@ -499,7 +500,8 @@
 	 * @generated NOT
 	 */
 	public static boolean isFormal(Gate gate) {
-		return gate.eContainingFeature() == UMLPackage.Literals.INTERACTION__FORMAL_GATE;
+		return gate
+			.eContainingFeature() == UMLPackage.Literals.INTERACTION__FORMAL_GATE;
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/GeneralOrderingOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/GeneralOrderingOperations.java
index c4c34ea..508bebc 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/GeneralOrderingOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/GeneralOrderingOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015 CEA and others.
+ * Copyright (c) 2011, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.GENERAL_ORDERING__IRREFLEXIVE_TRANSITIVE_CLOSURE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateIrreflexiveTransitiveClosure", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(generalOrdering, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{generalOrdering}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.GENERAL_ORDERING__IRREFLEXIVE_TRANSITIVE_CLOSURE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateIrreflexiveTransitiveClosure", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(generalOrdering, context)}),
+					new Object[]{generalOrdering}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/GeneralizationSetOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/GeneralizationSetOperations.java
index f8ef48e..769f697 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/GeneralizationSetOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/GeneralizationSetOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,15 @@
 		// 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.GENERALIZATION_SET__GENERALIZATION_SAME_CLASSIFIER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateGeneralizationSameClassifier", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(generalizationSet, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{generalizationSet}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.GENERALIZATION_SET__GENERALIZATION_SAME_CLASSIFIER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateGeneralizationSameClassifier", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(generalizationSet, context)}),
+					new Object[]{generalizationSet}));
 			}
 			return false;
 		}
@@ -108,15 +108,15 @@
 		// 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.GENERALIZATION_SET__MAPS_TO_GENERALIZATION_SET,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMapsToGeneralizationSet", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(generalizationSet, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{generalizationSet}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.GENERALIZATION_SET__MAPS_TO_GENERALIZATION_SET,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMapsToGeneralizationSet", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(generalizationSet, context)}),
+					new Object[]{generalizationSet}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InformationFlowOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InformationFlowOperations.java
index ea91064..072da88 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InformationFlowOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InformationFlowOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -84,15 +84,15 @@
 		// 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.INFORMATION_FLOW__SOURCES_AND_TARGETS_KIND,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSourcesAndTargetsKind", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(informationFlow, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{informationFlow}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INFORMATION_FLOW__SOURCES_AND_TARGETS_KIND,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSourcesAndTargetsKind", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(informationFlow, context)}),
+					new Object[]{informationFlow}));
 			}
 			return false;
 		}
@@ -118,15 +118,15 @@
 		// 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.INFORMATION_FLOW__MUST_CONFORM,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMustConform", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(informationFlow, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{informationFlow}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INFORMATION_FLOW__MUST_CONFORM,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMustConform", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(informationFlow, context)}),
+					new Object[]{informationFlow}));
 			}
 			return false;
 		}
@@ -155,15 +155,15 @@
 		// 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.INFORMATION_FLOW__CONVEY_CLASSIFIERS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateConveyClassifiers", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(informationFlow, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{informationFlow}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INFORMATION_FLOW__CONVEY_CLASSIFIERS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateConveyClassifiers", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(informationFlow, context)}),
+					new Object[]{informationFlow}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InformationItemOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InformationItemOperations.java
index de9854b..b92578a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InformationItemOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InformationItemOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -75,15 +75,15 @@
 		// 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.INFORMATION_ITEM__SOURCES_AND_TARGETS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSourcesAndTargets", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(informationItem, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{informationItem}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INFORMATION_ITEM__SOURCES_AND_TARGETS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSourcesAndTargets", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(informationItem, context)}),
+					new Object[]{informationItem}));
 			}
 			return false;
 		}
@@ -110,15 +110,15 @@
 		// 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.INFORMATION_ITEM__HAS_NO,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateHasNo", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(informationItem, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{informationItem}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INFORMATION_ITEM__HAS_NO,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateHasNo", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(informationItem, context)}),
+					new Object[]{informationItem}));
 			}
 			return false;
 		}
@@ -146,15 +146,15 @@
 		// 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.INFORMATION_ITEM__NOT_INSTANTIABLE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNotInstantiable", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(informationItem, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{informationItem}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INFORMATION_ITEM__NOT_INSTANTIABLE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNotInstantiable", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(informationItem, context)}),
+					new Object[]{informationItem}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InitialNodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InitialNodeOperations.java
index 4d87ffc..10b5037 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InitialNodeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InitialNodeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.INITIAL_NODE__NO_INCOMING_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoIncomingEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(initialNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{initialNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INITIAL_NODE__NO_INCOMING_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoIncomingEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(initialNode, context)}),
+					new Object[]{initialNode}));
 			}
 			return false;
 		}
@@ -104,15 +104,15 @@
 		// 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.INITIAL_NODE__CONTROL_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateControlEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(initialNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{initialNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INITIAL_NODE__CONTROL_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateControlEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(initialNode, context)}),
+					new Object[]{initialNode}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InputPinOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InputPinOperations.java
index ac80fc8..914f164 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InputPinOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InputPinOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -63,24 +63,23 @@
 	 * <!-- end-model-doc -->
 	 * @generated
 	 */
-	public static boolean validateOutgoingEdgesStructuredOnly(
-			InputPin inputPin, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public static boolean validateOutgoingEdgesStructuredOnly(InputPin inputPin,
+			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.INPUT_PIN__OUTGOING_EDGES_STRUCTURED_ONLY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOutgoingEdgesStructuredOnly", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(inputPin, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{inputPin}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INPUT_PIN__OUTGOING_EDGES_STRUCTURED_ONLY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOutgoingEdgesStructuredOnly", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(inputPin, context)}),
+					new Object[]{inputPin}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InstanceSpecificationOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InstanceSpecificationOperations.java
index 052c21d..bab6d83 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InstanceSpecificationOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InstanceSpecificationOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -72,15 +72,16 @@
 		// 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.INSTANCE_SPECIFICATION__DEFINING_FEATURE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateDefiningFeature", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(instanceSpecification, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{instanceSpecification}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INSTANCE_SPECIFICATION__DEFINING_FEATURE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateDefiningFeature", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(instanceSpecification,
+									context)}),
+					new Object[]{instanceSpecification}));
 			}
 			return false;
 		}
@@ -108,15 +109,16 @@
 		// 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.INSTANCE_SPECIFICATION__STRUCTURAL_FEATURE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateStructuralFeature", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(instanceSpecification, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{instanceSpecification}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INSTANCE_SPECIFICATION__STRUCTURAL_FEATURE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateStructuralFeature", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(instanceSpecification,
+									context)}),
+					new Object[]{instanceSpecification}));
 			}
 			return false;
 		}
@@ -144,15 +146,16 @@
 		// 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.INSTANCE_SPECIFICATION__DEPLOYMENT_TARGET,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateDeploymentTarget", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(instanceSpecification, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{instanceSpecification}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INSTANCE_SPECIFICATION__DEPLOYMENT_TARGET,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateDeploymentTarget", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(instanceSpecification,
+									context)}),
+					new Object[]{instanceSpecification}));
 			}
 			return false;
 		}
@@ -180,15 +183,16 @@
 		// 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.INSTANCE_SPECIFICATION__DEPLOYMENT_ARTIFACT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateDeploymentArtifact", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(instanceSpecification, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{instanceSpecification}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INSTANCE_SPECIFICATION__DEPLOYMENT_ARTIFACT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateDeploymentArtifact", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(instanceSpecification,
+									context)}),
+					new Object[]{instanceSpecification}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionConstraintOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionConstraintOperations.java
index 035aba9..39fcc74 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionConstraintOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionConstraintOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -73,15 +73,16 @@
 		// 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.INTERACTION_CONSTRAINT__DYNAMIC_VARIABLES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateDynamicVariables", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionConstraint, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionConstraint}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_CONSTRAINT__DYNAMIC_VARIABLES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateDynamicVariables", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionConstraint,
+									context)}),
+					new Object[]{interactionConstraint}));
 			}
 			return false;
 		}
@@ -108,15 +109,16 @@
 		// 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.INTERACTION_CONSTRAINT__GLOBAL_DATA,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateGlobalData", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionConstraint, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionConstraint}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_CONSTRAINT__GLOBAL_DATA,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateGlobalData", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionConstraint,
+									context)}),
+					new Object[]{interactionConstraint}));
 			}
 			return false;
 		}
@@ -146,15 +148,16 @@
 		// 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.INTERACTION_CONSTRAINT__MININT_MAXINT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMinintMaxint", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionConstraint, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionConstraint}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_CONSTRAINT__MININT_MAXINT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMinintMaxint", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionConstraint,
+									context)}),
+					new Object[]{interactionConstraint}));
 			}
 			return false;
 		}
@@ -183,15 +186,16 @@
 		// 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.INTERACTION_CONSTRAINT__MININT_NON_NEGATIVE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMinintNonNegative", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionConstraint, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionConstraint}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_CONSTRAINT__MININT_NON_NEGATIVE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMinintNonNegative", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionConstraint,
+									context)}),
+					new Object[]{interactionConstraint}));
 			}
 			return false;
 		}
@@ -220,15 +224,16 @@
 		// 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.INTERACTION_CONSTRAINT__MAXINT_POSITIVE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMaxintPositive", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionConstraint, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionConstraint}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_CONSTRAINT__MAXINT_POSITIVE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMaxintPositive", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionConstraint,
+									context)}),
+					new Object[]{interactionConstraint}));
 			}
 			return false;
 		}
@@ -258,15 +263,16 @@
 		// 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.INTERACTION_CONSTRAINT__MAXINT_GREATER_EQUAL_MININT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMaxintGreaterEqualMinint", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionConstraint, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionConstraint}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_CONSTRAINT__MAXINT_GREATER_EQUAL_MININT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMaxintGreaterEqualMinint", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionConstraint,
+									context)}),
+					new Object[]{interactionConstraint}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionOperandOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionOperandOperations.java
index 6b9c1f3..26cf914 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionOperandOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionOperandOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.INTERACTION_OPERAND__GUARD_DIRECTLY_PRIOR,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateGuardDirectlyPrior", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionOperand, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionOperand}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_OPERAND__GUARD_DIRECTLY_PRIOR,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateGuardDirectlyPrior", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionOperand, context)}),
+					new Object[]{interactionOperand}));
 			}
 			return false;
 		}
@@ -104,15 +104,15 @@
 		// 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.INTERACTION_OPERAND__GUARD_CONTAIN_REFERENCES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateGuardContainReferences", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionOperand, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionOperand}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_OPERAND__GUARD_CONTAIN_REFERENCES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateGuardContainReferences", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionOperand, context)}),
+					new Object[]{interactionOperand}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionOperations.java
index 657bc4b..d74dfbe 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey (CEA) - 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -68,15 +68,15 @@
 		// 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.INTERACTION__NOT_CONTAINED,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNotContained", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interaction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interaction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION__NOT_CONTAINED,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNotContained", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interaction, context)}),
+					new Object[]{interaction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionUseOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionUseOperations.java
index 441e883..2b97974 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionUseOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InteractionUseOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -75,15 +75,15 @@
 		// 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.INTERACTION_USE__GATES_MATCH,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateGatesMatch", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionUse, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionUse}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_USE__GATES_MATCH,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateGatesMatch", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionUse, context)}),
+					new Object[]{interactionUse}));
 			}
 			return false;
 		}
@@ -124,15 +124,15 @@
 		// 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.INTERACTION_USE__ALL_LIFELINES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateAllLifelines", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionUse, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionUse}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_USE__ALL_LIFELINES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateAllLifelines", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionUse, context)}),
+					new Object[]{interactionUse}));
 			}
 			return false;
 		}
@@ -159,15 +159,15 @@
 		// 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.INTERACTION_USE__ARGUMENTS_CORRESPOND_TO_PARAMETERS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateArgumentsCorrespondToParameters", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionUse, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionUse}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_USE__ARGUMENTS_CORRESPOND_TO_PARAMETERS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateArgumentsCorrespondToParameters", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionUse, context)}),
+					new Object[]{interactionUse}));
 			}
 			return false;
 		}
@@ -195,15 +195,16 @@
 		// 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.INTERACTION_USE__RETURN_VALUE_TYPE_RECIPIENT_CORRESPONDENCE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateReturnValueTypeRecipientCorrespondence", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionUse, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionUse}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_USE__RETURN_VALUE_TYPE_RECIPIENT_CORRESPONDENCE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{
+							"validateReturnValueTypeRecipientCorrespondence", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionUse, context)}),
+					new Object[]{interactionUse}));
 			}
 			return false;
 		}
@@ -230,15 +231,15 @@
 		// 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.INTERACTION_USE__ARGUMENTS_ARE_CONSTANTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateArgumentsAreConstants", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionUse, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionUse}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_USE__ARGUMENTS_ARE_CONSTANTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateArgumentsAreConstants", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionUse, context)}),
+					new Object[]{interactionUse}));
 			}
 			return false;
 		}
@@ -270,15 +271,15 @@
 		// 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.INTERACTION_USE__RETURN_VALUE_RECIPIENT_COVERAGE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateReturnValueRecipientCoverage", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interactionUse, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interactionUse}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERACTION_USE__RETURN_VALUE_RECIPIENT_COVERAGE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateReturnValueRecipientCoverage", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interactionUse, context)}),
+					new Object[]{interactionUse}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InterfaceOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InterfaceOperations.java
index 216ca49..381ec63 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InterfaceOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InterfaceOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -79,9 +79,10 @@
 				if (diagnostics != null) {
 					diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
 						UMLValidator.DIAGNOSTIC_SOURCE,
-						UMLValidator.INTERFACE__VISIBILITY, UMLPlugin.INSTANCE
-							.getString("_UI_Interface_Visibility_diagnostic", //$NON-NLS-1$
-								getMessageSubstitutions(context, interface_)),
+						UMLValidator.INTERFACE__VISIBILITY,
+						UMLPlugin.INSTANCE.getString(
+							"_UI_Interface_Visibility_diagnostic", //$NON-NLS-1$
+							getMessageSubstitutions(context, interface_)),
 						new Object[]{interface_}));
 				}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InterruptibleActivityRegionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InterruptibleActivityRegionOperations.java
index 134c06a..eeac277 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InterruptibleActivityRegionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/InterruptibleActivityRegionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,16 @@
 		// 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.INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInterruptingEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(interruptibleActivityRegion, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{interruptibleActivityRegion}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInterruptingEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(interruptibleActivityRegion,
+									context)}),
+					new Object[]{interruptibleActivityRegion}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/JoinNodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/JoinNodeOperations.java
index 306e64c..e5e72cf 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/JoinNodeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/JoinNodeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.JOIN_NODE__ONE_OUTGOING_EDGE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOneOutgoingEdge", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(joinNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{joinNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.JOIN_NODE__ONE_OUTGOING_EDGE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOneOutgoingEdge", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(joinNode, context)}),
+					new Object[]{joinNode}));
 			}
 			return false;
 		}
@@ -106,15 +106,15 @@
 		// 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.JOIN_NODE__INCOMING_OBJECT_FLOW,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateIncomingObjectFlow", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(joinNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{joinNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.JOIN_NODE__INCOMING_OBJECT_FLOW,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateIncomingObjectFlow", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(joinNode, context)}),
+					new Object[]{joinNode}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LifelineOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LifelineOperations.java
index c6e48e3..785b0a5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LifelineOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LifelineOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 433194, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 433194, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -109,15 +109,15 @@
 		// 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.LIFELINE__INTERACTION_USES_SHARE_LIFELINE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInteractionUsesShareLifeline", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(lifeline, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{lifeline}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LIFELINE__INTERACTION_USES_SHARE_LIFELINE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInteractionUsesShareLifeline", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(lifeline, context)}),
+					new Object[]{lifeline}));
 			}
 			return false;
 		}
@@ -144,15 +144,15 @@
 		// 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.LIFELINE__SELECTOR_SPECIFIED,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSelectorSpecified", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(lifeline, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{lifeline}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LIFELINE__SELECTOR_SPECIFIED,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSelectorSpecified", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(lifeline, context)}),
+					new Object[]{lifeline}));
 			}
 			return false;
 		}
@@ -179,15 +179,15 @@
 		// 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.LIFELINE__SAME_CLASSIFIER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSameClassifier", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(lifeline, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{lifeline}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LIFELINE__SAME_CLASSIFIER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSameClassifier", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(lifeline, context)}),
+					new Object[]{lifeline}));
 			}
 			return false;
 		}
@@ -216,15 +216,15 @@
 		// 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.LIFELINE__SELECTOR_INT_OR_STRING,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSelectorIntOrString", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(lifeline, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{lifeline}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LIFELINE__SELECTOR_INT_OR_STRING,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSelectorIntOrString", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(lifeline, context)}),
+					new Object[]{lifeline}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkActionOperations.java
index 56645ac..ccc07fa 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -75,15 +75,15 @@
 		// 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.LINK_ACTION__SAME_ASSOCIATION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSameAssociation", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(linkAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{linkAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LINK_ACTION__SAME_ASSOCIATION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSameAssociation", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(linkAction, context)}),
+					new Object[]{linkAction}));
 			}
 			return false;
 		}
@@ -110,15 +110,15 @@
 		// 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.LINK_ACTION__NOT_STATIC,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNotStatic", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(linkAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{linkAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LINK_ACTION__NOT_STATIC,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNotStatic", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(linkAction, context)}),
+					new Object[]{linkAction}));
 			}
 			return false;
 		}
@@ -145,15 +145,15 @@
 		// 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.LINK_ACTION__SAME_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSamePins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(linkAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{linkAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LINK_ACTION__SAME_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSamePins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(linkAction, context)}),
+					new Object[]{linkAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkEndCreationDataOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkEndCreationDataOperations.java
index 7139bc7..11b3bc9 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkEndCreationDataOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkEndCreationDataOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -79,15 +79,15 @@
 		// 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.LINK_END_CREATION_DATA__INSERT_AT_PIN,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInsertAtPin", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(linkEndCreationData, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{linkEndCreationData}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LINK_END_CREATION_DATA__INSERT_AT_PIN,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInsertAtPin", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(linkEndCreationData, context)}),
+					new Object[]{linkEndCreationData}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkEndDataOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkEndDataOperations.java
index 58fab0a..09dc07f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkEndDataOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkEndDataOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -79,15 +79,15 @@
 		// 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.LINK_END_DATA__PROPERTY_IS_ASSOCIATION_END,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validatePropertyIsAssociationEnd", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(linkEndData, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{linkEndData}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LINK_END_DATA__PROPERTY_IS_ASSOCIATION_END,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validatePropertyIsAssociationEnd", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(linkEndData, context)}),
+					new Object[]{linkEndData}));
 			}
 			return false;
 		}
@@ -114,15 +114,15 @@
 		// 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.LINK_END_DATA__SAME_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSameType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(linkEndData, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{linkEndData}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LINK_END_DATA__SAME_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSameType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(linkEndData, context)}),
+					new Object[]{linkEndData}));
 			}
 			return false;
 		}
@@ -149,15 +149,15 @@
 		// 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.LINK_END_DATA__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(linkEndData, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{linkEndData}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LINK_END_DATA__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(linkEndData, context)}),
+					new Object[]{linkEndData}));
 			}
 			return false;
 		}
@@ -184,15 +184,15 @@
 		// 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.LINK_END_DATA__QUALIFIERS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateQualifiers", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(linkEndData, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{linkEndData}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LINK_END_DATA__QUALIFIERS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateQualifiers", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(linkEndData, context)}),
+					new Object[]{linkEndData}));
 			}
 			return false;
 		}
@@ -250,15 +250,15 @@
 		// 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.LINK_END_DATA__END_OBJECT_INPUT_PIN,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEndObjectInputPin", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(linkEndData, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{linkEndData}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LINK_END_DATA__END_OBJECT_INPUT_PIN,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEndObjectInputPin", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(linkEndData, context)}),
+					new Object[]{linkEndData}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkEndDestructionDataOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkEndDestructionDataOperations.java
index fad278d..f36d437 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkEndDestructionDataOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LinkEndDestructionDataOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -79,15 +79,16 @@
 		// 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.LINK_END_DESTRUCTION_DATA__DESTROY_AT_PIN,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateDestroyAtPin", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(linkEndDestructionData, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{linkEndDestructionData}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LINK_END_DESTRUCTION_DATA__DESTROY_AT_PIN,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateDestroyAtPin", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(linkEndDestructionData,
+									context)}),
+					new Object[]{linkEndDestructionData}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LoopNodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LoopNodeOperations.java
index 972598f..01b823d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LoopNodeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/LoopNodeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -83,15 +83,15 @@
 		// 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.LOOP_NODE__INPUT_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInputEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(loopNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{loopNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LOOP_NODE__INPUT_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInputEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(loopNode, context)}),
+					new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -118,15 +118,15 @@
 		// 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.LOOP_NODE__EXECUTABLE_NODES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateExecutableNodes", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(loopNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{loopNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LOOP_NODE__EXECUTABLE_NODES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateExecutableNodes", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(loopNode, context)}),
+					new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -153,15 +153,15 @@
 		// 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.LOOP_NODE__BODY_OUTPUT_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateBodyOutputPins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(loopNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{loopNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LOOP_NODE__BODY_OUTPUT_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateBodyOutputPins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(loopNode, context)}),
+					new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -190,15 +190,15 @@
 		// 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.LOOP_NODE__SETUP_TEST_AND_BODY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSetupTestAndBody", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(loopNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{loopNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LOOP_NODE__SETUP_TEST_AND_BODY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSetupTestAndBody", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(loopNode, context)}),
+					new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -230,15 +230,15 @@
 		// 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.LOOP_NODE__MATCHING_OUTPUT_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMatchingOutputPins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(loopNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{loopNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LOOP_NODE__MATCHING_OUTPUT_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMatchingOutputPins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(loopNode, context)}),
+					new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -269,15 +269,15 @@
 		// 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.LOOP_NODE__MATCHING_LOOP_VARIABLES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMatchingLoopVariables", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(loopNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{loopNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LOOP_NODE__MATCHING_LOOP_VARIABLES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMatchingLoopVariables", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(loopNode, context)}),
+					new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -308,15 +308,15 @@
 		// 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.LOOP_NODE__MATCHING_RESULT_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMatchingResultPins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(loopNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{loopNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LOOP_NODE__MATCHING_RESULT_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMatchingResultPins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(loopNode, context)}),
+					new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -343,15 +343,15 @@
 		// 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.LOOP_NODE__LOOP_VARIABLE_OUTGOING,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateLoopVariableOutgoing", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(loopNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{loopNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LOOP_NODE__LOOP_VARIABLE_OUTGOING,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateLoopVariableOutgoing", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(loopNode, context)}),
+					new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -417,15 +417,15 @@
 		// 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.LOOP_NODE__RESULT_NO_INCOMING,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateResultNoIncoming", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(loopNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{loopNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.LOOP_NODE__RESULT_NO_INCOMING,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateResultNoIncoming", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(loopNode, context)}),
+					new Object[]{loopNode}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MergeNodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MergeNodeOperations.java
index c3056ed..0438413 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MergeNodeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MergeNodeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.MERGE_NODE__ONE_OUTGOING_EDGE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOneOutgoingEdge", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(mergeNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{mergeNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MERGE_NODE__ONE_OUTGOING_EDGE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOneOutgoingEdge", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(mergeNode, context)}),
+					new Object[]{mergeNode}));
 			}
 			return false;
 		}
@@ -105,15 +105,15 @@
 		// 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.MERGE_NODE__EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(mergeNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{mergeNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MERGE_NODE__EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(mergeNode, context)}),
+					new Object[]{mergeNode}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MessageEndOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MessageEndOperations.java
index 32683ac..f7e45e4 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MessageEndOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MessageEndOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey (CEA) - 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -76,9 +76,11 @@
 
 		if (message != null) {
 
-			for (EStructuralFeature.Setting nonNavigableInverseReference : getNonNavigableInverseReferences(message)) {
+			for (EStructuralFeature.Setting nonNavigableInverseReference : getNonNavigableInverseReferences(
+				message)) {
 
-				if (nonNavigableInverseReference.getEStructuralFeature() == UMLPackage.Literals.MESSAGE_END__MESSAGE) {
+				if (nonNavigableInverseReference
+					.getEStructuralFeature() == UMLPackage.Literals.MESSAGE_END__MESSAGE) {
 					MessageEnd eObject = (MessageEnd) nonNavigableInverseReference
 						.getEObject();
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MessageOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MessageOperations.java
index 21380a0..8e09d65 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MessageOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MessageOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -95,15 +95,15 @@
 		// 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.MESSAGE__SENDING_RECEIVING_MESSAGE_EVENT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSendingReceivingMessageEvent", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(message, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{message}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MESSAGE__SENDING_RECEIVING_MESSAGE_EVENT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSendingReceivingMessageEvent", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(message, context)}),
+					new Object[]{message}));
 			}
 			return false;
 		}
@@ -134,15 +134,15 @@
 		// 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.MESSAGE__SIGNATURE_REFER_TO,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSignatureReferTo", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(message, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{message}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MESSAGE__SIGNATURE_REFER_TO,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSignatureReferTo", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(message, context)}),
+					new Object[]{message}));
 			}
 			return false;
 		}
@@ -177,15 +177,15 @@
 		// 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.MESSAGE__SIGNATURE_IS_OPERATION_REQUEST,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSignatureIsOperationRequest", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(message, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{message}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MESSAGE__SIGNATURE_IS_OPERATION_REQUEST,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSignatureIsOperationRequest", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(message, context)}),
+					new Object[]{message}));
 			}
 			return false;
 		}
@@ -220,15 +220,15 @@
 		// 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.MESSAGE__SIGNATURE_IS_OPERATION_REPLY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSignatureIsOperationReply", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(message, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{message}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MESSAGE__SIGNATURE_IS_OPERATION_REPLY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSignatureIsOperationReply", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(message, context)}),
+					new Object[]{message}));
 			}
 			return false;
 		}
@@ -283,12 +283,12 @@
 						for (ValueSpecification o : arguments) {
 
 							if (!(o instanceof Expression
-								&& isEmpty(((Expression) o).getSymbol()) && ((Expression) o)
-								.getOperands().isEmpty())) {
+								&& isEmpty(((Expression) o).getSymbol())
+								&& ((Expression) o).getOperands().isEmpty())) {
 
 								Type oType = o.getType();
-								Type pType = signalAttributes.get(
-									arguments.indexOf(o)).getType();
+								Type pType = signalAttributes
+									.get(arguments.indexOf(o)).getType();
 
 								if (oType == null
 									? pType != null
@@ -307,9 +307,10 @@
 		if (!result && diagnostics != null) {
 			diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
 				UMLValidator.DIAGNOSTIC_SOURCE,
-				UMLValidator.MESSAGE__SIGNATURE_IS_SIGNAL, UMLPlugin.INSTANCE
-					.getString("_UI_Message_SignatureIsSignal_diagnostic", //$NON-NLS-1$
-						getMessageSubstitutions(context, message)),
+				UMLValidator.MESSAGE__SIGNATURE_IS_SIGNAL,
+				UMLPlugin.INSTANCE.getString(
+					"_UI_Message_SignatureIsSignal_diagnostic", //$NON-NLS-1$
+					getMessageSubstitutions(context, message)),
 				new Object[]{message}));
 		}
 
@@ -335,15 +336,15 @@
 		// 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.MESSAGE__ARGUMENTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateArguments", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(message, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{message}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MESSAGE__ARGUMENTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateArguments", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(message, context)}),
+					new Object[]{message}));
 			}
 			return false;
 		}
@@ -376,15 +377,15 @@
 		// 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.MESSAGE__CANNOT_CROSS_BOUNDARIES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateCannotCrossBoundaries", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(message, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{message}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MESSAGE__CANNOT_CROSS_BOUNDARIES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateCannotCrossBoundaries", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(message, context)}),
+					new Object[]{message}));
 			}
 			return false;
 		}
@@ -410,15 +411,15 @@
 		// 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.MESSAGE__OCCURRENCE_SPECIFICATIONS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOccurrenceSpecifications", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(message, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{message}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MESSAGE__OCCURRENCE_SPECIFICATIONS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOccurrenceSpecifications", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(message, context)}),
+					new Object[]{message}));
 			}
 			return false;
 		}
@@ -437,13 +438,16 @@
 	 * @generated NOT
 	 */
 	public static MessageKind getMessageKind(Message message) {
-		return message.eGet(UMLPackage.Literals.MESSAGE__SEND_EVENT, false) == null
-			? (message.eGet(UMLPackage.Literals.MESSAGE__RECEIVE_EVENT, false) == null
-				? MessageKind.UNKNOWN_LITERAL
-				: MessageKind.FOUND_LITERAL)
-			: (message.eGet(UMLPackage.Literals.MESSAGE__RECEIVE_EVENT, false) == null
-				? MessageKind.LOST_LITERAL
-				: MessageKind.COMPLETE_LITERAL);
+		return message.eGet(UMLPackage.Literals.MESSAGE__SEND_EVENT,
+			false) == null
+				? (message.eGet(UMLPackage.Literals.MESSAGE__RECEIVE_EVENT,
+					false) == null
+						? MessageKind.UNKNOWN_LITERAL
+						: MessageKind.FOUND_LITERAL)
+				: (message.eGet(UMLPackage.Literals.MESSAGE__RECEIVE_EVENT,
+					false) == null
+						? MessageKind.LOST_LITERAL
+						: MessageKind.COMPLETE_LITERAL);
 	}
 
 	/**
@@ -457,8 +461,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static boolean isDistinguishableFrom(Message message,
-			NamedElement n, Namespace ns) {
+	public static boolean isDistinguishableFrom(Message message, NamedElement n,
+			Namespace ns) {
 		return true;
 	}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MultiplicityElementOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MultiplicityElementOperations.java
index b65f230..5a0030e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MultiplicityElementOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/MultiplicityElementOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 480914
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 480914, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -98,8 +98,9 @@
 						UMLPlugin.INSTANCE.getString(
 							"_UI_MultiplicityElement_LowerGE0_diagnostic", //$NON-NLS-1$
 							getMessageSubstitutions(context,
-								multiplicityElement)), new Object[]{
-							multiplicityElement, new Integer(lowerBound)}));
+								multiplicityElement)),
+					new Object[]{multiplicityElement,
+						new Integer(lowerBound)}));
 			}
 		}
 
@@ -188,15 +189,15 @@
 		// 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.MULTIPLICITY_ELEMENT__VALUE_SPECIFICATION_NO_SIDE_EFFECTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateValueSpecificationNoSideEffects", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(multiplicityElement, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{multiplicityElement}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MULTIPLICITY_ELEMENT__VALUE_SPECIFICATION_NO_SIDE_EFFECTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateValueSpecificationNoSideEffects", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(multiplicityElement, context)}),
+					new Object[]{multiplicityElement}));
 			}
 			return false;
 		}
@@ -223,15 +224,15 @@
 		// 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.MULTIPLICITY_ELEMENT__VALUE_SPECIFICATION_CONSTANT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateValueSpecificationConstant", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(multiplicityElement, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{multiplicityElement}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MULTIPLICITY_ELEMENT__VALUE_SPECIFICATION_CONSTANT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateValueSpecificationConstant", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(multiplicityElement, context)}),
+					new Object[]{multiplicityElement}));
 			}
 			return false;
 		}
@@ -259,15 +260,15 @@
 		// 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.MULTIPLICITY_ELEMENT__LOWER_IS_INTEGER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateLowerIsInteger", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(multiplicityElement, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{multiplicityElement}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MULTIPLICITY_ELEMENT__LOWER_IS_INTEGER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateLowerIsInteger", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(multiplicityElement, context)}),
+					new Object[]{multiplicityElement}));
 			}
 			return false;
 		}
@@ -295,15 +296,15 @@
 		// 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.MULTIPLICITY_ELEMENT__UPPER_IS_UNLIMITED_NATURAL,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateUpperIsUnlimitedNatural", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(multiplicityElement, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{multiplicityElement}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MULTIPLICITY_ELEMENT__UPPER_IS_UNLIMITED_NATURAL,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateUpperIsUnlimitedNatural", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(multiplicityElement, context)}),
+					new Object[]{multiplicityElement}));
 			}
 			return false;
 		}
@@ -352,7 +353,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static boolean isMultivalued(MultiplicityElement multiplicityElement) {
+	public static boolean isMultivalued(
+			MultiplicityElement multiplicityElement) {
 		int upperBound = multiplicityElement.upperBound();
 		return upperBound == LiteralUnlimitedNatural.UNLIMITED
 			|| upperBound > 1;
@@ -453,7 +455,8 @@
 	 * @generated NOT
 	 */
 	public static boolean compatibleWith(
-			MultiplicityElement multiplicityElement, MultiplicityElement other) {
+			MultiplicityElement multiplicityElement,
+			MultiplicityElement other) {
 		return other != null && other.includesMultiplicity(multiplicityElement);
 	}
 
@@ -502,7 +505,7 @@
 			? upperValue
 			: multiplicityElement.createUpperValue(null, null,
 				UMLPackage.Literals.LITERAL_UNLIMITED_NATURAL)))
-			.setValue(newUpper);
+					.setValue(newUpper);
 	}
 
 } // MultiplicityElementOperations
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NamedElementOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NamedElementOperations.java
index 4c1cd5d..045f43b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NamedElementOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NamedElementOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 374878, 418466, 433211, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 374878, 418466, 433211, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -98,15 +98,15 @@
 		// 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.NAMED_ELEMENT__HAS_NO_QUALIFIED_NAME,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateHasNoQualifiedName", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(namedElement, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{namedElement}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.NAMED_ELEMENT__HAS_NO_QUALIFIED_NAME,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateHasNoQualifiedName", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(namedElement, context)}),
+					new Object[]{namedElement}));
 			}
 			return false;
 		}
@@ -134,15 +134,15 @@
 		// 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.NAMED_ELEMENT__HAS_QUALIFIED_NAME,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateHasQualifiedName", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(namedElement, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{namedElement}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.NAMED_ELEMENT__HAS_QUALIFIED_NAME,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateHasQualifiedName", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(namedElement, context)}),
+					new Object[]{namedElement}));
 			}
 			return false;
 		}
@@ -166,9 +166,8 @@
 			Map<Object, Object> context) {
 		boolean result = true;
 
-		if (namedElement.getNamespace() == null
-			&& namedElement
-				.eIsSet(UMLPackage.Literals.NAMED_ELEMENT__VISIBILITY)) {
+		if (namedElement.getNamespace() == null && namedElement
+			.eIsSet(UMLPackage.Literals.NAMED_ELEMENT__VISIBILITY)) {
 
 			result = false;
 
@@ -199,8 +198,8 @@
 			throw new IllegalArgumentException(String.valueOf(supplier));
 		}
 
-		Dependency dependency = (Dependency) package_.createPackagedElement(
-			null, eClass);
+		Dependency dependency = (Dependency) package_
+			.createPackagedElement(null, eClass);
 
 		dependency.getClients().add(namedElement);
 		dependency.getSuppliers().add(supplier);
@@ -251,11 +250,11 @@
 	 */
 	public static String getLabel(NamedElement namedElement, boolean localize) {
 		String qualifiedName = namedElement.getQualifiedName();
-		return getString(namedElement, LABEL_KEY_PREFIX
-			+ getValidJavaIdentifier(isEmpty(qualifiedName)
+		return getString(namedElement,
+			LABEL_KEY_PREFIX + getValidJavaIdentifier(isEmpty(qualifiedName)
 				? EMPTY_STRING
-				: qualifiedName.replace(':', '_')), namedElement.getName(),
-			localize);
+				: qualifiedName.replace(':', '_')),
+			namedElement.getName(), localize);
 	}
 
 	/**
@@ -368,7 +367,8 @@
 		if (nEClass.isSuperTypeOf(eClass) || eClass.isSuperTypeOf(nEClass)) {
 			EList<String> namesOfN = ns.getNamesOfMember(n);
 
-			for (String nameOfNamedElement : ns.getNamesOfMember(namedElement)) {
+			for (String nameOfNamedElement : ns
+				.getNamesOfMember(namedElement)) {
 
 				if (namesOfN.contains(nameOfNamedElement)) {
 					return false;
@@ -428,16 +428,17 @@
 			NamedElement namedElement) {
 		EList<Dependency> clientDependency = new UniqueEList.FastCompare<Dependency>();
 
-		for (EStructuralFeature.Setting nonNavigableInverseReference : getNonNavigableInverseReferences(namedElement)) {
+		for (EStructuralFeature.Setting nonNavigableInverseReference : getNonNavigableInverseReferences(
+			namedElement)) {
 
-			if (nonNavigableInverseReference.getEStructuralFeature() == UMLPackage.Literals.DEPENDENCY__CLIENT) {
-				clientDependency.add((Dependency) nonNavigableInverseReference
-					.getEObject());
+			if (nonNavigableInverseReference
+				.getEStructuralFeature() == UMLPackage.Literals.DEPENDENCY__CLIENT) {
+				clientDependency.add(
+					(Dependency) nonNavigableInverseReference.getEObject());
 			}
 		}
 
-		return new UnionEObjectEList<Dependency>(
-			(InternalEObject) namedElement,
+		return new UnionEObjectEList<Dependency>((InternalEObject) namedElement,
 			UMLPackage.Literals.NAMED_ELEMENT__CLIENT_DEPENDENCY,
 			clientDependency.size(), clientDependency.toArray());
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NamespaceOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NamespaceOperations.java
index f41d972..88e258d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NamespaceOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NamespaceOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 323181
- *   Kenn Hussey (CEA) - 327039, 418466, 451350, 459651, 433768
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 459651, 433768, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -98,23 +98,19 @@
 
 				for (NamedElement otherMember : namespaceMembers) {
 
-					if (member != otherMember
-						&& !member
-							.isDistinguishableFrom(otherMember, namespace)) {
+					if (member != otherMember && !member
+						.isDistinguishableFrom(otherMember, namespace)) {
 
 						result = false;
 
-						diagnostics
-							.add(new BasicDiagnostic(
-								Diagnostic.WARNING,
-								UMLValidator.DIAGNOSTIC_SOURCE,
-								UMLValidator.NAMESPACE__MEMBERS_DISTINGUISHABLE,
-								UMLPlugin.INSTANCE
-									.getString(
-										"_UI_Namespace_MemberDistinguishable_diagnostic", //$NON-NLS-1$
-										getMessageSubstitutions(context,
-											member, namespace)),
-								new Object[]{member}));
+						diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+							UMLValidator.DIAGNOSTIC_SOURCE,
+							UMLValidator.NAMESPACE__MEMBERS_DISTINGUISHABLE,
+							UMLPlugin.INSTANCE.getString(
+								"_UI_Namespace_MemberDistinguishable_diagnostic", //$NON-NLS-1$
+								getMessageSubstitutions(context, member,
+									namespace)),
+							new Object[]{member}));
 
 						break;
 					}
@@ -157,15 +153,15 @@
 		// 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.NAMESPACE__CANNOT_IMPORT_SELF,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateCannotImportSelf", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(namespace, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{namespace}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.NAMESPACE__CANNOT_IMPORT_SELF,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateCannotImportSelf", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(namespace, context)}),
+					new Object[]{namespace}));
 			}
 			return false;
 		}
@@ -192,15 +188,15 @@
 		// 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.NAMESPACE__CANNOT_IMPORT_OWNED_MEMBERS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateCannotImportOwnedMembers", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(namespace, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{namespace}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.NAMESPACE__CANNOT_IMPORT_OWNED_MEMBERS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateCannotImportOwnedMembers", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(namespace, context)}),
+					new Object[]{namespace}));
 			}
 			return false;
 		}
@@ -394,9 +390,8 @@
 						org.eclipse.uml2.uml.Package importedPackage = packageImport
 							.getImportedPackage();
 
-						if (importedPackage != null
-							&& importedPackage.visibleMembers().contains(
-								element)) {
+						if (importedPackage != null && importedPackage
+							.visibleMembers().contains(element)) {
 
 							getNamesOfMember(importedPackage, element,
 								namespaces, namesOfMember);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NodeOperations.java
index 7b7645a..fe4ca12 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NodeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/NodeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -81,15 +81,15 @@
 		// 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.NODE__INTERNAL_STRUCTURE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInternalStructure", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(node, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{node}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.NODE__INTERNAL_STRUCTURE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInternalStructure", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(node, context)}),
+					new Object[]{node}));
 			}
 			return false;
 		}
@@ -139,9 +139,11 @@
 	public static EList<CommunicationPath> getCommunicationPaths(Node node) {
 		EList<CommunicationPath> communicationPaths = new UniqueEList.FastCompare<CommunicationPath>();
 
-		for (EStructuralFeature.Setting nonNavigableInverseReference : getNonNavigableInverseReferences(node)) {
+		for (EStructuralFeature.Setting nonNavigableInverseReference : getNonNavigableInverseReferences(
+			node)) {
 
-			if (nonNavigableInverseReference.getEStructuralFeature() == UMLPackage.Literals.TYPED_ELEMENT__TYPE) {
+			if (nonNavigableInverseReference
+				.getEStructuralFeature() == UMLPackage.Literals.TYPED_ELEMENT__TYPE) {
 				EObject eObject = nonNavigableInverseReference.getEObject();
 
 				if (eObject instanceof Property) {
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ObjectFlowOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ObjectFlowOperations.java
index 92888ff..6abddc3 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ObjectFlowOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ObjectFlowOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -74,15 +74,15 @@
 		// 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.OBJECT_FLOW__COMPATIBLE_TYPES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateCompatibleTypes", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(objectFlow, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{objectFlow}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OBJECT_FLOW__COMPATIBLE_TYPES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateCompatibleTypes", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(objectFlow, context)}),
+					new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -108,15 +108,15 @@
 		// 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.OBJECT_FLOW__SAME_UPPER_BOUNDS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSameUpperBounds", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(objectFlow, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{objectFlow}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OBJECT_FLOW__SAME_UPPER_BOUNDS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSameUpperBounds", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(objectFlow, context)}),
+					new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -142,15 +142,15 @@
 		// 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.OBJECT_FLOW__TARGET,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTarget", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(objectFlow, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{objectFlow}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OBJECT_FLOW__TARGET,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTarget", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(objectFlow, context)}),
+					new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -172,24 +172,23 @@
 	 * <!-- end-model-doc -->
 	 * @generated
 	 */
-	public static boolean validateInputAndOutputParameter(
-			ObjectFlow objectFlow, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public static boolean validateInputAndOutputParameter(ObjectFlow objectFlow,
+			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.OBJECT_FLOW__INPUT_AND_OUTPUT_PARAMETER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInputAndOutputParameter", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(objectFlow, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{objectFlow}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OBJECT_FLOW__INPUT_AND_OUTPUT_PARAMETER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInputAndOutputParameter", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(objectFlow, context)}),
+					new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -216,15 +215,15 @@
 		// 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.OBJECT_FLOW__NO_EXECUTABLE_NODES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoExecutableNodes", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(objectFlow, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{objectFlow}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OBJECT_FLOW__NO_EXECUTABLE_NODES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoExecutableNodes", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(objectFlow, context)}),
+					new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -253,15 +252,15 @@
 		// 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.OBJECT_FLOW__TRANSFORMATION_BEHAVIOR,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTransformationBehavior", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(objectFlow, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{objectFlow}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OBJECT_FLOW__TRANSFORMATION_BEHAVIOR,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTransformationBehavior", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(objectFlow, context)}),
+					new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -288,15 +287,15 @@
 		// 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.OBJECT_FLOW__SELECTION_BEHAVIOR,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSelectionBehavior", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(objectFlow, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{objectFlow}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OBJECT_FLOW__SELECTION_BEHAVIOR,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSelectionBehavior", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(objectFlow, context)}),
+					new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -324,15 +323,15 @@
 		// 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.OBJECT_FLOW__IS_MULTICAST_OR_IS_MULTIRECEIVE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateIsMulticastOrIsMultireceive", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(objectFlow, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{objectFlow}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OBJECT_FLOW__IS_MULTICAST_OR_IS_MULTIRECEIVE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateIsMulticastOrIsMultireceive", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(objectFlow, context)}),
+					new Object[]{objectFlow}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ObjectNodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ObjectNodeOperations.java
index 08fb267..4dcd108 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ObjectNodeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ObjectNodeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,15 @@
 		// 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.OBJECT_NODE__OBJECT_FLOW_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateObjectFlowEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(objectNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{objectNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OBJECT_NODE__OBJECT_FLOW_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateObjectFlowEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(objectNode, context)}),
+					new Object[]{objectNode}));
 			}
 			return false;
 		}
@@ -105,15 +105,15 @@
 		// 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.OBJECT_NODE__SELECTION_BEHAVIOR,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSelectionBehavior", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(objectNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{objectNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OBJECT_NODE__SELECTION_BEHAVIOR,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSelectionBehavior", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(objectNode, context)}),
+					new Object[]{objectNode}));
 			}
 			return false;
 		}
@@ -144,15 +144,15 @@
 		// 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.OBJECT_NODE__INPUT_OUTPUT_PARAMETER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInputOutputParameter", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(objectNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{objectNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OBJECT_NODE__INPUT_OUTPUT_PARAMETER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInputOutputParameter", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(objectNode, context)}),
+					new Object[]{objectNode}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OpaqueActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OpaqueActionOperations.java
index 1421c00..e9c25c5 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OpaqueActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OpaqueActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey (CEA) - 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -68,15 +68,15 @@
 		// 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.OPAQUE_ACTION__LANGUAGE_BODY_SIZE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateLanguageBodySize", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(opaqueAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{opaqueAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OPAQUE_ACTION__LANGUAGE_BODY_SIZE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateLanguageBodySize", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(opaqueAction, context)}),
+					new Object[]{opaqueAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OpaqueExpressionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OpaqueExpressionOperations.java
index 8b45805..30b5b75 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OpaqueExpressionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OpaqueExpressionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -82,15 +82,15 @@
 		// 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.OPAQUE_EXPRESSION__LANGUAGE_BODY_SIZE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateLanguageBodySize", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(opaqueExpression, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{opaqueExpression}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OPAQUE_EXPRESSION__LANGUAGE_BODY_SIZE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateLanguageBodySize", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(opaqueExpression, context)}),
+					new Object[]{opaqueExpression}));
 			}
 			return false;
 		}
@@ -118,15 +118,15 @@
 		// 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.OPAQUE_EXPRESSION__ONLY_RETURN_RESULT_PARAMETERS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOnlyReturnResultParameters", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(opaqueExpression, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{opaqueExpression}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OPAQUE_EXPRESSION__ONLY_RETURN_RESULT_PARAMETERS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOnlyReturnResultParameters", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(opaqueExpression, context)}),
+					new Object[]{opaqueExpression}));
 			}
 			return false;
 		}
@@ -155,15 +155,15 @@
 		// 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.OPAQUE_EXPRESSION__ONE_RETURN_RESULT_PARAMETER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOneReturnResultParameter", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(opaqueExpression, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{opaqueExpression}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OPAQUE_EXPRESSION__ONE_RETURN_RESULT_PARAMETER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOneReturnResultParameter", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(opaqueExpression, context)}),
+					new Object[]{opaqueExpression}));
 			}
 			return false;
 		}
@@ -296,7 +296,8 @@
 
 			for (Parameter ownedParameter : behavior.getOwnedParameters()) {
 
-				if (ownedParameter.getDirection() == ParameterDirectionKind.RETURN_LITERAL) {
+				if (ownedParameter
+					.getDirection() == ParameterDirectionKind.RETURN_LITERAL) {
 					return ownedParameter;
 				}
 			}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OperationOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OperationOperations.java
index 0071c13..793f813 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OperationOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OperationOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 295864, 418466, 433204, 451350
+ *   Kenn Hussey (CEA) - 327039, 295864, 418466, 433204, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -91,7 +91,8 @@
 
 		for (Parameter ownedParameter : operation.getOwnedParameters()) {
 
-			if (ownedParameter.getDirection() == ParameterDirectionKind.RETURN_LITERAL) {
+			if (ownedParameter
+				.getDirection() == ParameterDirectionKind.RETURN_LITERAL) {
 				count++;
 			}
 		}
@@ -216,7 +217,8 @@
 
 		for (Parameter ownedParameter : operation.getOwnedParameters()) {
 
-			if (ownedParameter.getDirection() == ParameterDirectionKind.RETURN_LITERAL) {
+			if (ownedParameter
+				.getDirection() == ParameterDirectionKind.RETURN_LITERAL) {
 				returnResult.add(ownedParameter);
 			}
 		}
@@ -325,7 +327,8 @@
 
 		for (Parameter ownedParameter : operation.getOwnedParameters()) {
 
-			if (ownedParameter.getDirection() == ParameterDirectionKind.RETURN_LITERAL) {
+			if (ownedParameter
+				.getDirection() == ParameterDirectionKind.RETURN_LITERAL) {
 				return ownedParameter;
 			}
 		}
@@ -405,11 +408,13 @@
 					Parameter redefiningParam = opOwnedParameters.get(i);
 					Parameter redefinedParam = ownedParameters.get(i);
 
-					if (redefiningParam.isUnique() != redefinedParam.isUnique()) {
+					if (redefiningParam.isUnique() != redefinedParam
+						.isUnique()) {
 						return false;
 					}
 
-					if (redefiningParam.isUnique() == redefinedParam.isUnique()) {
+					if (redefiningParam.isUnique() == redefinedParam
+						.isUnique()) {
 						return false;
 					}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OperationTemplateParameterOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OperationTemplateParameterOperations.java
index b032ea2..9ec8207 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OperationTemplateParameterOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OperationTemplateParameterOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey (CEA) - 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -72,15 +72,16 @@
 		// 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.OPERATION_TEMPLATE_PARAMETER__MATCH_DEFAULT_SIGNATURE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMatchDefaultSignature", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(operationTemplateParameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{operationTemplateParameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OPERATION_TEMPLATE_PARAMETER__MATCH_DEFAULT_SIGNATURE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMatchDefaultSignature", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(operationTemplateParameter,
+									context)}),
+					new Object[]{operationTemplateParameter}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OutputPinOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OutputPinOperations.java
index e9e9afc..9e80c4c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OutputPinOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OutputPinOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -72,15 +72,15 @@
 		// 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.OUTPUT_PIN__INCOMING_EDGES_STRUCTURED_ONLY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateIncomingEdgesStructuredOnly", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(outputPin, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{outputPin}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.OUTPUT_PIN__INCOMING_EDGES_STRUCTURED_ONLY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateIncomingEdgesStructuredOnly", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(outputPin, context)}),
+					new Object[]{outputPin}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PackageOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PackageOperations.java
index 5de9c96..7c3de03 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PackageOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PackageOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 271470
  *   Kenn Hussey - 323181, 348433
- *   Kenn Hussey (CEA) - 327039, 369492, 313951, 163556, 418466, 447901, 451350, 458658
+ *   Kenn Hussey (CEA) - 327039, 369492, 313951, 163556, 418466, 447901, 451350, 458658, 485756
  *   Christian W. Damus (CEA) - 300957, 431998
  *   Christian W. Damus - 444588
  *
@@ -17,7 +17,9 @@
 package org.eclipse.uml2.uml.internal.operations;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 import org.eclipse.emf.common.util.BasicDiagnostic;
@@ -94,6 +96,7 @@
  *   <li>{@link org.eclipse.uml2.uml.Package#isModelLibrary() <em>Is Model Library</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.Package#isProfileApplied(org.eclipse.uml2.uml.Profile) <em>Is Profile Applied</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.Package#unapplyProfile(org.eclipse.uml2.uml.Profile) <em>Unapply Profile</em>}</li>
+ *   <li>{@link org.eclipse.uml2.uml.Package#applyProfiles(org.eclipse.emf.common.util.EList) <em>Apply Profiles</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.Package#allApplicableStereotypes() <em>All Applicable Stereotypes</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.Package#containingProfile() <em>Containing Profile</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.Package#makesVisible(org.eclipse.uml2.uml.NamedElement) <em>Makes Visible</em>}</li>
@@ -114,12 +117,24 @@
 
 		private static final long serialVersionUID = 1L;
 
+		@Deprecated
 		protected final Profile profile;
 
+		protected final List<Profile> profiles;
+
 		protected StereotypeApplicationCopier(Profile profile) {
+			this(profile == null
+				? Collections.<Profile> emptyList()
+				: Collections.singletonList(profile));
+		}
+
+		protected StereotypeApplicationCopier(List<Profile> profiles) {
 			super();
 
-			this.profile = profile;
+			this.profiles = profiles;
+			this.profile = profiles.isEmpty()
+				? null
+				: profiles.get(0);
 		}
 
 		@Override
@@ -142,9 +157,7 @@
 					? getQualifiedName(namedElement)
 					: getQualifiedName(eClass, NamedElement.SEPARATOR);
 				throw new IllegalStateException("Definition for class '" //$NON-NLS-1$
-					+ qualifiedName
-					+ "' not found in profile '" + getQualifiedName(profile) //$NON-NLS-1$
-					+ "'"); //$NON-NLS-1$
+					+ qualifiedName + "' not found."); //$NON-NLS-1$
 			}
 		}
 
@@ -152,7 +165,8 @@
 		protected EStructuralFeature getTarget(
 				EStructuralFeature eStructuralFeature) {
 			NamedElement namedElement = getNamedElement(eStructuralFeature);
-			EStructuralFeature definition = (EStructuralFeature) getDefinition(namedElement);
+			EStructuralFeature definition = (EStructuralFeature) getDefinition(
+				namedElement);
 
 			if (definition != null) {
 				return definition;
@@ -162,20 +176,41 @@
 					: getQualifiedName(eStructuralFeature,
 						NamedElement.SEPARATOR);
 				throw new IllegalStateException("Definition for property '" //$NON-NLS-1$
-					+ qualifiedName
-					+ "' not found in profile '" + getQualifiedName(profile) //$NON-NLS-1$
-					+ "'"); //$NON-NLS-1$
+					+ qualifiedName + "' not found."); //$NON-NLS-1$
 			}
 		}
 
 		protected NamedElement getNamedElement(ENamedElement element) {
-			return UMLUtil.getNamedElement(element, profile);
+
+			if (element != null) {
+
+				for (Profile profile : profiles) {
+					NamedElement namedElement = UMLUtil.getNamedElement(element,
+						profile);
+
+					if (namedElement != null) {
+						return namedElement;
+					}
+				}
+			}
+
+			return null;
 		}
 
 		protected ENamedElement getDefinition(NamedElement element) {
-			return (element == null)
-				? null
-				: profile.getDefinition(element);
+
+			if (element != null) {
+
+				for (Profile profile : profiles) {
+					ENamedElement definition = profile.getDefinition(element);
+
+					if (definition != null) {
+						return definition;
+					}
+				}
+			}
+
+			return null;
 		}
 
 		@Override
@@ -185,10 +220,12 @@
 			if (!eAttribute.isUnsettable() || eObject.eIsSet(eAttribute)) {
 
 				try {
-					if (eAttribute.getEType().eClass().getClassifierID() == EcorePackage.EENUM) {
+					if (eAttribute.getEType().eClass()
+						.getClassifierID() == EcorePackage.EENUM) {
 						copyEEnumAttribute(eAttribute, eObject, copyEObject);
 					} else {
-						copyEDataTypeAttribute(eAttribute, eObject, copyEObject);
+						copyEDataTypeAttribute(eAttribute, eObject,
+							copyEObject);
 					}
 				} catch (Exception e) {
 					handleException(e);
@@ -222,23 +259,20 @@
 						EList<?> values = (EList<?>) eObject.eGet(eAttribute);
 
 						for (int i = 0, size = values.size(); i < size; i++) {
-							copyValues.add(i, targetEFactory.createFromString(
-								targetEDataType,
-								eFactory.convertToString(eDataType,
-									values.get(i))));
+							copyValues.add(i,
+								targetEFactory.createFromString(targetEDataType,
+									eFactory.convertToString(eDataType,
+										values.get(i))));
 						}
 					} else {
 						copyValues.add(targetEFactory.createFromString(
-							targetEDataType,
-							eFactory.convertToString(eDataType,
+							targetEDataType, eFactory.convertToString(eDataType,
 								eObject.eGet(eAttribute))));
 					}
 				} else {
-					copyEObject.eSet(targetEAttribute, targetEFactory
-						.createFromString(
-							targetEDataType,
-							eFactory.convertToString(
-								eDataType,
+					copyEObject.eSet(targetEAttribute,
+						targetEFactory.createFromString(targetEDataType,
+							eFactory.convertToString(eDataType,
 								eAttribute.isMany()
 									? ((EList<?>) eObject.eGet(eAttribute))
 										.get(0)
@@ -314,7 +348,8 @@
 				Object value = eObject.eGet(eReference);
 
 				try {
-					EReference targetEReference = (EReference) getTarget(eReference);
+					EReference targetEReference = (EReference) getTarget(
+						eReference);
 
 					if (targetEReference != null
 						&& targetEReference.isChangeable()) {
@@ -358,7 +393,8 @@
 				Object value = eObject.eGet(eReference);
 
 				try {
-					EReference targetEReference = (EReference) getTarget(eReference);
+					EReference targetEReference = (EReference) getTarget(
+						eReference);
 
 					if (targetEReference != null
 						&& targetEReference.isChangeable()) {
@@ -411,7 +447,9 @@
 
 								if (copyValue == null) {
 
-									if (targetEReference.getEOpposite() == null) {
+									if (targetEReference
+										.getEOpposite() == null) {
+
 										copyValues.addUnique((EObject) value);
 									}
 								} else {
@@ -486,17 +524,14 @@
 					if (diagnostics == null) {
 						return result;
 					} else {
-						diagnostics
-							.add(new BasicDiagnostic(
-								Diagnostic.WARNING,
-								UMLValidator.DIAGNOSTIC_SOURCE,
-								UMLValidator.PACKAGE__ELEMENTS_PUBLIC_OR_PRIVATE,
-								UMLPlugin.INSTANCE
-									.getString(
-										"_UI_Package_ElementsPublicOrPrivate_diagnostic", //$NON-NLS-1$
-										getMessageSubstitutions(context,
-											ownedElement, package_)),
-								new Object[]{package_, ownedElement}));
+						diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+							UMLValidator.DIAGNOSTIC_SOURCE,
+							UMLValidator.PACKAGE__ELEMENTS_PUBLIC_OR_PRIVATE,
+							UMLPlugin.INSTANCE.getString(
+								"_UI_Package_ElementsPublicOrPrivate_diagnostic", //$NON-NLS-1$
+								getMessageSubstitutions(context, ownedElement,
+									package_)),
+							new Object[]{package_, ownedElement}));
 					}
 				}
 			}
@@ -571,8 +606,8 @@
 	public static Stereotype createOwnedStereotype(
 			org.eclipse.uml2.uml.Package package_, String name,
 			boolean isAbstract) {
-		Stereotype ownedStereotype = (Stereotype) package_.createOwnedType(
-			name, UMLPackage.Literals.STEREOTYPE);
+		Stereotype ownedStereotype = (Stereotype) package_.createOwnedType(name,
+			UMLPackage.Literals.STEREOTYPE);
 		ownedStereotype.setIsAbstract(isAbstract);
 		return ownedStereotype;
 	}
@@ -620,26 +655,96 @@
 	 */
 	public static EList<EObject> applyProfile(
 			org.eclipse.uml2.uml.Package package_, Profile profile) {
+		return applyProfiles(package_, profile == null
+			? ECollections.<Profile> emptyEList()
+			: ECollections.singletonEList(profile));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Unapplies the specified profile from this package and automatically unapplies stereotypes in the profile from elements within this package's namespace hieararchy.
+	 * @param package_ The receiving '<em><b>Package</b></em>' model object.
+	 * @param profile The profile to unapply.
+	 * <!-- end-model-doc -->
+	 * @generated NOT
+	 */
+	public static EList<EObject> unapplyProfile(
+			org.eclipse.uml2.uml.Package package_, Profile profile) {
 
 		if (profile == null) {
 			throw new IllegalArgumentException("null profile"); //$NON-NLS-1$
 		}
 
-		EPackage profileDefinition = profile.getDefinition();
-
-		if (profileDefinition == null) {
+		if (package_.getProfileApplication(profile) == null) {
 			throw new IllegalArgumentException(String.format(
-				"profile \"%s\" has no Ecore definition", //$NON-NLS-1$
-				profile.getQualifiedName()));
+				"profile \"%s\" is not applied", profile.getQualifiedName())); //$NON-NLS-1$
 		}
 
-		if (package_.getProfileApplication(profile) == null) {
-			package_.createProfileApplication().setAppliedProfile(profile);
+		EList<ProfileApplication> profileApplications = new UniqueEList.FastCompare<ProfileApplication>();
+
+		for (TreeIterator<EObject> allContents = getAllContents(package_, true,
+			false); allContents.hasNext();) {
+
+			EObject eObject = allContents.next();
+
+			if (eObject instanceof org.eclipse.uml2.uml.Package) {
+
+				for (ProfileApplication profileApplication : ((org.eclipse.uml2.uml.Package) eObject)
+					.getProfileApplications()) {
+
+					if (profileApplication.getAppliedProfile() == profile) {
+						profileApplications.add(profileApplication);
+					}
+				}
+			}
+		}
+
+		destroyAll(profileApplications);
+
+		return package_.getAllAppliedProfiles().contains(profile)
+			? ECollections.<EObject> emptyEList()
+			: unapplyAllNonApplicableStereotypes(package_);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Applies the current definitions of the specified profiles to this package and automatically applies required stereotypes in the profiles to elements within this package's namespace hieararchy. If different definitions are already applied, automatically migrates any associated stereotype values on a "best effort" basis (matching classifiers and structural features by name).
+	 * @param package_ The receiving '<em><b>Package</b></em>' model object.
+	 * @param profiles The profiles to apply.
+	 * <!-- end-model-doc -->
+	 * @generated NOT
+	 */
+	public static EList<EObject> applyProfiles(
+			org.eclipse.uml2.uml.Package package_, EList<Profile> profiles) {
+
+		if (profiles == null || profiles.isEmpty()) {
+			throw new IllegalArgumentException("No profile specified"); //$NON-NLS-1$
+		}
+
+		for (Profile profile : profiles) {
+			EPackage profileDefinition = profile.getDefinition();
+
+			if (profileDefinition == null) {
+				throw new IllegalArgumentException(
+					String.format("profile \"%s\" has no Ecore definition", //$NON-NLS-1$
+						profile.getQualifiedName()));
+			}
+		}
+
+		for (Profile profile : profiles) {
+
+			if (package_.getProfileApplication(profile) == null) {
+				package_.createProfileApplication().setAppliedProfile(profile);
+			}
 		}
 
 		EList<EObject> stereotypeApplications = new UniqueEList.FastCompare<EObject>();
 		StereotypeApplicationCopier copier = new StereotypeApplicationCopier(
-			profile);
+			profiles);
 
 		for (TreeIterator<EObject> allContents = getAllContents(package_, true,
 			false); allContents.hasNext();) {
@@ -654,16 +759,19 @@
 					for (ProfileApplication profileApplication : ((org.eclipse.uml2.uml.Package) element)
 						.getProfileApplications()) {
 
-						if (profileApplication.getAppliedProfile() == profile) {
+						Profile appliedProfile = profileApplication
+							.getAppliedProfile();
+
+						if (profiles.contains(appliedProfile)) {
 							EList<EObject> references = getEAnnotation(
-								profileApplication,
-								UML2_UML_PACKAGE_2_0_NS_URI, true)
-								.getReferences();
+								profileApplication, UML2_UML_PACKAGE_2_0_NS_URI,
+								true).getReferences();
 
 							if (references.isEmpty()) {
-								references.add(profileDefinition);
+								references.add(appliedProfile.getDefinition());
 							} else {
-								references.set(0, profileDefinition);
+								references.set(0,
+									appliedProfile.getDefinition());
 							}
 						}
 					}
@@ -672,10 +780,11 @@
 				for (EObject stereotypeApplication : element
 					.getStereotypeApplications()) {
 
-					Stereotype stereotype = getStereotype(stereotypeApplication);
+					Stereotype stereotype = getStereotype(
+						stereotypeApplication);
 
 					if (stereotype != null
-						&& stereotype.getProfile() == profile) {
+						&& profiles.contains(stereotype.getProfile())) {
 
 						if (element.isStereotypeApplicable(stereotype)) {
 							EObject copy = copier.copy(stereotypeApplication);
@@ -687,15 +796,13 @@
 									.getContents();
 
 								if (eResource == copy.eResource()) {
-									contents
-										.move(contents
-											.indexOf(stereotypeApplication),
-											copy);
+									contents.move(
+										contents.indexOf(stereotypeApplication),
+										copy);
 								} else {
-									contents
-										.set(contents
-											.indexOf(stereotypeApplication),
-											copy);
+									contents.set(
+										contents.indexOf(stereotypeApplication),
+										copy);
 								}
 							}
 						}
@@ -748,57 +855,14 @@
 
 		destroyAll(stereotypeApplications);
 
-		return profile.getOwnedExtensions(true).isEmpty()
-			? ECollections.<EObject> emptyEList()
-			: applyAllRequiredStereotypes(package_);
-	}
+		for (Profile profile : profiles) {
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Unapplies the specified profile from this package and automatically unapplies stereotypes in the profile from elements within this package's namespace hieararchy.
-	 * @param package_ The receiving '<em><b>Package</b></em>' model object.
-	 * @param profile The profile to unapply.
-	 * <!-- end-model-doc -->
-	 * @generated NOT
-	 */
-	public static EList<EObject> unapplyProfile(
-			org.eclipse.uml2.uml.Package package_, Profile profile) {
-
-		if (profile == null) {
-			throw new IllegalArgumentException("null profile"); //$NON-NLS-1$
-		}
-
-		if (package_.getProfileApplication(profile) == null) {
-			throw new IllegalArgumentException(String.format(
-				"profile \"%s\" is not applied", profile.getQualifiedName())); //$NON-NLS-1$
-		}
-
-		EList<ProfileApplication> profileApplications = new UniqueEList.FastCompare<ProfileApplication>();
-
-		for (TreeIterator<EObject> allContents = getAllContents(package_, true,
-			false); allContents.hasNext();) {
-
-			EObject eObject = allContents.next();
-
-			if (eObject instanceof org.eclipse.uml2.uml.Package) {
-
-				for (ProfileApplication profileApplication : ((org.eclipse.uml2.uml.Package) eObject)
-					.getProfileApplications()) {
-
-					if (profileApplication.getAppliedProfile() == profile) {
-						profileApplications.add(profileApplication);
-					}
-				}
+			if (profile.getOwnedExtensions(true).size() > 0) {
+				return applyAllRequiredStereotypes(package_);
 			}
 		}
 
-		destroyAll(profileApplications);
-
-		return package_.getAllAppliedProfiles().contains(profile)
-			? ECollections.<EObject> emptyEList()
-			: unapplyAllNonApplicableStereotypes(package_);
+		return ECollections.<EObject> emptyEList();
 	}
 
 	/**
@@ -905,8 +969,8 @@
 
 			Profile appliedProfile = profileApplication.getAppliedProfile();
 
-			if (appliedProfile != null
-				&& safeEquals(appliedProfile.getQualifiedName(), qualifiedName)) {
+			if (appliedProfile != null && safeEquals(
+				appliedProfile.getQualifiedName(), qualifiedName)) {
 
 				return appliedProfile;
 			}
@@ -936,7 +1000,7 @@
 			for (Iterator<org.eclipse.uml2.uml.Package> otherApplyingPackages = ProfileApplicationHelper
 				.getInstance(package_).getOtherApplyingPackages(package_)
 				.iterator(); otherApplyingPackages.hasNext()
-				&& appliedProfile == null;) {
+					&& appliedProfile == null;) {
 
 				appliedProfile = otherApplyingPackages.next()
 					.getAppliedProfile(qualifiedName);
@@ -963,8 +1027,8 @@
 		for (org.eclipse.uml2.uml.Package applyingPackage : ProfileApplicationHelper
 			.getInstance(package_).getOtherApplyingPackages(package_)) {
 
-			allProfileApplications.addAll(applyingPackage
-				.getProfileApplications());
+			allProfileApplications
+				.addAll(applyingPackage.getProfileApplications());
 		}
 
 		return ECollections.unmodifiableEList(allProfileApplications);
@@ -1016,7 +1080,7 @@
 			for (Iterator<org.eclipse.uml2.uml.Package> otherApplyingPackages = ProfileApplicationHelper
 				.getInstance(package_).getOtherApplyingPackages(package_)
 				.iterator(); otherApplyingPackages.hasNext()
-				&& profileApplication == null;) {
+					&& profileApplication == null;) {
 
 				profileApplication = otherApplyingPackages.next()
 					.getProfileApplication(profile);
@@ -1051,7 +1115,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static boolean isModelLibrary(org.eclipse.uml2.uml.Package package_) {
+	public static boolean isModelLibrary(
+			org.eclipse.uml2.uml.Package package_) {
 		return package_.getAppliedStereotype("StandardProfile" //$NON-NLS-1$
 			+ NamedElement.SEPARATOR + "ModelLibrary") != null; //$NON-NLS-1$
 	}
@@ -1085,14 +1150,16 @@
 
 		for (PackageImport packageImport : package_.getPackageImports()) {
 
-			if (packageImport.getVisibility() == VisibilityKind.PUBLIC_LITERAL) {
+			if (packageImport
+				.getVisibility() == VisibilityKind.PUBLIC_LITERAL) {
 				org.eclipse.uml2.uml.Package importedPackage = packageImport
 					.getImportedPackage();
 
 				if (importedPackage != null
 					&& allImportedPackages.add(importedPackage)) {
 
-					getAllImportedPackages(importedPackage, allImportedPackages);
+					getAllImportedPackages(importedPackage,
+						allImportedPackages);
 				}
 			}
 		}
@@ -1106,8 +1173,8 @@
 
 		for (NamedElement ownedMember : package_.getOwnedMembers()) {
 
-			if (ownedMember instanceof PackageableElement
-				&& ownedMember.getVisibility() == VisibilityKind.PUBLIC_LITERAL) {
+			if (ownedMember instanceof PackageableElement && ownedMember
+				.getVisibility() == VisibilityKind.PUBLIC_LITERAL) {
 
 				visibleMembers.add((PackageableElement) ownedMember);
 			}
@@ -1115,7 +1182,8 @@
 
 		for (ElementImport elementImport : package_.getElementImports()) {
 
-			if (elementImport.getVisibility() == VisibilityKind.PUBLIC_LITERAL) {
+			if (elementImport
+				.getVisibility() == VisibilityKind.PUBLIC_LITERAL) {
 				PackageableElement importedElement = elementImport
 					.getImportedElement();
 
@@ -1179,13 +1247,15 @@
 		for (ElementImport elementImport : package_.getElementImports()) {
 
 			if (safeEquals(elementImport.getImportedElement(), el)) {
-				return elementImport.getVisibility() == VisibilityKind.PUBLIC_LITERAL;
+				return elementImport
+					.getVisibility() == VisibilityKind.PUBLIC_LITERAL;
 			}
 		}
 
 		for (PackageImport packageImport : package_.getPackageImports()) {
 
-			if (packageImport.getVisibility() == VisibilityKind.PUBLIC_LITERAL) {
+			if (packageImport
+				.getVisibility() == VisibilityKind.PUBLIC_LITERAL) {
 				org.eclipse.uml2.uml.Package importedPackage = packageImport
 					.getImportedPackage();
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PackageableElementOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PackageableElementOperations.java
index bc8ce86..2585cc8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PackageableElementOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PackageableElementOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey (CEA) - 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.PACKAGEABLE_ELEMENT__NAMESPACE_NEEDS_VISIBILITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNamespaceNeedsVisibility", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(packageableElement, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{packageableElement}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PACKAGEABLE_ELEMENT__NAMESPACE_NEEDS_VISIBILITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNamespaceNeedsVisibility", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(packageableElement, context)}),
+					new Object[]{packageableElement}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ParameterOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ParameterOperations.java
index c206242..827ca3b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ParameterOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ParameterOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 313298, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 313298, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -92,15 +92,15 @@
 		// 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.PARAMETER__CONNECTOR_END,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateConnectorEnd", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(parameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{parameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PARAMETER__CONNECTOR_END,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateConnectorEnd", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(parameter, context)}),
+					new Object[]{parameter}));
 			}
 			return false;
 		}
@@ -127,15 +127,15 @@
 		// 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.PARAMETER__STREAM_AND_EXCEPTION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateStreamAndException", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(parameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{parameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PARAMETER__STREAM_AND_EXCEPTION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateStreamAndException", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(parameter, context)}),
+					new Object[]{parameter}));
 			}
 			return false;
 		}
@@ -162,15 +162,15 @@
 		// 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.PARAMETER__OBJECT_EFFECT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateObjectEffect", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(parameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{parameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PARAMETER__OBJECT_EFFECT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateObjectEffect", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(parameter, context)}),
+					new Object[]{parameter}));
 			}
 			return false;
 		}
@@ -197,15 +197,15 @@
 		// 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.PARAMETER__NOT_EXCEPTION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNotException", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(parameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{parameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PARAMETER__NOT_EXCEPTION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNotException", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(parameter, context)}),
+					new Object[]{parameter}));
 			}
 			return false;
 		}
@@ -232,15 +232,15 @@
 		// 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.PARAMETER__REENTRANT_BEHAVIORS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateReentrantBehaviors", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(parameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{parameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PARAMETER__REENTRANT_BEHAVIORS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateReentrantBehaviors", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(parameter, context)}),
+					new Object[]{parameter}));
 			}
 			return false;
 		}
@@ -269,15 +269,15 @@
 		// 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.PARAMETER__IN_AND_OUT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInAndOut", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(parameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{parameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PARAMETER__IN_AND_OUT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInAndOut", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(parameter, context)}),
+					new Object[]{parameter}));
 			}
 			return false;
 		}
@@ -348,7 +348,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static void setBooleanDefaultValue(Parameter parameter, boolean value) {
+	public static void setBooleanDefaultValue(Parameter parameter,
+			boolean value) {
 		ValueSpecification defaultValue = parameter.getDefaultValue();
 
 		((LiteralBoolean) (defaultValue instanceof LiteralBoolean
@@ -386,7 +387,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static void setStringDefaultValue(Parameter parameter, String value) {
+	public static void setStringDefaultValue(Parameter parameter,
+			String value) {
 		ValueSpecification defaultValue = parameter.getDefaultValue();
 
 		((LiteralString) (defaultValue instanceof LiteralString
@@ -413,7 +415,7 @@
 			? defaultValue
 			: parameter.createDefaultValue(null, null,
 				UMLPackage.Literals.LITERAL_UNLIMITED_NATURAL)))
-			.setValue(value);
+					.setValue(value);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ParameterSetOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ParameterSetOperations.java
index f386c12..ff4a8d6 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ParameterSetOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ParameterSetOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -71,15 +71,15 @@
 		// 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.PARAMETER_SET__SAME_PARAMETERIZED_ENTITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSameParameterizedEntity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(parameterSet, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{parameterSet}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PARAMETER_SET__SAME_PARAMETERIZED_ENTITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSameParameterizedEntity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(parameterSet, context)}),
+					new Object[]{parameterSet}));
 			}
 			return false;
 		}
@@ -110,15 +110,15 @@
 		// 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.PARAMETER_SET__INPUT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInput", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(parameterSet, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{parameterSet}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PARAMETER_SET__INPUT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInput", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(parameterSet, context)}),
+					new Object[]{parameterSet}));
 			}
 			return false;
 		}
@@ -145,15 +145,15 @@
 		// 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.PARAMETER_SET__TWO_PARAMETER_SETS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTwoParameterSets", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(parameterSet, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{parameterSet}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PARAMETER_SET__TWO_PARAMETER_SETS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTwoParameterSets", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(parameterSet, context)}),
+					new Object[]{parameterSet}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PartDecompositionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PartDecompositionOperations.java
index 0134abd..243d0fe 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PartDecompositionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PartDecompositionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,15 @@
 		// 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.PART_DECOMPOSITION__PARTS_OF_INTERNAL_STRUCTURES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validatePartsOfInternalStructures", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(partDecomposition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{partDecomposition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PART_DECOMPOSITION__PARTS_OF_INTERNAL_STRUCTURES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validatePartsOfInternalStructures", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(partDecomposition, context)}),
+					new Object[]{partDecomposition}));
 			}
 			return false;
 		}
@@ -104,15 +104,15 @@
 		// 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.PART_DECOMPOSITION__ASSUME,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateAssume", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(partDecomposition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{partDecomposition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PART_DECOMPOSITION__ASSUME,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateAssume", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(partDecomposition, context)}),
+					new Object[]{partDecomposition}));
 			}
 			return false;
 		}
@@ -139,15 +139,15 @@
 		// 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.PART_DECOMPOSITION__COMMUTATIVITY_OF_DECOMPOSITION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateCommutativityOfDecomposition", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(partDecomposition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{partDecomposition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PART_DECOMPOSITION__COMMUTATIVITY_OF_DECOMPOSITION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateCommutativityOfDecomposition", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(partDecomposition, context)}),
+					new Object[]{partDecomposition}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PinOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PinOperations.java
index ddc6168..86b7aae 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PinOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PinOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.PIN__CONTROL_PINS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateControlPins", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(pin, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{pin}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PIN__CONTROL_PINS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateControlPins", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(pin, context)}),
+					new Object[]{pin}));
 			}
 			return false;
 		}
@@ -104,15 +104,15 @@
 		// 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.PIN__NOT_UNIQUE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNotUnique", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(pin, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{pin}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PIN__NOT_UNIQUE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNotUnique", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(pin, context)}),
+					new Object[]{pin}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PortOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PortOperations.java
index 80aa353..9fd1cdb 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PortOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PortOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -88,9 +88,10 @@
 			if (diagnostics != null) {
 				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
 					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.PORT__PORT_AGGREGATION, UMLPlugin.INSTANCE
-						.getString("_UI_Port_PortAggregation_diagnostic", //$NON-NLS-1$
-							getMessageSubstitutions(context, port)),
+					UMLValidator.PORT__PORT_AGGREGATION,
+					UMLPlugin.INSTANCE.getString(
+						"_UI_Port_PortAggregation_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, port)),
 					new Object[]{port}));
 			}
 
@@ -121,9 +122,10 @@
 			if (diagnostics != null) {
 				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
 					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.PORT__DEFAULT_VALUE, UMLPlugin.INSTANCE
-						.getString("_UI_Port_DefaultValue_diagnostic", //$NON-NLS-1$
-							getMessageSubstitutions(context, port)),
+					UMLValidator.PORT__DEFAULT_VALUE,
+					UMLPlugin.INSTANCE.getString(
+						"_UI_Port_DefaultValue_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, port)),
 					new Object[]{port}));
 			}
 
@@ -153,15 +155,15 @@
 		// 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.PORT__ENCAPSULATED_OWNER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEncapsulatedOwner", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(port, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{port}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PORT__ENCAPSULATED_OWNER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEncapsulatedOwner", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(port, context)}),
+					new Object[]{port}));
 			}
 			return false;
 		}
@@ -228,7 +230,8 @@
 		return ECollections.unmodifiableEList(basicProvided(port, true));
 	}
 
-	protected static EList<Interface> basicProvided(Port port, boolean resolve) {
+	protected static EList<Interface> basicProvided(Port port,
+			boolean resolve) {
 		return basicProvided(port, resolve,
 			new UniqueEList.FastCompare<Interface>());
 	}
@@ -264,7 +267,8 @@
 		return ECollections.unmodifiableEList(basicRequired(port, true));
 	}
 
-	protected static EList<Interface> basicRequired(Port port, boolean resolve) {
+	protected static EList<Interface> basicRequired(Port port,
+			boolean resolve) {
 		return basicRequired(port, resolve,
 			new UniqueEList.FastCompare<Interface>());
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ProfileOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ProfileOperations.java
index b50a6fb..5d4abd8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ProfileOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ProfileOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 323181, 354452
- *   Kenn Hussey (CEA) - 327039, 392833, 163556, 451350
+ *   Kenn Hussey (CEA) - 327039, 392833, 163556, 451350, 485756
  *   Christian W. Damus (CEA) - 405065
  *
  */
@@ -248,8 +248,8 @@
 			OPTION__PROCESS);
 		options.put(UML2EcoreConverter.OPTION__INVARIANT_CONSTRAINTS,
 			OPTION__IGNORE);
-		options
-			.put(UML2EcoreConverter.OPTION__OPERATION_BODIES, OPTION__IGNORE);
+		options.put(UML2EcoreConverter.OPTION__OPERATION_BODIES,
+			OPTION__IGNORE);
 		options.put(UML2EcoreConverter.OPTION__PROPERTY_DEFAULT_EXPRESSIONS,
 			OPTION__IGNORE);
 		options.put(UML2EcoreConverter.OPTION__COMMENTS, OPTION__IGNORE);
@@ -330,9 +330,8 @@
 						EAnnotation eAnnotation = eClassifier
 							.getEAnnotation(UML2_UML_PACKAGE_2_0_NS_URI);
 
-						if (eAnnotation != null
-							&& eAnnotation.getReferences().contains(
-								namedElement)) {
+						if (eAnnotation != null && eAnnotation.getReferences()
+							.contains(namedElement)) {
 
 							return eClassifier;
 						}
@@ -383,7 +382,8 @@
 		} else if (namedElement instanceof org.eclipse.uml2.uml.Package) {
 			ENamedElement packageDefinition = getDefinition(profile,
 				((org.eclipse.uml2.uml.Package) namedElement)
-					.getNestingPackage(), profileDefinition);
+					.getNestingPackage(),
+				profileDefinition);
 
 			if (packageDefinition instanceof EPackage) {
 
@@ -395,9 +395,8 @@
 						EAnnotation eAnnotation = eSubpackage
 							.getEAnnotation(UML2_UML_PACKAGE_4_0_NS_URI);
 
-						if (eAnnotation != null
-							&& eAnnotation.getReferences().contains(
-								namedElement)) {
+						if (eAnnotation != null && eAnnotation.getReferences()
+							.contains(namedElement)) {
 
 							return eSubpackage;
 						}
@@ -417,7 +416,8 @@
 
 			return getDefinition(profile,
 				((org.eclipse.uml2.uml.Package) namedElement)
-					.containingProfile(), profileDefinition);
+					.containingProfile(),
+				profileDefinition);
 		} else {
 			return null;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java
index 96028be..432dc87 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 407028, 418466, 433195, 439915, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 407028, 418466, 433195, 439915, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -188,8 +188,8 @@
 					UMLPlugin.INSTANCE.getString(
 						"_UI_Property_SubsettingContextConforms_diagnostic", //$NON-NLS-1$
 						getMessageSubstitutions(context, property,
-							subsettedProperty)), new Object[]{property,
-						subsettedProperty}));
+							subsettedProperty)),
+					new Object[]{property, subsettedProperty}));
 			}
 		}
 
@@ -220,15 +220,15 @@
 		// 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.PROPERTY__REDEFINED_PROPERTY_INHERITED,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateRedefinedPropertyInherited", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(property, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{property}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PROPERTY__REDEFINED_PROPERTY_INHERITED,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateRedefinedPropertyInherited", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(property, context)}),
+					new Object[]{property}));
 			}
 			return false;
 		}
@@ -264,7 +264,9 @@
 			if (!(type == null
 				? subsettedType == null
 				: type.conformsTo(subsettedProperty.getType()))
-				|| (subsettedUpperBound != LiteralUnlimitedNatural.UNLIMITED && (upperBound == LiteralUnlimitedNatural.UNLIMITED || upperBound > subsettedUpperBound))) {
+				|| (subsettedUpperBound != LiteralUnlimitedNatural.UNLIMITED
+					&& (upperBound == LiteralUnlimitedNatural.UNLIMITED
+						|| upperBound > subsettedUpperBound))) {
 
 				result = false;
 
@@ -277,8 +279,8 @@
 						UMLPlugin.INSTANCE.getString(
 							"_UI_Property_SubsettingRules_diagnostic", //$NON-NLS-1$
 							getMessageSubstitutions(context, property,
-								subsettedProperty)), new Object[]{property,
-							subsettedProperty}));
+								subsettedProperty)),
+						new Object[]{property, subsettedProperty}));
 				}
 			}
 		}
@@ -384,8 +386,8 @@
 						UMLPlugin.INSTANCE.getString(
 							"_UI_Property_SubsettingPropertyNames_diagnostic", //$NON-NLS-1$
 							getMessageSubstitutions(context, property,
-								subsettedProperty)), new Object[]{property,
-							subsettedProperty}));
+								subsettedProperty)),
+						new Object[]{property, subsettedProperty}));
 				}
 			}
 		}
@@ -413,15 +415,15 @@
 		// 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.PROPERTY__TYPE_OF_OPPOSITE_END,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeOfOppositeEnd", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(property, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{property}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PROPERTY__TYPE_OF_OPPOSITE_END,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeOfOppositeEnd", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(property, context)}),
+					new Object[]{property}));
 			}
 			return false;
 		}
@@ -448,15 +450,15 @@
 		// 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.PROPERTY__QUALIFIED_IS_ASSOCIATION_END,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateQualifiedIsAssociationEnd", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(property, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{property}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PROPERTY__QUALIFIED_IS_ASSOCIATION_END,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateQualifiedIsAssociationEnd", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(property, context)}),
+					new Object[]{property}));
 			}
 			return false;
 		}
@@ -481,8 +483,7 @@
 
 		if (!property.getDeployments().isEmpty()) {
 
-			if (!property.isComposite()
-				|| !(property.getType() instanceof Node)
+			if (!property.isComposite() || !(property.getType() instanceof Node)
 				|| !(property.getOwner() instanceof Node)) {
 
 				result = false;
@@ -526,15 +527,15 @@
 		// 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.PROPERTY__BINDING_TO_ATTRIBUTE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateBindingToAttribute", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(property, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{property}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PROPERTY__BINDING_TO_ATTRIBUTE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateBindingToAttribute", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(property, context)}),
+					new Object[]{property}));
 			}
 			return false;
 		}
@@ -551,7 +552,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static void setBooleanDefaultValue(Property property, boolean value) {
+	public static void setBooleanDefaultValue(Property property,
+			boolean value) {
 		ValueSpecification defaultValue = property.getDefaultValue();
 
 		((LiteralBoolean) (defaultValue instanceof LiteralBoolean
@@ -616,7 +618,7 @@
 			? defaultValue
 			: property.createDefaultValue(null, null,
 				UMLPackage.Literals.LITERAL_UNLIMITED_NATURAL)))
-			.setValue(value);
+					.setValue(value);
 	}
 
 	/**
@@ -761,7 +763,8 @@
 	public static boolean isNavigable(Property property) {
 		Association owningAssociation = property.getOwningAssociation();
 		return owningAssociation == null
-			? property.eGet(UMLPackage.Literals.ELEMENT__OWNER, false) instanceof Classifier
+			? property.eGet(UMLPackage.Literals.ELEMENT__OWNER,
+				false) instanceof Classifier
 			: owningAssociation.getNavigableOwnedEnds().contains(property);
 	}
 
@@ -798,7 +801,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated NOT
 	 */
-	public static void setIsComposite(Property property, boolean newIsComposite) {
+	public static void setIsComposite(Property property,
+			boolean newIsComposite) {
 		property.setAggregation(newIsComposite
 			? AggregationKind.COMPOSITE_LITERAL
 			: AggregationKind.NONE_LITERAL);
@@ -888,7 +892,8 @@
 	 */
 	public static boolean isAttribute(Property property) {
 
-		for (EStructuralFeature.Setting inverseReference : getInverseReferences(property)) {
+		for (EStructuralFeature.Setting inverseReference : getInverseReferences(
+			property)) {
 			EObject eObject = inverseReference.getEObject();
 
 			if (eObject instanceof Classifier
@@ -1003,7 +1008,9 @@
 				? type == null
 				: propType.conformsTo(type))
 				&& prop.lowerBound() >= property.lowerBound()
-				&& (upperBound == LiteralUnlimitedNatural.UNLIMITED || (propUpperBound != LiteralUnlimitedNatural.UNLIMITED && propUpperBound <= upperBound))
+				&& (upperBound == LiteralUnlimitedNatural.UNLIMITED
+					|| (propUpperBound != LiteralUnlimitedNatural.UNLIMITED
+						&& propUpperBound <= upperBound))
 				&& (property.isComposite()
 					? prop.isComposite()
 					: true);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ProtocolStateMachineOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ProtocolStateMachineOperations.java
index 690fd7b..e85577f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ProtocolStateMachineOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ProtocolStateMachineOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -72,15 +72,16 @@
 		// 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.PROTOCOL_STATE_MACHINE__PROTOCOL_TRANSITIONS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateProtocolTransitions", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(protocolStateMachine, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{protocolStateMachine}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PROTOCOL_STATE_MACHINE__PROTOCOL_TRANSITIONS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateProtocolTransitions", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(protocolStateMachine,
+									context)}),
+					new Object[]{protocolStateMachine}));
 			}
 			return false;
 		}
@@ -109,15 +110,16 @@
 		// 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.PROTOCOL_STATE_MACHINE__ENTRY_EXIT_DO,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEntryExitDo", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(protocolStateMachine, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{protocolStateMachine}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PROTOCOL_STATE_MACHINE__ENTRY_EXIT_DO,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEntryExitDo", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(protocolStateMachine,
+									context)}),
+					new Object[]{protocolStateMachine}));
 			}
 			return false;
 		}
@@ -146,15 +148,16 @@
 		// 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.PROTOCOL_STATE_MACHINE__DEEP_OR_SHALLOW_HISTORY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateDeepOrShallowHistory", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(protocolStateMachine, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{protocolStateMachine}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PROTOCOL_STATE_MACHINE__DEEP_OR_SHALLOW_HISTORY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateDeepOrShallowHistory", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(protocolStateMachine,
+									context)}),
+					new Object[]{protocolStateMachine}));
 			}
 			return false;
 		}
@@ -182,15 +185,16 @@
 		// 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.PROTOCOL_STATE_MACHINE__CLASSIFIER_CONTEXT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateClassifierContext", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(protocolStateMachine, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{protocolStateMachine}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PROTOCOL_STATE_MACHINE__CLASSIFIER_CONTEXT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateClassifierContext", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(protocolStateMachine,
+									context)}),
+					new Object[]{protocolStateMachine}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ProtocolTransitionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ProtocolTransitionOperations.java
index 1c28d04..250bc63 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ProtocolTransitionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ProtocolTransitionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -74,15 +74,15 @@
 		// 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.PROTOCOL_TRANSITION__BELONGS_TO_PSM,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateBelongsToPsm", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(protocolTransition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{protocolTransition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PROTOCOL_TRANSITION__BELONGS_TO_PSM,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateBelongsToPsm", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(protocolTransition, context)}),
+					new Object[]{protocolTransition}));
 			}
 			return false;
 		}
@@ -126,15 +126,15 @@
 		// 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.PROTOCOL_TRANSITION__ASSOCIATED_ACTIONS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateAssociatedActions", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(protocolTransition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{protocolTransition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PROTOCOL_TRANSITION__ASSOCIATED_ACTIONS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateAssociatedActions", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(protocolTransition, context)}),
+					new Object[]{protocolTransition}));
 			}
 			return false;
 		}
@@ -164,15 +164,15 @@
 		// 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.PROTOCOL_TRANSITION__REFERS_TO_OPERATION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateRefersToOperation", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(protocolTransition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{protocolTransition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PROTOCOL_TRANSITION__REFERS_TO_OPERATION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateRefersToOperation", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(protocolTransition, context)}),
+					new Object[]{protocolTransition}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PseudostateOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PseudostateOperations.java
index f2968ee..bbbd389 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PseudostateOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PseudostateOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -76,15 +76,15 @@
 		// 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.PSEUDOSTATE__INITIAL_VERTEX,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInitialVertex", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(pseudostate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{pseudostate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PSEUDOSTATE__INITIAL_VERTEX,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInitialVertex", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(pseudostate, context)}),
+					new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -111,15 +111,15 @@
 		// 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.PSEUDOSTATE__HISTORY_VERTICES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateHistoryVertices", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(pseudostate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{pseudostate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PSEUDOSTATE__HISTORY_VERTICES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateHistoryVertices", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(pseudostate, context)}),
+					new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -146,15 +146,15 @@
 		// 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.PSEUDOSTATE__JOIN_VERTEX,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateJoinVertex", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(pseudostate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{pseudostate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PSEUDOSTATE__JOIN_VERTEX,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateJoinVertex", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(pseudostate, context)}),
+					new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -188,15 +188,15 @@
 		// 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.PSEUDOSTATE__TRANSITIONS_INCOMING,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTransitionsIncoming", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(pseudostate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{pseudostate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PSEUDOSTATE__TRANSITIONS_INCOMING,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTransitionsIncoming", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(pseudostate, context)}),
+					new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -223,15 +223,15 @@
 		// 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.PSEUDOSTATE__FORK_VERTEX,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateForkVertex", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(pseudostate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{pseudostate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PSEUDOSTATE__FORK_VERTEX,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateForkVertex", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(pseudostate, context)}),
+					new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -265,15 +265,15 @@
 		// 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.PSEUDOSTATE__TRANSITIONS_OUTGOING,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTransitionsOutgoing", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(pseudostate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{pseudostate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PSEUDOSTATE__TRANSITIONS_OUTGOING,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTransitionsOutgoing", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(pseudostate, context)}),
+					new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -300,15 +300,15 @@
 		// 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.PSEUDOSTATE__JUNCTION_VERTEX,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateJunctionVertex", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(pseudostate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{pseudostate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PSEUDOSTATE__JUNCTION_VERTEX,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateJunctionVertex", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(pseudostate, context)}),
+					new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -335,15 +335,15 @@
 		// 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.PSEUDOSTATE__CHOICE_VERTEX,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateChoiceVertex", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(pseudostate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{pseudostate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PSEUDOSTATE__CHOICE_VERTEX,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateChoiceVertex", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(pseudostate, context)}),
+					new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -370,15 +370,15 @@
 		// 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.PSEUDOSTATE__OUTGOING_FROM_INITIAL,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOutgoingFromInitial", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(pseudostate, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{pseudostate}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.PSEUDOSTATE__OUTGOING_FROM_INITIAL,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOutgoingFromInitial", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(pseudostate, context)}),
+					new Object[]{pseudostate}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/QualifierValueOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/QualifierValueOperations.java
index 0b00f6b..d66e8cf 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/QualifierValueOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/QualifierValueOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -71,15 +71,15 @@
 		// 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.QUALIFIER_VALUE__QUALIFIER_ATTRIBUTE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateQualifierAttribute", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(qualifierValue, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{qualifierValue}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.QUALIFIER_VALUE__QUALIFIER_ATTRIBUTE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateQualifierAttribute", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(qualifierValue, context)}),
+					new Object[]{qualifierValue}));
 			}
 			return false;
 		}
@@ -98,24 +98,23 @@
 	 * <!-- end-model-doc -->
 	 * @generated
 	 */
-	public static boolean validateTypeOfQualifier(
-			QualifierValue qualifierValue, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public static boolean validateTypeOfQualifier(QualifierValue qualifierValue,
+			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.QUALIFIER_VALUE__TYPE_OF_QUALIFIER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeOfQualifier", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(qualifierValue, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{qualifierValue}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.QUALIFIER_VALUE__TYPE_OF_QUALIFIER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeOfQualifier", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(qualifierValue, context)}),
+					new Object[]{qualifierValue}));
 			}
 			return false;
 		}
@@ -143,15 +142,15 @@
 		// 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.QUALIFIER_VALUE__MULTIPLICITY_OF_QUALIFIER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicityOfQualifier", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(qualifierValue, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{qualifierValue}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.QUALIFIER_VALUE__MULTIPLICITY_OF_QUALIFIER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfQualifier", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(qualifierValue, context)}),
+					new Object[]{qualifierValue}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadExtentActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadExtentActionOperations.java
index e74f91e..23e6963 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadExtentActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadExtentActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,15 @@
 		// 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.READ_EXTENT_ACTION__TYPE_IS_CLASSIFIER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeIsClassifier", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readExtentAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readExtentAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_EXTENT_ACTION__TYPE_IS_CLASSIFIER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeIsClassifier", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readExtentAction, context)}),
+					new Object[]{readExtentAction}));
 			}
 			return false;
 		}
@@ -106,15 +106,15 @@
 		// 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.READ_EXTENT_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(readExtentAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readExtentAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_EXTENT_ACTION__MULTIPLICITY_OF_RESULT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfResult", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readExtentAction, context)}),
+					new Object[]{readExtentAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadIsClassifiedObjectActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadIsClassifiedObjectActionOperations.java
index 56e04e4..22a35bf 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadIsClassifiedObjectActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadIsClassifiedObjectActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -72,15 +72,16 @@
 		// 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.READ_IS_CLASSIFIED_OBJECT_ACTION__MULTIPLICITY_OF_INPUT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicityOfInput", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readIsClassifiedObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readIsClassifiedObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_IS_CLASSIFIED_OBJECT_ACTION__MULTIPLICITY_OF_INPUT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfInput", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readIsClassifiedObjectAction,
+									context)}),
+					new Object[]{readIsClassifiedObjectAction}));
 			}
 			return false;
 		}
@@ -108,15 +109,16 @@
 		// 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.READ_IS_CLASSIFIED_OBJECT_ACTION__NO_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readIsClassifiedObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readIsClassifiedObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_IS_CLASSIFIED_OBJECT_ACTION__NO_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readIsClassifiedObjectAction,
+									context)}),
+					new Object[]{readIsClassifiedObjectAction}));
 			}
 			return false;
 		}
@@ -144,15 +146,16 @@
 		// 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.READ_IS_CLASSIFIED_OBJECT_ACTION__MULTIPLICITY_OF_OUTPUT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicityOfOutput", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readIsClassifiedObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readIsClassifiedObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_IS_CLASSIFIED_OBJECT_ACTION__MULTIPLICITY_OF_OUTPUT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfOutput", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readIsClassifiedObjectAction,
+									context)}),
+					new Object[]{readIsClassifiedObjectAction}));
 			}
 			return false;
 		}
@@ -180,15 +183,16 @@
 		// 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.READ_IS_CLASSIFIED_OBJECT_ACTION__BOOLEAN_RESULT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateBooleanResult", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readIsClassifiedObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readIsClassifiedObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_IS_CLASSIFIED_OBJECT_ACTION__BOOLEAN_RESULT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateBooleanResult", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readIsClassifiedObjectAction,
+									context)}),
+					new Object[]{readIsClassifiedObjectAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadLinkActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadLinkActionOperations.java
index cf85750..a2f99e9 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadLinkActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadLinkActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -78,15 +78,15 @@
 		// 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.READ_LINK_ACTION__ONE_OPEN_END,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOneOpenEnd", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readLinkAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_ACTION__ONE_OPEN_END,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOneOpenEnd", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readLinkAction, context)}),
+					new Object[]{readLinkAction}));
 			}
 			return false;
 		}
@@ -105,24 +105,23 @@
 	 * <!-- end-model-doc -->
 	 * @generated
 	 */
-	public static boolean validateTypeAndOrdering(
-			ReadLinkAction readLinkAction, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public static boolean validateTypeAndOrdering(ReadLinkAction readLinkAction,
+			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.READ_LINK_ACTION__TYPE_AND_ORDERING,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeAndOrdering", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readLinkAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_ACTION__TYPE_AND_ORDERING,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeAndOrdering", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readLinkAction, context)}),
+					new Object[]{readLinkAction}));
 			}
 			return false;
 		}
@@ -150,15 +149,15 @@
 		// 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.READ_LINK_ACTION__COMPATIBLE_MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateCompatibleMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readLinkAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_ACTION__COMPATIBLE_MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateCompatibleMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readLinkAction, context)}),
+					new Object[]{readLinkAction}));
 			}
 			return false;
 		}
@@ -186,15 +185,15 @@
 		// 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.READ_LINK_ACTION__NAVIGABLE_OPEN_END,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNavigableOpenEnd", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readLinkAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_ACTION__NAVIGABLE_OPEN_END,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNavigableOpenEnd", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readLinkAction, context)}),
+					new Object[]{readLinkAction}));
 			}
 			return false;
 		}
@@ -255,15 +254,15 @@
 		// 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.READ_LINK_ACTION__VISIBILITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateVisibility", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readLinkAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_ACTION__VISIBILITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateVisibility", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readLinkAction, context)}),
+					new Object[]{readLinkAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadLinkObjectEndActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadLinkObjectEndActionOperations.java
index 8f3143c..560a66e 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadLinkObjectEndActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadLinkObjectEndActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -75,15 +75,16 @@
 		// 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.READ_LINK_OBJECT_END_ACTION__PROPERTY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateProperty", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readLinkObjectEndAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_ACTION__PROPERTY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateProperty", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readLinkObjectEndAction,
+									context)}),
+					new Object[]{readLinkObjectEndAction}));
 			}
 			return false;
 		}
@@ -111,15 +112,16 @@
 		// 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.READ_LINK_OBJECT_END_ACTION__ASSOCIATION_OF_ASSOCIATION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateAssociationOfAssociation", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readLinkObjectEndAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_ACTION__ASSOCIATION_OF_ASSOCIATION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateAssociationOfAssociation", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readLinkObjectEndAction,
+									context)}),
+					new Object[]{readLinkObjectEndAction}));
 			}
 			return false;
 		}
@@ -147,15 +149,16 @@
 		// 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.READ_LINK_OBJECT_END_ACTION__ENDS_OF_ASSOCIATION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEndsOfAssociation", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readLinkObjectEndAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_ACTION__ENDS_OF_ASSOCIATION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEndsOfAssociation", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readLinkObjectEndAction,
+									context)}),
+					new Object[]{readLinkObjectEndAction}));
 			}
 			return false;
 		}
@@ -183,15 +186,16 @@
 		// 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.READ_LINK_OBJECT_END_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(readLinkObjectEndAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_ACTION__TYPE_OF_OBJECT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeOfObject", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readLinkObjectEndAction,
+									context)}),
+					new Object[]{readLinkObjectEndAction}));
 			}
 			return false;
 		}
@@ -219,15 +223,16 @@
 		// 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.READ_LINK_OBJECT_END_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(readLinkObjectEndAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_ACTION__MULTIPLICITY_OF_OBJECT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfObject", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readLinkObjectEndAction,
+									context)}),
+					new Object[]{readLinkObjectEndAction}));
 			}
 			return false;
 		}
@@ -255,15 +260,16 @@
 		// 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.READ_LINK_OBJECT_END_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(readLinkObjectEndAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_ACTION__TYPE_OF_RESULT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeOfResult", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readLinkObjectEndAction,
+									context)}),
+					new Object[]{readLinkObjectEndAction}));
 			}
 			return false;
 		}
@@ -291,15 +297,16 @@
 		// 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.READ_LINK_OBJECT_END_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(readLinkObjectEndAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_ACTION__MULTIPLICITY_OF_RESULT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfResult", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readLinkObjectEndAction,
+									context)}),
+					new Object[]{readLinkObjectEndAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadLinkObjectEndQualifierActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadLinkObjectEndQualifierActionOperations.java
index 23b3506..7fb36b7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadLinkObjectEndQualifierActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadLinkObjectEndQualifierActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -76,15 +76,17 @@
 		// 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.READ_LINK_OBJECT_END_QUALIFIER_ACTION__QUALIFIER_ATTRIBUTE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateQualifierAttribute", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readLinkObjectEndQualifierAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndQualifierAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_QUALIFIER_ACTION__QUALIFIER_ATTRIBUTE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateQualifierAttribute", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(
+									readLinkObjectEndQualifierAction,
+									context)}),
+					new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -112,15 +114,17 @@
 		// 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.READ_LINK_OBJECT_END_QUALIFIER_ACTION__ASSOCIATION_OF_ASSOCIATION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateAssociationOfAssociation", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readLinkObjectEndQualifierAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndQualifierAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_QUALIFIER_ACTION__ASSOCIATION_OF_ASSOCIATION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateAssociationOfAssociation", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(
+									readLinkObjectEndQualifierAction,
+									context)}),
+					new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -148,15 +152,17 @@
 		// 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.READ_LINK_OBJECT_END_QUALIFIER_ACTION__ENDS_OF_ASSOCIATION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEndsOfAssociation", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readLinkObjectEndQualifierAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndQualifierAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_QUALIFIER_ACTION__ENDS_OF_ASSOCIATION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEndsOfAssociation", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(
+									readLinkObjectEndQualifierAction,
+									context)}),
+					new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -184,15 +190,17 @@
 		// 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.READ_LINK_OBJECT_END_QUALIFIER_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(readLinkObjectEndQualifierAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndQualifierAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_QUALIFIER_ACTION__TYPE_OF_OBJECT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeOfObject", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(
+									readLinkObjectEndQualifierAction,
+									context)}),
+					new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -220,15 +228,17 @@
 		// 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.READ_LINK_OBJECT_END_QUALIFIER_ACTION__MULTIPLICITY_OF_QUALIFIER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicityOfQualifier", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readLinkObjectEndQualifierAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndQualifierAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_QUALIFIER_ACTION__MULTIPLICITY_OF_QUALIFIER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfQualifier", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(
+									readLinkObjectEndQualifierAction,
+									context)}),
+					new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -256,15 +266,17 @@
 		// 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.READ_LINK_OBJECT_END_QUALIFIER_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(readLinkObjectEndQualifierAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndQualifierAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_QUALIFIER_ACTION__MULTIPLICITY_OF_OBJECT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfObject", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(
+									readLinkObjectEndQualifierAction,
+									context)}),
+					new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -292,15 +304,17 @@
 		// 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.READ_LINK_OBJECT_END_QUALIFIER_ACTION__SAME_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSameType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readLinkObjectEndQualifierAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndQualifierAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_QUALIFIER_ACTION__SAME_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSameType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(
+									readLinkObjectEndQualifierAction,
+									context)}),
+					new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -328,15 +342,17 @@
 		// 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.READ_LINK_OBJECT_END_QUALIFIER_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(readLinkObjectEndQualifierAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readLinkObjectEndQualifierAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_LINK_OBJECT_END_QUALIFIER_ACTION__MULTIPLICITY_OF_RESULT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfResult", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(
+									readLinkObjectEndQualifierAction,
+									context)}),
+					new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadSelfActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadSelfActionOperations.java
index 3ef7865..549c768 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadSelfActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadSelfActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -71,15 +71,15 @@
 		// 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.READ_SELF_ACTION__CONTAINED,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateContained", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readSelfAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readSelfAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_SELF_ACTION__CONTAINED,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateContained", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readSelfAction, context)}),
+					new Object[]{readSelfAction}));
 			}
 			return false;
 		}
@@ -107,15 +107,15 @@
 		// 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.READ_SELF_ACTION__NOT_STATIC,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNotStatic", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readSelfAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readSelfAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_SELF_ACTION__NOT_STATIC,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNotStatic", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readSelfAction, context)}),
+					new Object[]{readSelfAction}));
 			}
 			return false;
 		}
@@ -142,15 +142,15 @@
 		// 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.READ_SELF_ACTION__TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readSelfAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readSelfAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_SELF_ACTION__TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readSelfAction, context)}),
+					new Object[]{readSelfAction}));
 			}
 			return false;
 		}
@@ -177,15 +177,15 @@
 		// 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.READ_SELF_ACTION__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readSelfAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readSelfAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_SELF_ACTION__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readSelfAction, context)}),
+					new Object[]{readSelfAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadStructuralFeatureActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadStructuralFeatureActionOperations.java
index 49fc41a..1b347ae 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadStructuralFeatureActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadStructuralFeatureActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -71,15 +71,16 @@
 		// 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.READ_STRUCTURAL_FEATURE_ACTION__TYPE_AND_ORDERING,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeAndOrdering", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readStructuralFeatureAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readStructuralFeatureAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_STRUCTURAL_FEATURE_ACTION__TYPE_AND_ORDERING,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeAndOrdering", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readStructuralFeatureAction,
+									context)}),
+					new Object[]{readStructuralFeatureAction}));
 			}
 			return false;
 		}
@@ -107,15 +108,16 @@
 		// 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.READ_STRUCTURAL_FEATURE_ACTION__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readStructuralFeatureAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readStructuralFeatureAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_STRUCTURAL_FEATURE_ACTION__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readStructuralFeatureAction,
+									context)}),
+					new Object[]{readStructuralFeatureAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadVariableActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadVariableActionOperations.java
index 82852cc..2437b3c 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadVariableActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReadVariableActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -71,15 +71,15 @@
 		// 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.READ_VARIABLE_ACTION__TYPE_AND_ORDERING,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeAndOrdering", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readVariableAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readVariableAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_VARIABLE_ACTION__TYPE_AND_ORDERING,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeAndOrdering", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readVariableAction, context)}),
+					new Object[]{readVariableAction}));
 			}
 			return false;
 		}
@@ -107,15 +107,15 @@
 		// 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.READ_VARIABLE_ACTION__COMPATIBLE_MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateCompatibleMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(readVariableAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{readVariableAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.READ_VARIABLE_ACTION__COMPATIBLE_MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateCompatibleMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(readVariableAction, context)}),
+					new Object[]{readVariableAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReceptionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReceptionOperations.java
index 6a9199d..11e87b7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReceptionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReceptionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.RECEPTION__SAME_NAME_AS_SIGNAL,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSameNameAsSignal", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(reception, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{reception}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.RECEPTION__SAME_NAME_AS_SIGNAL,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSameNameAsSignal", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(reception, context)}),
+					new Object[]{reception}));
 			}
 			return false;
 		}
@@ -111,15 +111,15 @@
 		// 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.RECEPTION__SAME_STRUCTURE_AS_SIGNAL,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSameStructureAsSignal", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(reception, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{reception}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.RECEPTION__SAME_STRUCTURE_AS_SIGNAL,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSameStructureAsSignal", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(reception, context)}),
+					new Object[]{reception}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReclassifyObjectActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReclassifyObjectActionOperations.java
index ee7743e..d82ece8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReclassifyObjectActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReclassifyObjectActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -71,15 +71,16 @@
 		// 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.RECLASSIFY_OBJECT_ACTION__CLASSIFIER_NOT_ABSTRACT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateClassifierNotAbstract", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(reclassifyObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{reclassifyObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.RECLASSIFY_OBJECT_ACTION__CLASSIFIER_NOT_ABSTRACT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateClassifierNotAbstract", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(reclassifyObjectAction,
+									context)}),
+					new Object[]{reclassifyObjectAction}));
 			}
 			return false;
 		}
@@ -107,15 +108,16 @@
 		// 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.RECLASSIFY_OBJECT_ACTION__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(reclassifyObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{reclassifyObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.RECLASSIFY_OBJECT_ACTION__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(reclassifyObjectAction,
+									context)}),
+					new Object[]{reclassifyObjectAction}));
 			}
 			return false;
 		}
@@ -143,15 +145,16 @@
 		// 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.RECLASSIFY_OBJECT_ACTION__INPUT_PIN,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInputPin", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(reclassifyObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{reclassifyObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.RECLASSIFY_OBJECT_ACTION__INPUT_PIN,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInputPin", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(reclassifyObjectAction,
+									context)}),
+					new Object[]{reclassifyObjectAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RedefinableElementOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RedefinableElementOperations.java
index 71525f1..e3e93a1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RedefinableElementOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RedefinableElementOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -86,17 +86,14 @@
 				if (diagnostics == null) {
 					return result;
 				} else {
-					diagnostics
-						.add(new BasicDiagnostic(
-							Diagnostic.WARNING,
-							UMLValidator.DIAGNOSTIC_SOURCE,
-							UMLValidator.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT_VALID,
-							UMLPlugin.INSTANCE
-								.getString(
-									"_UI_RedefinableElement_RedefinitionContextValid_diagnostic", //$NON-NLS-1$
-									getMessageSubstitutions(context,
-										redefinableElement, redefinedElement)),
-							new Object[]{redefinableElement, redefinedElement}));
+					diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+						UMLValidator.DIAGNOSTIC_SOURCE,
+						UMLValidator.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT_VALID,
+						UMLPlugin.INSTANCE.getString(
+							"_UI_RedefinableElement_RedefinitionContextValid_diagnostic", //$NON-NLS-1$
+							getMessageSubstitutions(context, redefinableElement,
+								redefinedElement)),
+						new Object[]{redefinableElement, redefinedElement}));
 				}
 			}
 		}
@@ -130,17 +127,14 @@
 				if (diagnostics == null) {
 					return result;
 				} else {
-					diagnostics
-						.add(new BasicDiagnostic(
-							Diagnostic.WARNING,
-							UMLValidator.DIAGNOSTIC_SOURCE,
-							UMLValidator.REDEFINABLE_ELEMENT__REDEFINITION_CONSISTENT,
-							UMLPlugin.INSTANCE
-								.getString(
-									"_UI_RedefinableElement_RedefinitionConsistent_diagnostic", //$NON-NLS-1$
-									getMessageSubstitutions(context,
-										redefinableElement, redefinedElement)),
-							new Object[]{redefinableElement, redefinedElement}));
+					diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+						UMLValidator.DIAGNOSTIC_SOURCE,
+						UMLValidator.REDEFINABLE_ELEMENT__REDEFINITION_CONSISTENT,
+						UMLPlugin.INSTANCE.getString(
+							"_UI_RedefinableElement_RedefinitionConsistent_diagnostic", //$NON-NLS-1$
+							getMessageSubstitutions(context, redefinableElement,
+								redefinedElement)),
+						new Object[]{redefinableElement, redefinedElement}));
 				}
 			}
 		}
@@ -169,15 +163,15 @@
 		// 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.REDEFINABLE_ELEMENT__NON_LEAF_REDEFINITION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNonLeafRedefinition", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(redefinableElement, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{redefinableElement}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.REDEFINABLE_ELEMENT__NON_LEAF_REDEFINITION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNonLeafRedefinition", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(redefinableElement, context)}),
+					new Object[]{redefinableElement}));
 			}
 			return false;
 		}
@@ -204,8 +198,8 @@
 		for (Classifier redefinitionContext : redefinableElement
 			.getRedefinitionContexts()) {
 
-			if (redefinitionContext.allParents().containsAll(
-				redefinedRedefinitionContexts)) {
+			if (redefinitionContext.allParents()
+				.containsAll(redefinedRedefinitionContexts)) {
 
 				return true;
 			}
@@ -260,8 +254,7 @@
 		for (Element redefinableElement : redefineableElements) {
 
 			if (redefinableElement instanceof RedefinableElement) {
-				getAllRedefinedElements(
-					(RedefinableElement) redefinableElement,
+				getAllRedefinedElements((RedefinableElement) redefinableElement,
 					allRedefinedElements);
 			}
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RedefinableTemplateSignatureOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RedefinableTemplateSignatureOperations.java
index e096679..9937229 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RedefinableTemplateSignatureOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RedefinableTemplateSignatureOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -81,15 +81,16 @@
 		// 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.REDEFINABLE_TEMPLATE_SIGNATURE__REDEFINES_PARENTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateRedefinesParents", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(redefinableTemplateSignature, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{redefinableTemplateSignature}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.REDEFINABLE_TEMPLATE_SIGNATURE__REDEFINES_PARENTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateRedefinesParents", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(redefinableTemplateSignature,
+									context)}),
+					new Object[]{redefinableTemplateSignature}));
 			}
 			return false;
 		}
@@ -112,11 +113,12 @@
 		EList<TemplateParameter> inheritedParameters = new UniqueEList.FastCompare<TemplateParameter>();
 
 		for (Iterator<RedefinableTemplateSignature> extendedSignatures = redefinableTemplateSignature
-			.getExtendedSignatures().iterator(); extendedSignatures.hasNext();) {
+			.getExtendedSignatures().iterator(); extendedSignatures
+				.hasNext();) {
 
-			inheritedParameters
-				.addAll(((InternalEList<TemplateParameter>) (extendedSignatures
-					.next()).getParameters()).basicList());
+			inheritedParameters.addAll(
+				((InternalEList<TemplateParameter>) (extendedSignatures.next())
+					.getParameters()).basicList());
 		}
 
 		return new UnionEObjectEList<TemplateParameter>(
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReduceActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReduceActionOperations.java
index 0ed70e6..2bb04f1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReduceActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReduceActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,15 @@
 		// 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.REDUCE_ACTION__INPUT_TYPE_IS_COLLECTION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInputTypeIsCollection", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(reduceAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{reduceAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.REDUCE_ACTION__INPUT_TYPE_IS_COLLECTION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInputTypeIsCollection", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(reduceAction, context)}),
+					new Object[]{reduceAction}));
 			}
 			return false;
 		}
@@ -106,15 +106,15 @@
 		// 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.REDUCE_ACTION__OUTPUT_TYPES_ARE_COMPATIBLE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOutputTypesAreCompatible", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(reduceAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{reduceAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.REDUCE_ACTION__OUTPUT_TYPES_ARE_COMPATIBLE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOutputTypesAreCompatible", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(reduceAction, context)}),
+					new Object[]{reduceAction}));
 			}
 			return false;
 		}
@@ -139,24 +139,23 @@
 	 * <!-- end-model-doc -->
 	 * @generated
 	 */
-	public static boolean validateReducerInputsOutput(
-			ReduceAction reduceAction, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public static boolean validateReducerInputsOutput(ReduceAction reduceAction,
+			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.REDUCE_ACTION__REDUCER_INPUTS_OUTPUT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateReducerInputsOutput", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(reduceAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{reduceAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.REDUCE_ACTION__REDUCER_INPUTS_OUTPUT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateReducerInputsOutput", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(reduceAction, context)}),
+					new Object[]{reduceAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RegionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RegionOperations.java
index 12a9711..ec00229 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RegionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RegionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 80307, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 80307, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -88,8 +88,8 @@
 
 		for (Vertex subvertex : region.getSubvertices()) {
 
-			if (subvertex instanceof Pseudostate
-				&& ((Pseudostate) subvertex).getKind() == PseudostateKind.INITIAL_LITERAL) {
+			if (subvertex instanceof Pseudostate && ((Pseudostate) subvertex)
+				.getKind() == PseudostateKind.INITIAL_LITERAL) {
 
 				initialVertexCount++;
 			}
@@ -98,15 +98,13 @@
 		if (initialVertexCount > 1) {
 
 			if (diagnostics != null) {
-				diagnostics
-					.add(new BasicDiagnostic(
-						Diagnostic.WARNING,
-						UMLValidator.DIAGNOSTIC_SOURCE,
-						UMLValidator.REGION__INITIAL_VERTEX,
-						UMLPlugin.INSTANCE
-							.getString(
-								"_UI_Region_InitialVertex_diagnostic", getMessageSubstitutions(context, region)), //$NON-NLS-1$
-						new Object[]{region}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.REGION__INITIAL_VERTEX,
+					UMLPlugin.INSTANCE.getString(
+						"_UI_Region_InitialVertex_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, region)),
+					new Object[]{region}));
 			}
 
 			return false;
@@ -134,8 +132,8 @@
 
 		for (Vertex subvertex : region.getSubvertices()) {
 
-			if (subvertex instanceof Pseudostate
-				&& ((Pseudostate) subvertex).getKind() == PseudostateKind.DEEP_HISTORY_LITERAL) {
+			if (subvertex instanceof Pseudostate && ((Pseudostate) subvertex)
+				.getKind() == PseudostateKind.DEEP_HISTORY_LITERAL) {
 
 				deepHistoryVertexCount++;
 			}
@@ -144,15 +142,13 @@
 		if (deepHistoryVertexCount > 1) {
 
 			if (diagnostics != null) {
-				diagnostics
-					.add(new BasicDiagnostic(
-						Diagnostic.WARNING,
-						UMLValidator.DIAGNOSTIC_SOURCE,
-						UMLValidator.REGION__DEEP_HISTORY_VERTEX,
-						UMLPlugin.INSTANCE
-							.getString(
-								"_UI_Region_DeepHistoryVertex_diagnostic", getMessageSubstitutions(context, region)), //$NON-NLS-1$
-						new Object[]{region}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.REGION__DEEP_HISTORY_VERTEX,
+					UMLPlugin.INSTANCE.getString(
+						"_UI_Region_DeepHistoryVertex_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, region)),
+					new Object[]{region}));
 			}
 
 			return false;
@@ -180,8 +176,8 @@
 
 		for (Vertex subvertex : region.getSubvertices()) {
 
-			if (subvertex instanceof Pseudostate
-				&& ((Pseudostate) subvertex).getKind() == PseudostateKind.SHALLOW_HISTORY_LITERAL) {
+			if (subvertex instanceof Pseudostate && ((Pseudostate) subvertex)
+				.getKind() == PseudostateKind.SHALLOW_HISTORY_LITERAL) {
 
 				shallowHistoryVertexCount++;
 			}
@@ -190,15 +186,13 @@
 		if (shallowHistoryVertexCount > 1) {
 
 			if (diagnostics != null) {
-				diagnostics
-					.add(new BasicDiagnostic(
-						Diagnostic.WARNING,
-						UMLValidator.DIAGNOSTIC_SOURCE,
-						UMLValidator.REGION__SHALLOW_HISTORY_VERTEX,
-						UMLPlugin.INSTANCE
-							.getString(
-								"_UI_Region_ShallowHistoryVertex_diagnostic", getMessageSubstitutions(context, region)), //$NON-NLS-1$
-						new Object[]{region}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.REGION__SHALLOW_HISTORY_VERTEX,
+					UMLPlugin.INSTANCE.getString(
+						"_UI_Region_ShallowHistoryVertex_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, region)),
+					new Object[]{region}));
 			}
 
 			return false;
@@ -225,15 +219,11 @@
 		if (region.getStateMachine() != null && region.getState() != null) {
 
 			if (diagnostics != null) {
-				diagnostics
-					.add(new BasicDiagnostic(
-						Diagnostic.WARNING,
-						UMLValidator.DIAGNOSTIC_SOURCE,
-						UMLValidator.REGION__OWNED,
-						UMLPlugin.INSTANCE
-							.getString(
-								"_UI_Region_Owned_diagnostic", getMessageSubstitutions(context, region)), //$NON-NLS-1$
-						new Object[]{region}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+					UMLValidator.DIAGNOSTIC_SOURCE, UMLValidator.REGION__OWNED,
+					UMLPlugin.INSTANCE.getString("_UI_Region_Owned_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, region)),
+					new Object[]{region}));
 			}
 
 			return false;
@@ -355,7 +345,8 @@
 			Region redefiningRegion = (Region) redefiningElement;
 			EList<Vertex> allSubvertices = getAllSubvertices(region);
 
-			for (Vertex redefiningSubvertex : redefiningRegion.getSubvertices()) {
+			for (Vertex redefiningSubvertex : redefiningRegion
+				.getSubvertices()) {
 
 				if (redefiningSubvertex instanceof State) {
 					State redefinedState = ((State) redefiningSubvertex)
@@ -432,8 +423,8 @@
 				for (StateMachine extendedStateMachine : stateMachine
 					.getExtendedStateMachines()) {
 
-					if (extendedStateMachine.getRegions().contains(
-						redefinedElement)) {
+					if (extendedStateMachine.getRegions()
+						.contains(redefinedElement)) {
 
 						return true;
 					}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RemoveStructuralFeatureValueActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RemoveStructuralFeatureValueActionOperations.java
index 332b1e2..c4e1c32 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RemoveStructuralFeatureValueActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RemoveStructuralFeatureValueActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -76,15 +76,17 @@
 		// 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.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT_AND_VALUE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateRemoveAtAndValue", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(removeStructuralFeatureValueAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{removeStructuralFeatureValueAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT_AND_VALUE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateRemoveAtAndValue", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(
+									removeStructuralFeatureValueAction,
+									context)}),
+					new Object[]{removeStructuralFeatureValueAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RemoveVariableValueActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RemoveVariableValueActionOperations.java
index 7fe820a..c142ec3 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RemoveVariableValueActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/RemoveVariableValueActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -76,15 +76,16 @@
 		// 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.REMOVE_VARIABLE_VALUE_ACTION__REMOVE_AT_AND_VALUE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateRemoveAtAndValue", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(removeVariableValueAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{removeVariableValueAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.REMOVE_VARIABLE_VALUE_ACTION__REMOVE_AT_AND_VALUE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateRemoveAtAndValue", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(removeVariableValueAction,
+									context)}),
+					new Object[]{removeVariableValueAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReplyActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReplyActionOperations.java
index 348a7ab..ee1f1fd 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReplyActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ReplyActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -74,15 +74,15 @@
 		// 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.REPLY_ACTION__PINS_MATCH_PARAMETER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validatePinsMatchParameter", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(replyAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{replyAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.REPLY_ACTION__PINS_MATCH_PARAMETER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validatePinsMatchParameter", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(replyAction, context)}),
+					new Object[]{replyAction}));
 			}
 			return false;
 		}
@@ -110,15 +110,15 @@
 		// 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.REPLY_ACTION__EVENT_ON_REPLY_TO_CALL_TRIGGER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEventOnReplyToCallTrigger", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(replyAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{replyAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.REPLY_ACTION__EVENT_ON_REPLY_TO_CALL_TRIGGER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEventOnReplyToCallTrigger", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(replyAction, context)}),
+					new Object[]{replyAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/SendObjectActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/SendObjectActionOperations.java
index a72c1df..bf89642 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/SendObjectActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/SendObjectActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey (CEA) - 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.SEND_OBJECT_ACTION__TYPE_TARGET_PIN,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeTargetPin", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(sendObjectAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{sendObjectAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.SEND_OBJECT_ACTION__TYPE_TARGET_PIN,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeTargetPin", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(sendObjectAction, context)}),
+					new Object[]{sendObjectAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/SendSignalActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/SendSignalActionOperations.java
index 7aa2e08..a15f54d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/SendSignalActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/SendSignalActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -62,24 +62,23 @@
 	 * <!-- end-model-doc -->
 	 * @generated
 	 */
-	public static boolean validateNumberOrder(
-			SendSignalAction sendSignalAction, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public static boolean validateNumberOrder(SendSignalAction sendSignalAction,
+			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.SEND_SIGNAL_ACTION__NUMBER_ORDER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNumberOrder", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(sendSignalAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{sendSignalAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.SEND_SIGNAL_ACTION__NUMBER_ORDER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNumberOrder", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(sendSignalAction, context)}),
+					new Object[]{sendSignalAction}));
 			}
 			return false;
 		}
@@ -107,15 +106,15 @@
 		// 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.SEND_SIGNAL_ACTION__TYPE_TARGET_PIN,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeTargetPin", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(sendSignalAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{sendSignalAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.SEND_SIGNAL_ACTION__TYPE_TARGET_PIN,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeTargetPin", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(sendSignalAction, context)}),
+					new Object[]{sendSignalAction}));
 			}
 			return false;
 		}
@@ -147,15 +146,15 @@
 		// 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.SEND_SIGNAL_ACTION__TYPE_ORDERING_MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeOrderingMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(sendSignalAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{sendSignalAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.SEND_SIGNAL_ACTION__TYPE_ORDERING_MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeOrderingMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(sendSignalAction, context)}),
+					new Object[]{sendSignalAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StartClassifierBehaviorActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StartClassifierBehaviorActionOperations.java
index a727d32..f7a5317 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StartClassifierBehaviorActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StartClassifierBehaviorActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,16 @@
 		// 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_CLASSIFIER_BEHAVIOR_ACTION__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(startClassifierBehaviorAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{startClassifierBehaviorAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.START_CLASSIFIER_BEHAVIOR_ACTION__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(startClassifierBehaviorAction,
+									context)}),
+					new Object[]{startClassifierBehaviorAction}));
 			}
 			return false;
 		}
@@ -107,15 +108,16 @@
 		// 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_CLASSIFIER_BEHAVIOR_ACTION__TYPE_HAS_CLASSIFIER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeHasClassifier", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(startClassifierBehaviorAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{startClassifierBehaviorAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.START_CLASSIFIER_BEHAVIOR_ACTION__TYPE_HAS_CLASSIFIER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeHasClassifier", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(startClassifierBehaviorAction,
+									context)}),
+					new Object[]{startClassifierBehaviorAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StartObjectBehaviorActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StartObjectBehaviorActionOperations.java
index 49744af..f6c9001 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StartObjectBehaviorActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StartObjectBehaviorActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2008, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -81,15 +81,16 @@
 		// 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}));
+				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", //$NON-NLS-1$
+						new Object[]{"validateTypeOfObject", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(startObjectBehaviorAction,
+									context)}),
+					new Object[]{startObjectBehaviorAction}));
 			}
 			return false;
 		}
@@ -117,15 +118,16 @@
 		// 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__NO_ONPORT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoOnport", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(startObjectBehaviorAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{startObjectBehaviorAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.START_OBJECT_BEHAVIOR_ACTION__NO_ONPORT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoOnport", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(startObjectBehaviorAction,
+									context)}),
+					new Object[]{startObjectBehaviorAction}));
 			}
 			return false;
 		}
@@ -231,15 +233,16 @@
 		// 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}));
+				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", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfObject", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(startObjectBehaviorAction,
+									context)}),
+					new Object[]{startObjectBehaviorAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StateMachineOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StateMachineOperations.java
index c6c23fd..b08fa3f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StateMachineOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StateMachineOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -83,15 +83,15 @@
 		// 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.STATE_MACHINE__CLASSIFIER_CONTEXT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateClassifierContext", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(stateMachine, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{stateMachine}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STATE_MACHINE__CLASSIFIER_CONTEXT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateClassifierContext", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(stateMachine, context)}),
+					new Object[]{stateMachine}));
 			}
 			return false;
 		}
@@ -118,15 +118,15 @@
 		// 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.STATE_MACHINE__CONTEXT_CLASSIFIER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateContextClassifier", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(stateMachine, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{stateMachine}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STATE_MACHINE__CONTEXT_CLASSIFIER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateContextClassifier", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(stateMachine, context)}),
+					new Object[]{stateMachine}));
 			}
 			return false;
 		}
@@ -247,7 +247,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static State LCAState(StateMachine stateMachine, Vertex v1, Vertex v2) {
+	public static State LCAState(StateMachine stateMachine, Vertex v1,
+			Vertex v2) {
 
 		if (v2 instanceof State && ancestor(stateMachine, v1, v2)) {
 			return (State) v2;
@@ -290,15 +291,15 @@
 		// 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.STATE_MACHINE__CONNECTION_POINTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateConnectionPoints", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(stateMachine, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{stateMachine}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STATE_MACHINE__CONNECTION_POINTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateConnectionPoints", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(stateMachine, context)}),
+					new Object[]{stateMachine}));
 			}
 			return false;
 		}
@@ -325,15 +326,15 @@
 		// 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.STATE_MACHINE__METHOD,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMethod", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(stateMachine, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{stateMachine}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STATE_MACHINE__METHOD,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMethod", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(stateMachine, context)}),
+					new Object[]{stateMachine}));
 			}
 			return false;
 		}
@@ -362,7 +363,8 @@
 			StateMachine redefiningStateMachine = (StateMachine) redefiningElement;
 			EList<Region> allRegions = getAllRegions(stateMachine);
 
-			for (Region redefiningRegion : redefiningStateMachine.getRegions()) {
+			for (Region redefiningRegion : redefiningStateMachine
+				.getRegions()) {
 				Region extendedRegion = redefiningRegion.getExtendedRegion();
 
 				if (allRegions.contains(extendedRegion)
@@ -401,9 +403,8 @@
 		if (redefinedElement instanceof StateMachine) {
 			BehavioredClassifier context = stateMachine.getContext();
 
-			return context != null
-				&& context.getRedefinedClassifiers().contains(
-					((StateMachine) redefinedElement).getContext());
+			return context != null && context.getRedefinedClassifiers()
+				.contains(((StateMachine) redefinedElement).getContext());
 		}
 
 		return false;
@@ -435,7 +436,8 @@
 		EList<Region> allRegions = new UniqueEList.FastCompare<Region>(
 			stateMachine.getRegions());
 
-		for (StateMachine extendedStateMachine : getAllExtendedStateMachines(stateMachine)) {
+		for (StateMachine extendedStateMachine : getAllExtendedStateMachines(
+			stateMachine)) {
 			allRegions.addAll(extendedStateMachine.getRegions());
 		}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StateOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StateOperations.java
index 8e1c847..b30869a 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StateOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StateOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -88,15 +88,15 @@
 		// 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.STATE__SUBMACHINE_STATES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSubmachineStates", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(state, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{state}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STATE__SUBMACHINE_STATES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSubmachineStates", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(state, context)}),
+					new Object[]{state}));
 			}
 			return false;
 		}
@@ -126,15 +126,16 @@
 		// 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.STATE__DESTINATIONS_OR_SOURCES_OF_TRANSITIONS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateDestinationsOrSourcesOfTransitions", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(state, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{state}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STATE__DESTINATIONS_OR_SOURCES_OF_TRANSITIONS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{
+							"validateDestinationsOrSourcesOfTransitions", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(state, context)}),
+					new Object[]{state}));
 			}
 			return false;
 		}
@@ -161,15 +162,15 @@
 		// 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.STATE__SUBMACHINE_OR_REGIONS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSubmachineOrRegions", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(state, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{state}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STATE__SUBMACHINE_OR_REGIONS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSubmachineOrRegions", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(state, context)}),
+					new Object[]{state}));
 			}
 			return false;
 		}
@@ -196,15 +197,15 @@
 		// 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.STATE__COMPOSITE_STATES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateCompositeStates", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(state, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{state}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STATE__COMPOSITE_STATES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateCompositeStates", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(state, context)}),
+					new Object[]{state}));
 			}
 			return false;
 		}
@@ -231,15 +232,15 @@
 		// 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.STATE__ENTRY_OR_EXIT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEntryOrExit", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(state, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{state}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STATE__ENTRY_OR_EXIT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEntryOrExit", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(state, context)}),
+					new Object[]{state}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StereotypeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StereotypeOperations.java
index e767489..d7c5b06 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StereotypeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StereotypeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 351777, 382718, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 351777, 382718, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -99,15 +99,15 @@
 		// 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.STEREOTYPE__BINARY_ASSOCIATIONS_ONLY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateBinaryAssociationsOnly", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(stereotype, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{stereotype}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STEREOTYPE__BINARY_ASSOCIATIONS_ONLY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateBinaryAssociationsOnly", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(stereotype, context)}),
+					new Object[]{stereotype}));
 			}
 			return false;
 		}
@@ -133,15 +133,15 @@
 		// 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.STEREOTYPE__NAME_NOT_CLASH,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNameNotClash", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(stereotype, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{stereotype}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STEREOTYPE__NAME_NOT_CLASH,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNameNotClash", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(stereotype, context)}),
+					new Object[]{stereotype}));
 			}
 			return false;
 		}
@@ -162,24 +162,23 @@
 	 * <!-- end-model-doc -->
 	 * @generated
 	 */
-	public static boolean validateAssociationEndOwnership(
-			Stereotype stereotype, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public static boolean validateAssociationEndOwnership(Stereotype stereotype,
+			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.STEREOTYPE__ASSOCIATION_END_OWNERSHIP,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateAssociationEndOwnership", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(stereotype, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{stereotype}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STEREOTYPE__ASSOCIATION_END_OWNERSHIP,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateAssociationEndOwnership", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(stereotype, context)}),
+					new Object[]{stereotype}));
 			}
 			return false;
 		}
@@ -205,15 +204,15 @@
 		// 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.STEREOTYPE__BASE_PROPERTY_UPPER_BOUND,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateBasePropertyUpperBound", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(stereotype, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{stereotype}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STEREOTYPE__BASE_PROPERTY_UPPER_BOUND,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateBasePropertyUpperBound", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(stereotype, context)}),
+					new Object[]{stereotype}));
 			}
 			return false;
 		}
@@ -240,15 +239,16 @@
 		// 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.STEREOTYPE__BASE_PROPERTY_MULTIPLICITY_SINGLE_EXTENSION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateBasePropertyMultiplicitySingleExtension", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(stereotype, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{stereotype}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STEREOTYPE__BASE_PROPERTY_MULTIPLICITY_SINGLE_EXTENSION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{
+							"validateBasePropertyMultiplicitySingleExtension", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(stereotype, context)}),
+					new Object[]{stereotype}));
 			}
 			return false;
 		}
@@ -275,15 +275,16 @@
 		// 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.STEREOTYPE__BASE_PROPERTY_MULTIPLICITY_MULTIPLE_EXTENSION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateBasePropertyMultiplicityMultipleExtension", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(stereotype, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{stereotype}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STEREOTYPE__BASE_PROPERTY_MULTIPLICITY_MULTIPLE_EXTENSION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{
+							"validateBasePropertyMultiplicityMultipleExtension", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(stereotype, context)}),
+					new Object[]{stereotype}));
 			}
 			return false;
 		}
@@ -311,15 +312,15 @@
 		// 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.STEREOTYPE__GENERALIZE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateGeneralize", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(stereotype, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{stereotype}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STEREOTYPE__GENERALIZE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateGeneralize", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(stereotype, context)}),
+					new Object[]{stereotype}));
 			}
 			return false;
 		}
@@ -357,9 +358,8 @@
 			throw new IllegalArgumentException(String.valueOf(metaclass));
 		}
 
-		if (!profile.getReferencedMetaclasses().contains(metaclass)
-			&& !profile.getReferencedMetamodels()
-				.contains(metaclass.getModel())) {
+		if (!profile.getReferencedMetaclasses().contains(metaclass) && !profile
+			.getReferencedMetamodels().contains(metaclass.getModel())) {
 
 			throw new IllegalArgumentException(String.valueOf(metaclass));
 		}
@@ -428,7 +428,8 @@
 		String keyword = getString(stereotype,
 			getValidJavaIdentifier(isEmpty(qualifiedName)
 				? EMPTY_STRING
-				: qualifiedName.replace(':', '_')), EMPTY_STRING, localize);
+				: qualifiedName.replace(':', '_')),
+			EMPTY_STRING, localize);
 
 		if (isEmpty(keyword)) {
 			keyword = getValidJavaIdentifier(stereotype.getName());
@@ -482,8 +483,7 @@
 	 */
 	public static EList<org.eclipse.uml2.uml.Class> getExtendedMetaclasses(
 			Stereotype stereotype) {
-		return ECollections.unmodifiableEList(getExtendedMetaclasses(
-			stereotype,
+		return ECollections.unmodifiableEList(getExtendedMetaclasses(stereotype,
 			new UniqueEList.FastCompare<org.eclipse.uml2.uml.Class>()));
 	}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StringExpressionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StringExpressionOperations.java
index 8699e4b..35a8d4f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StringExpressionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StringExpressionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -72,15 +72,15 @@
 		// 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.STRING_EXPRESSION__OPERANDS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOperands", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(stringExpression, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{stringExpression}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STRING_EXPRESSION__OPERANDS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOperands", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(stringExpression, context)}),
+					new Object[]{stringExpression}));
 			}
 			return false;
 		}
@@ -108,23 +108,23 @@
 		// 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.STRING_EXPRESSION__SUBEXPRESSIONS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateSubexpressions", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(stringExpression, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{stringExpression}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STRING_EXPRESSION__SUBEXPRESSIONS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateSubexpressions", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(stringExpression, context)}),
+					new Object[]{stringExpression}));
 			}
 			return false;
 		}
 		return true;
 	}
 
-	protected static StringBuffer stringValue(
-			StringExpression stringExpression, StringBuffer stringValue) {
+	protected static StringBuffer stringValue(StringExpression stringExpression,
+			StringBuffer stringValue) {
 		EList<StringExpression> subExpressions = stringExpression
 			.getSubExpressions();
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StructuralFeatureActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StructuralFeatureActionOperations.java
index 94eb7ac..d67aa71 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StructuralFeatureActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StructuralFeatureActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -73,15 +73,16 @@
 		// 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.STRUCTURAL_FEATURE_ACTION__NOT_STATIC,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNotStatic", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(structuralFeatureAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{structuralFeatureAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STRUCTURAL_FEATURE_ACTION__NOT_STATIC,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNotStatic", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(structuralFeatureAction,
+									context)}),
+					new Object[]{structuralFeatureAction}));
 			}
 			return false;
 		}
@@ -109,15 +110,16 @@
 		// 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.STRUCTURAL_FEATURE_ACTION__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(structuralFeatureAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{structuralFeatureAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STRUCTURAL_FEATURE_ACTION__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(structuralFeatureAction,
+									context)}),
+					new Object[]{structuralFeatureAction}));
 			}
 			return false;
 		}
@@ -146,15 +148,16 @@
 		// 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.STRUCTURAL_FEATURE_ACTION__OBJECT_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateObjectType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(structuralFeatureAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{structuralFeatureAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STRUCTURAL_FEATURE_ACTION__OBJECT_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateObjectType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(structuralFeatureAction,
+									context)}),
+					new Object[]{structuralFeatureAction}));
 			}
 			return false;
 		}
@@ -185,15 +188,16 @@
 		// 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.STRUCTURAL_FEATURE_ACTION__VISIBILITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateVisibility", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(structuralFeatureAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{structuralFeatureAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STRUCTURAL_FEATURE_ACTION__VISIBILITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateVisibility", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(structuralFeatureAction,
+									context)}),
+					new Object[]{structuralFeatureAction}));
 			}
 			return false;
 		}
@@ -221,15 +225,16 @@
 		// 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.STRUCTURAL_FEATURE_ACTION__ONE_FEATURING_CLASSIFIER,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOneFeaturingClassifier", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(structuralFeatureAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{structuralFeatureAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STRUCTURAL_FEATURE_ACTION__ONE_FEATURING_CLASSIFIER,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOneFeaturingClassifier", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(structuralFeatureAction,
+									context)}),
+					new Object[]{structuralFeatureAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StructuredActivityNodeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StructuredActivityNodeOperations.java
index 2afe3a4..975d45f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StructuredActivityNodeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/StructuredActivityNodeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -98,15 +98,16 @@
 		// 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.STRUCTURED_ACTIVITY_NODE__OUTPUT_PIN_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOutputPinEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(structuredActivityNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{structuredActivityNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STRUCTURED_ACTIVITY_NODE__OUTPUT_PIN_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOutputPinEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(structuredActivityNode,
+									context)}),
+					new Object[]{structuredActivityNode}));
 			}
 			return false;
 		}
@@ -135,15 +136,16 @@
 		// 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.STRUCTURED_ACTIVITY_NODE__EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(structuredActivityNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{structuredActivityNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STRUCTURED_ACTIVITY_NODE__EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(structuredActivityNode,
+									context)}),
+					new Object[]{structuredActivityNode}));
 			}
 			return false;
 		}
@@ -171,15 +173,16 @@
 		// 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.STRUCTURED_ACTIVITY_NODE__INPUT_PIN_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInputPinEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(structuredActivityNode, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{structuredActivityNode}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.STRUCTURED_ACTIVITY_NODE__INPUT_PIN_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInputPinEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(structuredActivityNode,
+									context)}),
+					new Object[]{structuredActivityNode}));
 			}
 			return false;
 		}
@@ -286,8 +289,8 @@
 			StructuredActivityNode structuredActivityNode) {
 		EList<ActivityNode> allOwnedNodes = new UniqueEList.FastCompare<ActivityNode>();
 
-		allOwnedNodes.addAll(ActionOperations
-			.allOwnedNodes(structuredActivityNode));
+		allOwnedNodes
+			.addAll(ActionOperations.allOwnedNodes(structuredActivityNode));
 
 		for (ActivityNode node : structuredActivityNode.getNodes()) {
 			allOwnedNodes.add(node);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateBindingOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateBindingOperations.java
index af930b4..e20e7f7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateBindingOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateBindingOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,15 @@
 		// 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.TEMPLATE_BINDING__PARAMETER_SUBSTITUTION_FORMAL,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateParameterSubstitutionFormal", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(templateBinding, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{templateBinding}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TEMPLATE_BINDING__PARAMETER_SUBSTITUTION_FORMAL,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateParameterSubstitutionFormal", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(templateBinding, context)}),
+					new Object[]{templateBinding}));
 			}
 			return false;
 		}
@@ -106,15 +106,15 @@
 		// 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.TEMPLATE_BINDING__ONE_PARAMETER_SUBSTITUTION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOneParameterSubstitution", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(templateBinding, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{templateBinding}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TEMPLATE_BINDING__ONE_PARAMETER_SUBSTITUTION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOneParameterSubstitution", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(templateBinding, context)}),
+					new Object[]{templateBinding}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateParameterOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateParameterOperations.java
index e31b10c..396d025 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateParameterOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateParameterOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.TEMPLATE_PARAMETER__MUST_BE_COMPATIBLE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMustBeCompatible", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(templateParameter, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{templateParameter}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TEMPLATE_PARAMETER__MUST_BE_COMPATIBLE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMustBeCompatible", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(templateParameter, context)}),
+					new Object[]{templateParameter}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateParameterSubstitutionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateParameterSubstitutionOperations.java
index 5913161..b8aacd0 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateParameterSubstitutionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateParameterSubstitutionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,16 @@
 		// 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.TEMPLATE_PARAMETER_SUBSTITUTION__MUST_BE_COMPATIBLE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMustBeCompatible", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(templateParameterSubstitution, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{templateParameterSubstitution}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TEMPLATE_PARAMETER_SUBSTITUTION__MUST_BE_COMPATIBLE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMustBeCompatible", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(templateParameterSubstitution,
+									context)}),
+					new Object[]{templateParameterSubstitution}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateSignatureOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateSignatureOperations.java
index 73012bd..1af9f81 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateSignatureOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TemplateSignatureOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,15 @@
 		// 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.TEMPLATE_SIGNATURE__OWN_ELEMENTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOwnElements", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(templateSignature, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{templateSignature}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TEMPLATE_SIGNATURE__OWN_ELEMENTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOwnElements", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(templateSignature, context)}),
+					new Object[]{templateSignature}));
 			}
 			return false;
 		}
@@ -107,15 +107,15 @@
 		// 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.TEMPLATE_SIGNATURE__UNIQUE_PARAMETERS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateUniqueParameters", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(templateSignature, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{templateSignature}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TEMPLATE_SIGNATURE__UNIQUE_PARAMETERS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateUniqueParameters", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(templateSignature, context)}),
+					new Object[]{templateSignature}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TestIdentityActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TestIdentityActionOperations.java
index 0fd8373..302b0ad 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TestIdentityActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TestIdentityActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,15 @@
 		// 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.TEST_IDENTITY_ACTION__NO_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(testIdentityAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{testIdentityAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TEST_IDENTITY_ACTION__NO_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(testIdentityAction, context)}),
+					new Object[]{testIdentityAction}));
 			}
 			return false;
 		}
@@ -106,15 +106,15 @@
 		// 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.TEST_IDENTITY_ACTION__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(testIdentityAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{testIdentityAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TEST_IDENTITY_ACTION__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(testIdentityAction, context)}),
+					new Object[]{testIdentityAction}));
 			}
 			return false;
 		}
@@ -142,15 +142,15 @@
 		// 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.TEST_IDENTITY_ACTION__RESULT_IS_BOOLEAN,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateResultIsBoolean", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(testIdentityAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{testIdentityAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TEST_IDENTITY_ACTION__RESULT_IS_BOOLEAN,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateResultIsBoolean", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(testIdentityAction, context)}),
+					new Object[]{testIdentityAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TimeConstraintOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TimeConstraintOperations.java
index 7d66427..c482894 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TimeConstraintOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TimeConstraintOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey (CEA) - 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.TIME_CONSTRAINT__HAS_ONE_CONSTRAINED_ELEMENT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateHasOneConstrainedElement", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(timeConstraint, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{timeConstraint}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TIME_CONSTRAINT__HAS_ONE_CONSTRAINED_ELEMENT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateHasOneConstrainedElement", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(timeConstraint, context)}),
+					new Object[]{timeConstraint}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TimeEventOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TimeEventOperations.java
index 853e535..fd38183 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TimeEventOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TimeEventOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -68,15 +68,15 @@
 		// 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.TIME_EVENT__WHEN_NON_NEGATIVE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateWhenNonNegative", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(timeEvent, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{timeEvent}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TIME_EVENT__WHEN_NON_NEGATIVE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateWhenNonNegative", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(timeEvent, context)}),
+					new Object[]{timeEvent}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TimeExpressionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TimeExpressionOperations.java
index a3c971c..5c8025d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TimeExpressionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TimeExpressionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -68,15 +68,15 @@
 		// 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.TIME_EXPRESSION__NO_EXPR_REQUIRES_OBSERVATION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoExprRequiresObservation", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(timeExpression, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{timeExpression}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TIME_EXPRESSION__NO_EXPR_REQUIRES_OBSERVATION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoExprRequiresObservation", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(timeExpression, context)}),
+					new Object[]{timeExpression}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TransitionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TransitionOperations.java
index 789db6f..f439194 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TransitionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TransitionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -87,15 +87,15 @@
 		// 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.TRANSITION__FORK_SEGMENT_GUARDS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateForkSegmentGuards", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(transition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{transition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TRANSITION__FORK_SEGMENT_GUARDS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateForkSegmentGuards", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(transition, context)}),
+					new Object[]{transition}));
 			}
 			return false;
 		}
@@ -122,15 +122,15 @@
 		// 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.TRANSITION__JOIN_SEGMENT_GUARDS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateJoinSegmentGuards", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(transition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{transition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TRANSITION__JOIN_SEGMENT_GUARDS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateJoinSegmentGuards", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(transition, context)}),
+					new Object[]{transition}));
 			}
 			return false;
 		}
@@ -158,15 +158,15 @@
 		// 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.TRANSITION__STATE_IS_INTERNAL,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateStateIsInternal", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(transition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{transition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TRANSITION__STATE_IS_INTERNAL,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateStateIsInternal", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(transition, context)}),
+					new Object[]{transition}));
 			}
 			return false;
 		}
@@ -193,15 +193,15 @@
 		// 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.TRANSITION__FORK_SEGMENT_STATE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateForkSegmentState", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(transition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{transition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TRANSITION__FORK_SEGMENT_STATE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateForkSegmentState", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(transition, context)}),
+					new Object[]{transition}));
 			}
 			return false;
 		}
@@ -228,15 +228,15 @@
 		// 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.TRANSITION__JOIN_SEGMENT_STATE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateJoinSegmentState", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(transition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{transition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TRANSITION__JOIN_SEGMENT_STATE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateJoinSegmentState", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(transition, context)}),
+					new Object[]{transition}));
 			}
 			return false;
 		}
@@ -263,15 +263,15 @@
 		// 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.TRANSITION__OUTGOING_PSEUDOSTATES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateOutgoingPseudostates", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(transition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{transition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TRANSITION__OUTGOING_PSEUDOSTATES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateOutgoingPseudostates", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(transition, context)}),
+					new Object[]{transition}));
 			}
 			return false;
 		}
@@ -299,15 +299,15 @@
 		// 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.TRANSITION__INITIAL_TRANSITION,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateInitialTransition", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(transition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{transition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TRANSITION__INITIAL_TRANSITION,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateInitialTransition", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(transition, context)}),
+					new Object[]{transition}));
 			}
 			return false;
 		}
@@ -336,15 +336,15 @@
 		// 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.TRANSITION__STATE_IS_LOCAL,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateStateIsLocal", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(transition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{transition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TRANSITION__STATE_IS_LOCAL,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateStateIsLocal", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(transition, context)}),
+					new Object[]{transition}));
 			}
 			return false;
 		}
@@ -433,10 +433,10 @@
 				sources.add(redefiningSource);
 			}
 
-			return RedefinableElementOperations.excludeRedefinedElements(
-				sources).size() < 2
-				&& transition.getTriggers().equals(
-					redefiningTransition.getTriggers());
+			return RedefinableElementOperations
+				.excludeRedefinedElements(sources).size() < 2
+				&& transition.getTriggers()
+					.equals(redefiningTransition.getTriggers());
 		}
 
 		return false;
@@ -463,15 +463,15 @@
 		// 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.TRANSITION__STATE_IS_EXTERNAL,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateStateIsExternal", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(transition, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{transition}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TRANSITION__STATE_IS_EXTERNAL,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateStateIsExternal", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(transition, context)}),
+					new Object[]{transition}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TriggerOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TriggerOperations.java
index ace6a58..a5f7727 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TriggerOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TriggerOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 451350
+ *   Kenn Hussey (CEA) - 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -68,15 +68,15 @@
 		// 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.TRIGGER__TRIGGER_WITH_PORTS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTriggerWithPorts", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(trigger, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{trigger}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.TRIGGER__TRIGGER_WITH_PORTS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTriggerWithPorts", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(trigger, context)}),
+					new Object[]{trigger}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TypeOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TypeOperations.java
index 9d417d8..c09f965 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TypeOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/TypeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188
- *   Kenn Hussey (CEA) - 418466, 451350, 483781
+ *   Kenn Hussey (CEA) - 418466, 451350, 483781, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -98,8 +98,8 @@
 			@Override
 			public Property caseAssociationClass(
 					AssociationClass associationClass) {
-				return associationClass
-					.createOwnedAttribute(name, propertyType);
+				return associationClass.createOwnedAttribute(name,
+					propertyType);
 			}
 
 			@Override
@@ -152,10 +152,11 @@
 			AggregationKind aggregation, String name, int lower, int upper,
 			Type endType) {
 		EList<Property> ownedAttributes = getOwnedAttributes(type);
-		Property associationEnd = createOwnedProperty(ownedAttributes == null
-			|| !isNavigable
-			? association
-			: type, name, endType, lower, upper);
+		Property associationEnd = createOwnedProperty(
+			ownedAttributes == null || !isNavigable
+				? association
+				: type,
+			name, endType, lower, upper);
 
 		associationEnd.setAggregation(aggregation);
 
@@ -249,9 +250,11 @@
 	public static EList<Association> getAssociations(Type type) {
 		EList<Association> associations = new UniqueEList.FastCompare<Association>();
 
-		for (EStructuralFeature.Setting nonNavigableInverseReference : getNonNavigableInverseReferences(type)) {
+		for (EStructuralFeature.Setting nonNavigableInverseReference : getNonNavigableInverseReferences(
+			type)) {
 
-			if (nonNavigableInverseReference.getEStructuralFeature() == UMLPackage.Literals.TYPED_ELEMENT__TYPE) {
+			if (nonNavigableInverseReference
+				.getEStructuralFeature() == UMLPackage.Literals.TYPED_ELEMENT__TYPE) {
 				EObject eObject = nonNavigableInverseReference.getEObject();
 
 				if (eObject instanceof Property) {
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/UnmarshallActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/UnmarshallActionOperations.java
index bafcb53..180889f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/UnmarshallActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/UnmarshallActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -73,15 +73,15 @@
 		// 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.UNMARSHALL_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(unmarshallAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{unmarshallAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.UNMARSHALL_ACTION__MULTIPLICITY_OF_OBJECT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfObject", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(unmarshallAction, context)}),
+					new Object[]{unmarshallAction}));
 			}
 			return false;
 		}
@@ -108,15 +108,15 @@
 		// 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.UNMARSHALL_ACTION__OBJECT_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateObjectType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(unmarshallAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{unmarshallAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.UNMARSHALL_ACTION__OBJECT_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateObjectType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(unmarshallAction, context)}),
+					new Object[]{unmarshallAction}));
 			}
 			return false;
 		}
@@ -144,15 +144,15 @@
 		// 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.UNMARSHALL_ACTION__NUMBER_OF_RESULT,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNumberOfResult", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(unmarshallAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{unmarshallAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.UNMARSHALL_ACTION__NUMBER_OF_RESULT,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNumberOfResult", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(unmarshallAction, context)}),
+					new Object[]{unmarshallAction}));
 			}
 			return false;
 		}
@@ -184,15 +184,15 @@
 		// 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.UNMARSHALL_ACTION__TYPE_ORDERING_AND_MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeOrderingAndMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(unmarshallAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{unmarshallAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.UNMARSHALL_ACTION__TYPE_ORDERING_AND_MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeOrderingAndMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(unmarshallAction, context)}),
+					new Object[]{unmarshallAction}));
 			}
 			return false;
 		}
@@ -220,15 +220,15 @@
 		// 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.UNMARSHALL_ACTION__STRUCTURAL_FEATURE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateStructuralFeature", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(unmarshallAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{unmarshallAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.UNMARSHALL_ACTION__STRUCTURAL_FEATURE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateStructuralFeature", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(unmarshallAction, context)}),
+					new Object[]{unmarshallAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/UseCaseOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/UseCaseOperations.java
index ad14b52..c7b6e00 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/UseCaseOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/UseCaseOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -78,9 +78,10 @@
 			if (diagnostics != null) {
 				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
 					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.USE_CASE__MUST_HAVE_NAME, UMLPlugin.INSTANCE
-						.getString("_UI_UseCase_MustHaveName_diagnostic", //$NON-NLS-1$
-							getMessageSubstitutions(context, useCase)),
+					UMLValidator.USE_CASE__MUST_HAVE_NAME,
+					UMLPlugin.INSTANCE.getString(
+						"_UI_UseCase_MustHaveName_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, useCase)),
 					new Object[]{useCase}));
 			}
 
@@ -164,17 +165,15 @@
 					if (!subjects.isEmpty()) {
 
 						if (diagnostics != null) {
-							diagnostics
-								.add(new BasicDiagnostic(
-									Diagnostic.WARNING,
-									UMLValidator.DIAGNOSTIC_SOURCE,
-									UMLValidator.USE_CASE__NO_ASSOCIATION_TO_USE_CASE,
-									UMLPlugin.INSTANCE
-										.getString(
-											"_UI_UseCase_NoAssociationToUseCase_diagnostic", //$NON-NLS-1$
-											getMessageSubstitutions(context,
-												useCase1, useCase2)),
-									new Object[]{useCase1, useCase2}));
+							diagnostics.add(new BasicDiagnostic(
+								Diagnostic.WARNING,
+								UMLValidator.DIAGNOSTIC_SOURCE,
+								UMLValidator.USE_CASE__NO_ASSOCIATION_TO_USE_CASE,
+								UMLPlugin.INSTANCE.getString(
+									"_UI_UseCase_NoAssociationToUseCase_diagnostic", //$NON-NLS-1$
+									getMessageSubstitutions(context, useCase1,
+										useCase2)),
+								new Object[]{useCase1, useCase2}));
 						}
 
 						return false;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ValuePinOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ValuePinOperations.java
index ac162f4..fe62ba3 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ValuePinOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ValuePinOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -69,15 +69,15 @@
 		// 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.VALUE_PIN__COMPATIBLE_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateCompatibleType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(valuePin, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{valuePin}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.VALUE_PIN__COMPATIBLE_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateCompatibleType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(valuePin, context)}),
+					new Object[]{valuePin}));
 			}
 			return false;
 		}
@@ -104,15 +104,15 @@
 		// 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.VALUE_PIN__NO_INCOMING_EDGES,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateNoIncomingEdges", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(valuePin, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{valuePin}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.VALUE_PIN__NO_INCOMING_EDGES,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateNoIncomingEdges", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(valuePin, context)}),
+					new Object[]{valuePin}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ValueSpecificationActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ValueSpecificationActionOperations.java
index c3d209b..0b4024b 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ValueSpecificationActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ValueSpecificationActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,16 @@
 		// 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.VALUE_SPECIFICATION_ACTION__COMPATIBLE_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateCompatibleType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(valueSpecificationAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{valueSpecificationAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.VALUE_SPECIFICATION_ACTION__COMPATIBLE_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateCompatibleType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(valueSpecificationAction,
+									context)}),
+					new Object[]{valueSpecificationAction}));
 			}
 			return false;
 		}
@@ -106,15 +107,16 @@
 		// 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.VALUE_SPECIFICATION_ACTION__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(valueSpecificationAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{valueSpecificationAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.VALUE_SPECIFICATION_ACTION__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(valueSpecificationAction,
+									context)}),
+					new Object[]{valueSpecificationAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ValueSpecificationOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ValueSpecificationOperations.java
index 99020d7..5c2f223 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ValueSpecificationOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/ValueSpecificationOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -214,8 +214,8 @@
 				Type type = instanceValue.getType();
 
 				if (type instanceof Enumeration) {
-					instanceValue.setInstance(((Enumeration) type)
-						.getOwnedLiteral(newValue));
+					instanceValue.setInstance(
+						((Enumeration) type).getOwnedLiteral(newValue));
 				} else {
 					InstanceSpecification instance = instanceValue
 						.getInstance();
@@ -237,8 +237,8 @@
 
 			@Override
 			public Object caseLiteralBoolean(LiteralBoolean literalBoolean) {
-				literalBoolean.setValue(Boolean.valueOf(newValue)
-					.booleanValue());
+				literalBoolean
+					.setValue(Boolean.valueOf(newValue).booleanValue());
 				return literalBoolean;
 			}
 
@@ -268,7 +268,8 @@
 			}
 
 			@Override
-			public Object caseOpaqueExpression(OpaqueExpression opaqueExpression) {
+			public Object caseOpaqueExpression(
+					OpaqueExpression opaqueExpression) {
 				EList<String> bodies = opaqueExpression.getBodies();
 
 				if (bodies.isEmpty()) {
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/VariableActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/VariableActionOperations.java
index 8fbf428..35511b2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/VariableActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/VariableActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -60,24 +60,23 @@
 	 * <!-- end-model-doc -->
 	 * @generated
 	 */
-	public static boolean validateScopeOfVariable(
-			VariableAction variableAction, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public static boolean validateScopeOfVariable(VariableAction variableAction,
+			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.VARIABLE_ACTION__SCOPE_OF_VARIABLE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateScopeOfVariable", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(variableAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{variableAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.VARIABLE_ACTION__SCOPE_OF_VARIABLE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateScopeOfVariable", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(variableAction, context)}),
+					new Object[]{variableAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/VertexOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/VertexOperations.java
index 6840179..06f07a2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/VertexOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/VertexOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 323181
- *   Kenn Hussey (CEA) - 327039, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -200,9 +200,11 @@
 	public static EList<Transition> getIncomings(Vertex vertex) {
 		EList<Transition> incomings = new UniqueEList.FastCompare<Transition>();
 
-		for (EStructuralFeature.Setting setting : getNonNavigableInverseReferences(vertex)) {
+		for (EStructuralFeature.Setting setting : getNonNavigableInverseReferences(
+			vertex)) {
 
-			if (setting.getEStructuralFeature() == UMLPackage.Literals.TRANSITION__TARGET) {
+			if (setting
+				.getEStructuralFeature() == UMLPackage.Literals.TRANSITION__TARGET) {
 				incomings.add((Transition) setting.getEObject());
 			}
 		}
@@ -300,9 +302,11 @@
 	public static EList<Transition> getOutgoings(Vertex vertex) {
 		EList<Transition> outgoings = new UniqueEList.FastCompare<Transition>();
 
-		for (EStructuralFeature.Setting setting : getNonNavigableInverseReferences(vertex)) {
+		for (EStructuralFeature.Setting setting : getNonNavigableInverseReferences(
+			vertex)) {
 
-			if (setting.getEStructuralFeature() == UMLPackage.Literals.TRANSITION__SOURCE) {
+			if (setting
+				.getEStructuralFeature() == UMLPackage.Literals.TRANSITION__SOURCE) {
 				outgoings.add((Transition) setting.getEObject());
 			}
 		}
@@ -338,9 +342,8 @@
 		} else {
 			State containerState = container.getState();
 
-			return containerState == s
-				|| (containerState != null && containerState
-					.isContainedInState(s));
+			return containerState == s || (containerState != null
+				&& containerState.isContainedInState(s));
 		}
 	}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/WriteLinkActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/WriteLinkActionOperations.java
index 5b0ffde..1741b04 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/WriteLinkActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/WriteLinkActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466, 451350
+ *   Kenn Hussey (CEA) - 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -73,15 +73,15 @@
 		// 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_LINK_ACTION__ALLOW_ACCESS,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateAllowAccess", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(writeLinkAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{writeLinkAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.WRITE_LINK_ACTION__ALLOW_ACCESS,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateAllowAccess", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(writeLinkAction, context)}),
+					new Object[]{writeLinkAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/WriteStructuralFeatureActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/WriteStructuralFeatureActionOperations.java
index d6e583a..a2cb192 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/WriteStructuralFeatureActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/WriteStructuralFeatureActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -72,15 +72,16 @@
 		// 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}));
+				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", //$NON-NLS-1$
+						new Object[]{"validateTypeOfResult", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(writeStructuralFeatureAction,
+									context)}),
+					new Object[]{writeStructuralFeatureAction}));
 			}
 			return false;
 		}
@@ -108,15 +109,16 @@
 		// 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}));
+				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", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfResult", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(writeStructuralFeatureAction,
+									context)}),
+					new Object[]{writeStructuralFeatureAction}));
 			}
 			return false;
 		}
@@ -144,15 +146,16 @@
 		// 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_VALUE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateTypeOfValue", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(writeStructuralFeatureAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{writeStructuralFeatureAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.WRITE_STRUCTURAL_FEATURE_ACTION__TYPE_OF_VALUE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateTypeOfValue", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(writeStructuralFeatureAction,
+									context)}),
+					new Object[]{writeStructuralFeatureAction}));
 			}
 			return false;
 		}
@@ -180,15 +183,16 @@
 		// 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_VALUE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicityOfValue", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(writeStructuralFeatureAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{writeStructuralFeatureAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.WRITE_STRUCTURAL_FEATURE_ACTION__MULTIPLICITY_OF_VALUE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicityOfValue", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(writeStructuralFeatureAction,
+									context)}),
+					new Object[]{writeStructuralFeatureAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/WriteVariableActionOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/WriteVariableActionOperations.java
index 1831a6d..d908ba2 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/WriteVariableActionOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/WriteVariableActionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.internal.operations;
@@ -70,15 +70,15 @@
 		// 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_VARIABLE_ACTION__VALUE_TYPE,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateValueType", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(writeVariableAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{writeVariableAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.WRITE_VARIABLE_ACTION__VALUE_TYPE,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateValueType", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(writeVariableAction, context)}),
+					new Object[]{writeVariableAction}));
 			}
 			return false;
 		}
@@ -106,15 +106,15 @@
 		// 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_VARIABLE_ACTION__MULTIPLICITY,
-						org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE
-							.getString(
-								"_UI_GenericInvariant_diagnostic", new Object[]{"validateMultiplicity", org.eclipse.emf.ecore.util.EObjectValidator.getObjectLabel(writeVariableAction, context)}), //$NON-NLS-1$ //$NON-NLS-2$
-						new Object[]{writeVariableAction}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.ERROR,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.WRITE_VARIABLE_ACTION__MULTIPLICITY,
+					org.eclipse.emf.ecore.plugin.EcorePlugin.INSTANCE.getString(
+						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
+						new Object[]{"validateMultiplicity", //$NON-NLS-1$
+							org.eclipse.emf.ecore.util.EObjectValidator
+								.getObjectLabel(writeVariableAction, context)}),
+					new Object[]{writeVariableAction}));
 			}
 			return false;
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLAdapterFactory.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLAdapterFactory.java
index 6c5db47..f0fe8a7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLAdapterFactory.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLAdapterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188
- *   Kenn Hussey (CEA) - 327039, 351774, 418466
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 485756
  *
  */
 package org.eclipse.uml2.uml.util;
@@ -810,7 +810,8 @@
 		}
 
 		@Override
-		public Adapter caseEncapsulatedClassifier(EncapsulatedClassifier object) {
+		public Adapter caseEncapsulatedClassifier(
+				EncapsulatedClassifier object) {
 			return createEncapsulatedClassifierAdapter();
 		}
 
@@ -841,7 +842,8 @@
 		}
 
 		@Override
-		public Adapter caseStructuredActivityNode(StructuredActivityNode object) {
+		public Adapter caseStructuredActivityNode(
+				StructuredActivityNode object) {
 			return createStructuredActivityNodeAdapter();
 		}
 
@@ -955,7 +957,8 @@
 		}
 
 		@Override
-		public Adapter caseAddVariableValueAction(AddVariableValueAction object) {
+		public Adapter caseAddVariableValueAction(
+				AddVariableValueAction object) {
 			return createAddVariableValueActionAdapter();
 		}
 
@@ -990,7 +993,8 @@
 		}
 
 		@Override
-		public Adapter caseClearAssociationAction(ClearAssociationAction object) {
+		public Adapter caseClearAssociationAction(
+				ClearAssociationAction object) {
 			return createClearAssociationActionAdapter();
 		}
 
@@ -1021,7 +1025,8 @@
 		}
 
 		@Override
-		public Adapter caseCreateLinkObjectAction(CreateLinkObjectAction object) {
+		public Adapter caseCreateLinkObjectAction(
+				CreateLinkObjectAction object) {
 			return createCreateLinkObjectActionAdapter();
 		}
 
@@ -1036,7 +1041,8 @@
 		}
 
 		@Override
-		public Adapter caseLinkEndDestructionData(LinkEndDestructionData object) {
+		public Adapter caseLinkEndDestructionData(
+				LinkEndDestructionData object) {
 			return createLinkEndDestructionDataAdapter();
 		}
 
@@ -1115,7 +1121,8 @@
 		}
 
 		@Override
-		public Adapter caseReclassifyObjectAction(ReclassifyObjectAction object) {
+		public Adapter caseReclassifyObjectAction(
+				ReclassifyObjectAction object) {
 			return createReclassifyObjectActionAdapter();
 		}
 
@@ -1406,7 +1413,8 @@
 		}
 
 		@Override
-		public Adapter caseExecutionSpecification(ExecutionSpecification object) {
+		public Adapter caseExecutionSpecification(
+				ExecutionSpecification object) {
 			return createExecutionSpecificationAdapter();
 		}
 
@@ -1422,7 +1430,8 @@
 		}
 
 		@Override
-		public Adapter caseConsiderIgnoreFragment(ConsiderIgnoreFragment object) {
+		public Adapter caseConsiderIgnoreFragment(
+				ConsiderIgnoreFragment object) {
 			return createConsiderIgnoreFragmentAdapter();
 		}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLDerivedUnionAdapter.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLDerivedUnionAdapter.java
index e5229e2..8e0a987 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLDerivedUnionAdapter.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLDerivedUnionAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 CEA and others.
+ * Copyright (c) 2013, 2016 CEA 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
- *   Kenn Hussey (CEA) - 418466
+ *   Kenn Hussey (CEA) - 418466, 485756
  *
  */
 package org.eclipse.uml2.uml.util;
@@ -301,7 +301,8 @@
 				notifyTemplateBindingChanged(notification, eClass);
 				break;
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION :
-				notifyTemplateParameterSubstitutionChanged(notification, eClass);
+				notifyTemplateParameterSubstitutionChanged(notification,
+					eClass);
 				break;
 			case UMLPackage.ASSOCIATION :
 				notifyAssociationChanged(notification, eClass);
@@ -638,7 +639,8 @@
 				notifySequenceNodeChanged(notification, eClass);
 				break;
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION :
-				notifyStartClassifierBehaviorActionChanged(notification, eClass);
+				notifyStartClassifierBehaviorActionChanged(notification,
+					eClass);
 				break;
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION :
 				notifyStartObjectBehaviorActionChanged(notification, eClass);
@@ -986,7 +988,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyCommentChanged(Notification notification, EClass eClass) {
+	protected void notifyCommentChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Comment.class)) {
 			case UMLPackage.COMMENT__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -1209,7 +1212,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyClassChanged(Notification notification, EClass eClass) {
+	protected void notifyClassChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(org.eclipse.uml2.uml.Class.class)) {
 			case UMLPackage.CLASS__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -1494,7 +1498,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyPackageChanged(Notification notification, EClass eClass) {
+	protected void notifyPackageChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(org.eclipse.uml2.uml.Package.class)) {
 			case UMLPackage.PACKAGE__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -1705,7 +1710,8 @@
 	 */
 	protected void notifyTemplateParameterSubstitutionChanged(
 			Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(TemplateParameterSubstitution.class)) {
+		switch (notification
+			.getFeatureID(TemplateParameterSubstitution.class)) {
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
@@ -1809,7 +1815,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyProfileChanged(Notification notification, EClass eClass) {
+	protected void notifyProfileChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Profile.class)) {
 			case UMLPackage.PROFILE__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -2324,9 +2331,7 @@
 					UMLPackage.Literals.ELEMENT__OWNER);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.PROPERTY__INTERFACE :
@@ -2336,9 +2341,7 @@
 					UMLPackage.Literals.ELEMENT__OWNER);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.PROPERTY__ASSOCIATION_END :
@@ -2356,9 +2359,7 @@
 					UMLPackage.Literals.ELEMENT__OWNER);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.PROPERTY__DEFAULT_VALUE :
@@ -2372,9 +2373,7 @@
 					UMLPackage.Literals.NAMED_ELEMENT__NAMESPACE);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.ELEMENT__OWNER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.PROPERTY__REDEFINED_PROPERTY :
@@ -2957,9 +2956,7 @@
 					UMLPackage.Literals.NAMED_ELEMENT__NAMESPACE);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.ELEMENT__OWNER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.OPERATION__DATATYPE :
@@ -2969,9 +2966,7 @@
 					UMLPackage.Literals.NAMED_ELEMENT__NAMESPACE);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.ELEMENT__OWNER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.OPERATION__INTERFACE :
@@ -2981,9 +2976,7 @@
 					UMLPackage.Literals.NAMED_ELEMENT__NAMESPACE);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.ELEMENT__OWNER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.OPERATION__POSTCONDITION :
@@ -3371,7 +3364,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifySignalChanged(Notification notification, EClass eClass) {
+	protected void notifySignalChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Signal.class)) {
 			case UMLPackage.SIGNAL__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -3686,9 +3680,7 @@
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 				break;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__CONTEXT :
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_PARAMETER :
@@ -3950,9 +3942,7 @@
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 				break;
 			case UMLPackage.STATE_MACHINE__CONTEXT :
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.STATE_MACHINE__OWNED_PARAMETER :
@@ -4062,7 +4052,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyRegionChanged(Notification notification, EClass eClass) {
+	protected void notifyRegionChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Region.class)) {
 			case UMLPackage.REGION__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -4145,7 +4136,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyStateChanged(Notification notification, EClass eClass) {
+	protected void notifyStateChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(State.class)) {
 			case UMLPackage.STATE__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -4292,7 +4284,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyTriggerChanged(Notification notification, EClass eClass) {
+	protected void notifyTriggerChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Trigger.class)) {
 			case UMLPackage.TRIGGER__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -4354,9 +4347,7 @@
 					UMLPackage.Literals.ELEMENT__OWNER);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.PORT__INTERFACE :
@@ -4366,9 +4357,7 @@
 					UMLPackage.Literals.ELEMENT__OWNER);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.PORT__ASSOCIATION_END :
@@ -4386,9 +4375,7 @@
 					UMLPackage.Literals.ELEMENT__OWNER);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.PORT__DEFAULT_VALUE :
@@ -4402,9 +4389,7 @@
 					UMLPackage.Literals.NAMED_ELEMENT__NAMESPACE);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.ELEMENT__OWNER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.PORT__REDEFINED_PROPERTY :
@@ -4864,9 +4849,7 @@
 					UMLPackage.Literals.ELEMENT__OWNER);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.EXTENSION_END__INTERFACE :
@@ -4876,9 +4859,7 @@
 					UMLPackage.Literals.ELEMENT__OWNER);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.EXTENSION_END__ASSOCIATION_END :
@@ -4896,9 +4877,7 @@
 					UMLPackage.Literals.ELEMENT__OWNER);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.FEATURE__FEATURING_CLASSIFIER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.EXTENSION_END__DEFAULT_VALUE :
@@ -4912,9 +4891,7 @@
 					UMLPackage.Literals.NAMED_ELEMENT__NAMESPACE);
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.ELEMENT__OWNER);
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.EXTENSION_END__REDEFINED_PROPERTY :
@@ -4932,7 +4909,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyModelChanged(Notification notification, EClass eClass) {
+	protected void notifyModelChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Model.class)) {
 			case UMLPackage.MODEL__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -5231,8 +5209,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyInstanceSpecificationChanged(
-			Notification notification, EClass eClass) {
+	protected void notifyInstanceSpecificationChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(InstanceSpecification.class)) {
 			case UMLPackage.INSTANCE_SPECIFICATION__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -5432,7 +5410,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyUsageChanged(Notification notification, EClass eClass) {
+	protected void notifyUsageChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Usage.class)) {
 			case UMLPackage.USAGE__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -5775,9 +5754,7 @@
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINED_ELEMENT);
 				break;
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__CLASSIFIER :
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 		}
@@ -5791,7 +5768,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyUseCaseChanged(Notification notification, EClass eClass) {
+	protected void notifyUseCaseChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(UseCase.class)) {
 			case UMLPackage.USE_CASE__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -5946,7 +5924,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyExtendChanged(Notification notification, EClass eClass) {
+	protected void notifyExtendChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Extend.class)) {
 			case UMLPackage.EXTEND__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -6031,7 +6010,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyIncludeChanged(Notification notification, EClass eClass) {
+	protected void notifyIncludeChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Include.class)) {
 			case UMLPackage.INCLUDE__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -6212,7 +6192,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyImageChanged(Notification notification, EClass eClass) {
+	protected void notifyImageChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Image.class)) {
 			case UMLPackage.IMAGE__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -6613,9 +6594,7 @@
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 				break;
 			case UMLPackage.ACTIVITY__CONTEXT :
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.ACTIVITY__OWNED_PARAMETER :
@@ -7342,7 +7321,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyMessageChanged(Notification notification, EClass eClass) {
+	protected void notifyMessageChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Message.class)) {
 			case UMLPackage.MESSAGE__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -7569,9 +7549,7 @@
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 				break;
 			case UMLPackage.INTERACTION__CONTEXT :
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.INTERACTION__OWNED_PARAMETER :
@@ -7753,8 +7731,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyInteractionConstraintChanged(
-			Notification notification, EClass eClass) {
+	protected void notifyInteractionConstraintChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(InteractionConstraint.class)) {
 			case UMLPackage.INTERACTION_CONSTRAINT__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -7981,8 +7959,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyActivityParameterNodeChanged(
-			Notification notification, EClass eClass) {
+	protected void notifyActivityParameterNodeChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(ActivityParameterNode.class)) {
 			case UMLPackage.ACTIVITY_PARAMETER_NODE__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -8033,7 +8011,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyActorChanged(Notification notification, EClass eClass) {
+	protected void notifyActorChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Actor.class)) {
 			case UMLPackage.ACTOR__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -8599,7 +8578,8 @@
 	 */
 	protected void notifyBehaviorExecutionSpecificationChanged(
 			Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(BehaviorExecutionSpecification.class)) {
+		switch (notification
+			.getFeatureID(BehaviorExecutionSpecification.class)) {
 			case UMLPackage.BEHAVIOR_EXECUTION_SPECIFICATION__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
@@ -8639,8 +8619,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyBroadcastSignalActionChanged(
-			Notification notification, EClass eClass) {
+	protected void notifyBroadcastSignalActionChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(BroadcastSignalAction.class)) {
 			case UMLPackage.BROADCAST_SIGNAL_ACTION__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -8995,7 +8975,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyClauseChanged(Notification notification, EClass eClass) {
+	protected void notifyClauseChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Clause.class)) {
 			case UMLPackage.CLAUSE__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -10675,7 +10656,8 @@
 	 */
 	protected void notifyMessageOccurrenceSpecificationChanged(
 			Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(MessageOccurrenceSpecification.class)) {
+		switch (notification
+			.getFeatureID(MessageOccurrenceSpecification.class)) {
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
@@ -10715,7 +10697,8 @@
 	 * @param eClass the Ecore class of the notifier.
 	 * @generated
 	 */
-	protected void notifyDeviceChanged(Notification notification, EClass eClass) {
+	protected void notifyDeviceChanged(Notification notification,
+			EClass eClass) {
 		switch (notification.getFeatureID(Device.class)) {
 			case UMLPackage.DEVICE__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
@@ -12190,9 +12173,7 @@
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 				break;
 			case UMLPackage.FUNCTION_BEHAVIOR__CONTEXT :
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.FUNCTION_BEHAVIOR__OWNED_PARAMETER :
@@ -12434,9 +12415,7 @@
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
 				break;
 			case UMLPackage.OPAQUE_BEHAVIOR__CONTEXT :
-				notifyChanged(
-					notification,
-					eClass,
+				notifyChanged(notification, eClass,
 					UMLPackage.Literals.REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 				break;
 			case UMLPackage.OPAQUE_BEHAVIOR__OWNED_PARAMETER :
@@ -14780,7 +14759,8 @@
 	 */
 	protected void notifyStartClassifierBehaviorActionChanged(
 			Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(StartClassifierBehaviorAction.class)) {
+		switch (notification
+			.getFeatureID(StartClassifierBehaviorAction.class)) {
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION__OWNED_COMMENT :
 				notifyChanged(notification, eClass,
 					UMLPackage.Literals.ELEMENT__OWNED_ELEMENT);
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLSwitch.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLSwitch.java
index 6d82c71..28c0ee7 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLSwitch.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLSwitch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188
  *   Kenn Hussey - 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 451350, 485756
  *
  */
 package org.eclipse.uml2.uml.util;
@@ -719,7 +719,8 @@
 			}
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION : {
 				TemplateParameterSubstitution templateParameterSubstitution = (TemplateParameterSubstitution) theEObject;
-				T result = caseTemplateParameterSubstitution(templateParameterSubstitution);
+				T result = caseTemplateParameterSubstitution(
+					templateParameterSubstitution);
 				if (result == null)
 					result = caseElement(templateParameterSubstitution);
 				if (result == null)
@@ -878,13 +879,16 @@
 			}
 			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER : {
 				ConnectableElementTemplateParameter connectableElementTemplateParameter = (ConnectableElementTemplateParameter) theEObject;
-				T result = caseConnectableElementTemplateParameter(connectableElementTemplateParameter);
+				T result = caseConnectableElementTemplateParameter(
+					connectableElementTemplateParameter);
 				if (result == null)
-					result = caseTemplateParameter(connectableElementTemplateParameter);
+					result = caseTemplateParameter(
+						connectableElementTemplateParameter);
 				if (result == null)
 					result = caseElement(connectableElementTemplateParameter);
 				if (result == null)
-					result = caseEModelElement(connectableElementTemplateParameter);
+					result = caseEModelElement(
+						connectableElementTemplateParameter);
 				if (result == null)
 					result = defaultCase(theEObject);
 				return result;
@@ -1455,7 +1459,8 @@
 			}
 			case UMLPackage.CONNECTION_POINT_REFERENCE : {
 				ConnectionPointReference connectionPointReference = (ConnectionPointReference) theEObject;
-				T result = caseConnectionPointReference(connectionPointReference);
+				T result = caseConnectionPointReference(
+					connectionPointReference);
 				if (result == null)
 					result = caseVertex(connectionPointReference);
 				if (result == null)
@@ -1563,7 +1568,8 @@
 			}
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER : {
 				OperationTemplateParameter operationTemplateParameter = (OperationTemplateParameter) theEObject;
-				T result = caseOperationTemplateParameter(operationTemplateParameter);
+				T result = caseOperationTemplateParameter(
+					operationTemplateParameter);
 				if (result == null)
 					result = caseTemplateParameter(operationTemplateParameter);
 				if (result == null)
@@ -2044,11 +2050,14 @@
 			}
 			case UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE : {
 				RedefinableTemplateSignature redefinableTemplateSignature = (RedefinableTemplateSignature) theEObject;
-				T result = caseRedefinableTemplateSignature(redefinableTemplateSignature);
+				T result = caseRedefinableTemplateSignature(
+					redefinableTemplateSignature);
 				if (result == null)
-					result = caseRedefinableElement(redefinableTemplateSignature);
+					result = caseRedefinableElement(
+						redefinableTemplateSignature);
 				if (result == null)
-					result = caseTemplateSignature(redefinableTemplateSignature);
+					result = caseTemplateSignature(
+						redefinableTemplateSignature);
 				if (result == null)
 					result = caseNamedElement(redefinableTemplateSignature);
 				if (result == null)
@@ -2191,7 +2200,8 @@
 			}
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER : {
 				ClassifierTemplateParameter classifierTemplateParameter = (ClassifierTemplateParameter) theEObject;
-				T result = caseClassifierTemplateParameter(classifierTemplateParameter);
+				T result = caseClassifierTemplateParameter(
+					classifierTemplateParameter);
 				if (result == null)
 					result = caseTemplateParameter(classifierTemplateParameter);
 				if (result == null)
@@ -2324,7 +2334,8 @@
 			}
 			case UMLPackage.INTERRUPTIBLE_ACTIVITY_REGION : {
 				InterruptibleActivityRegion interruptibleActivityRegion = (InterruptibleActivityRegion) theEObject;
-				T result = caseInterruptibleActivityRegion(interruptibleActivityRegion);
+				T result = caseInterruptibleActivityRegion(
+					interruptibleActivityRegion);
 				if (result == null)
 					result = caseActivityGroup(interruptibleActivityRegion);
 				if (result == null)
@@ -2540,7 +2551,8 @@
 			}
 			case UMLPackage.VALUE_SPECIFICATION_ACTION : {
 				ValueSpecificationAction valueSpecificationAction = (ValueSpecificationAction) theEObject;
-				T result = caseValueSpecificationAction(valueSpecificationAction);
+				T result = caseValueSpecificationAction(
+					valueSpecificationAction);
 				if (result == null)
 					result = caseAction(valueSpecificationAction);
 				if (result == null)
@@ -2656,9 +2668,11 @@
 			}
 			case UMLPackage.WRITE_STRUCTURAL_FEATURE_ACTION : {
 				WriteStructuralFeatureAction writeStructuralFeatureAction = (WriteStructuralFeatureAction) theEObject;
-				T result = caseWriteStructuralFeatureAction(writeStructuralFeatureAction);
+				T result = caseWriteStructuralFeatureAction(
+					writeStructuralFeatureAction);
 				if (result == null)
-					result = caseStructuralFeatureAction(writeStructuralFeatureAction);
+					result = caseStructuralFeatureAction(
+						writeStructuralFeatureAction);
 				if (result == null)
 					result = caseAction(writeStructuralFeatureAction);
 				if (result == null)
@@ -2666,7 +2680,8 @@
 				if (result == null)
 					result = caseActivityNode(writeStructuralFeatureAction);
 				if (result == null)
-					result = caseRedefinableElement(writeStructuralFeatureAction);
+					result = caseRedefinableElement(
+						writeStructuralFeatureAction);
 				if (result == null)
 					result = caseActivityContent(writeStructuralFeatureAction);
 				if (result == null)
@@ -2806,21 +2821,27 @@
 			}
 			case UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION : {
 				AddStructuralFeatureValueAction addStructuralFeatureValueAction = (AddStructuralFeatureValueAction) theEObject;
-				T result = caseAddStructuralFeatureValueAction(addStructuralFeatureValueAction);
+				T result = caseAddStructuralFeatureValueAction(
+					addStructuralFeatureValueAction);
 				if (result == null)
-					result = caseWriteStructuralFeatureAction(addStructuralFeatureValueAction);
+					result = caseWriteStructuralFeatureAction(
+						addStructuralFeatureValueAction);
 				if (result == null)
-					result = caseStructuralFeatureAction(addStructuralFeatureValueAction);
+					result = caseStructuralFeatureAction(
+						addStructuralFeatureValueAction);
 				if (result == null)
 					result = caseAction(addStructuralFeatureValueAction);
 				if (result == null)
-					result = caseExecutableNode(addStructuralFeatureValueAction);
+					result = caseExecutableNode(
+						addStructuralFeatureValueAction);
 				if (result == null)
 					result = caseActivityNode(addStructuralFeatureValueAction);
 				if (result == null)
-					result = caseRedefinableElement(addStructuralFeatureValueAction);
+					result = caseRedefinableElement(
+						addStructuralFeatureValueAction);
 				if (result == null)
-					result = caseActivityContent(addStructuralFeatureValueAction);
+					result = caseActivityContent(
+						addStructuralFeatureValueAction);
 				if (result == null)
 					result = caseNamedElement(addStructuralFeatureValueAction);
 				if (result == null)
@@ -3021,9 +3042,11 @@
 			}
 			case UMLPackage.CLEAR_STRUCTURAL_FEATURE_ACTION : {
 				ClearStructuralFeatureAction clearStructuralFeatureAction = (ClearStructuralFeatureAction) theEObject;
-				T result = caseClearStructuralFeatureAction(clearStructuralFeatureAction);
+				T result = caseClearStructuralFeatureAction(
+					clearStructuralFeatureAction);
 				if (result == null)
-					result = caseStructuralFeatureAction(clearStructuralFeatureAction);
+					result = caseStructuralFeatureAction(
+						clearStructuralFeatureAction);
 				if (result == null)
 					result = caseAction(clearStructuralFeatureAction);
 				if (result == null)
@@ -3031,7 +3054,8 @@
 				if (result == null)
 					result = caseActivityNode(clearStructuralFeatureAction);
 				if (result == null)
-					result = caseRedefinableElement(clearStructuralFeatureAction);
+					result = caseRedefinableElement(
+						clearStructuralFeatureAction);
 				if (result == null)
 					result = caseActivityContent(clearStructuralFeatureAction);
 				if (result == null)
@@ -3405,7 +3429,8 @@
 			}
 			case UMLPackage.READ_IS_CLASSIFIED_OBJECT_ACTION : {
 				ReadIsClassifiedObjectAction readIsClassifiedObjectAction = (ReadIsClassifiedObjectAction) theEObject;
-				T result = caseReadIsClassifiedObjectAction(readIsClassifiedObjectAction);
+				T result = caseReadIsClassifiedObjectAction(
+					readIsClassifiedObjectAction);
 				if (result == null)
 					result = caseAction(readIsClassifiedObjectAction);
 				if (result == null)
@@ -3413,7 +3438,8 @@
 				if (result == null)
 					result = caseActivityNode(readIsClassifiedObjectAction);
 				if (result == null)
-					result = caseRedefinableElement(readIsClassifiedObjectAction);
+					result = caseRedefinableElement(
+						readIsClassifiedObjectAction);
 				if (result == null)
 					result = caseActivityContent(readIsClassifiedObjectAction);
 				if (result == null)
@@ -3476,23 +3502,28 @@
 			}
 			case UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION : {
 				ReadLinkObjectEndQualifierAction readLinkObjectEndQualifierAction = (ReadLinkObjectEndQualifierAction) theEObject;
-				T result = caseReadLinkObjectEndQualifierAction(readLinkObjectEndQualifierAction);
+				T result = caseReadLinkObjectEndQualifierAction(
+					readLinkObjectEndQualifierAction);
 				if (result == null)
 					result = caseAction(readLinkObjectEndQualifierAction);
 				if (result == null)
-					result = caseExecutableNode(readLinkObjectEndQualifierAction);
+					result = caseExecutableNode(
+						readLinkObjectEndQualifierAction);
 				if (result == null)
 					result = caseActivityNode(readLinkObjectEndQualifierAction);
 				if (result == null)
-					result = caseRedefinableElement(readLinkObjectEndQualifierAction);
+					result = caseRedefinableElement(
+						readLinkObjectEndQualifierAction);
 				if (result == null)
-					result = caseActivityContent(readLinkObjectEndQualifierAction);
+					result = caseActivityContent(
+						readLinkObjectEndQualifierAction);
 				if (result == null)
 					result = caseNamedElement(readLinkObjectEndQualifierAction);
 				if (result == null)
 					result = caseElement(readLinkObjectEndQualifierAction);
 				if (result == null)
-					result = caseEModelElement(readLinkObjectEndQualifierAction);
+					result = caseEModelElement(
+						readLinkObjectEndQualifierAction);
 				if (result == null)
 					result = defaultCase(theEObject);
 				return result;
@@ -3522,9 +3553,11 @@
 			}
 			case UMLPackage.READ_STRUCTURAL_FEATURE_ACTION : {
 				ReadStructuralFeatureAction readStructuralFeatureAction = (ReadStructuralFeatureAction) theEObject;
-				T result = caseReadStructuralFeatureAction(readStructuralFeatureAction);
+				T result = caseReadStructuralFeatureAction(
+					readStructuralFeatureAction);
 				if (result == null)
-					result = caseStructuralFeatureAction(readStructuralFeatureAction);
+					result = caseStructuralFeatureAction(
+						readStructuralFeatureAction);
 				if (result == null)
 					result = caseAction(readStructuralFeatureAction);
 				if (result == null)
@@ -3532,7 +3565,8 @@
 				if (result == null)
 					result = caseActivityNode(readStructuralFeatureAction);
 				if (result == null)
-					result = caseRedefinableElement(readStructuralFeatureAction);
+					result = caseRedefinableElement(
+						readStructuralFeatureAction);
 				if (result == null)
 					result = caseActivityContent(readStructuralFeatureAction);
 				if (result == null)
@@ -3618,34 +3652,44 @@
 			}
 			case UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION : {
 				RemoveStructuralFeatureValueAction removeStructuralFeatureValueAction = (RemoveStructuralFeatureValueAction) theEObject;
-				T result = caseRemoveStructuralFeatureValueAction(removeStructuralFeatureValueAction);
+				T result = caseRemoveStructuralFeatureValueAction(
+					removeStructuralFeatureValueAction);
 				if (result == null)
-					result = caseWriteStructuralFeatureAction(removeStructuralFeatureValueAction);
+					result = caseWriteStructuralFeatureAction(
+						removeStructuralFeatureValueAction);
 				if (result == null)
-					result = caseStructuralFeatureAction(removeStructuralFeatureValueAction);
+					result = caseStructuralFeatureAction(
+						removeStructuralFeatureValueAction);
 				if (result == null)
 					result = caseAction(removeStructuralFeatureValueAction);
 				if (result == null)
-					result = caseExecutableNode(removeStructuralFeatureValueAction);
+					result = caseExecutableNode(
+						removeStructuralFeatureValueAction);
 				if (result == null)
-					result = caseActivityNode(removeStructuralFeatureValueAction);
+					result = caseActivityNode(
+						removeStructuralFeatureValueAction);
 				if (result == null)
-					result = caseRedefinableElement(removeStructuralFeatureValueAction);
+					result = caseRedefinableElement(
+						removeStructuralFeatureValueAction);
 				if (result == null)
-					result = caseActivityContent(removeStructuralFeatureValueAction);
+					result = caseActivityContent(
+						removeStructuralFeatureValueAction);
 				if (result == null)
-					result = caseNamedElement(removeStructuralFeatureValueAction);
+					result = caseNamedElement(
+						removeStructuralFeatureValueAction);
 				if (result == null)
 					result = caseElement(removeStructuralFeatureValueAction);
 				if (result == null)
-					result = caseEModelElement(removeStructuralFeatureValueAction);
+					result = caseEModelElement(
+						removeStructuralFeatureValueAction);
 				if (result == null)
 					result = defaultCase(theEObject);
 				return result;
 			}
 			case UMLPackage.REMOVE_VARIABLE_VALUE_ACTION : {
 				RemoveVariableValueAction removeVariableValueAction = (RemoveVariableValueAction) theEObject;
-				T result = caseRemoveVariableValueAction(removeVariableValueAction);
+				T result = caseRemoveVariableValueAction(
+					removeVariableValueAction);
 				if (result == null)
 					result = caseWriteVariableAction(removeVariableValueAction);
 				if (result == null)
@@ -3774,7 +3818,8 @@
 			}
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION : {
 				StartClassifierBehaviorAction startClassifierBehaviorAction = (StartClassifierBehaviorAction) theEObject;
-				T result = caseStartClassifierBehaviorAction(startClassifierBehaviorAction);
+				T result = caseStartClassifierBehaviorAction(
+					startClassifierBehaviorAction);
 				if (result == null)
 					result = caseAction(startClassifierBehaviorAction);
 				if (result == null)
@@ -3782,7 +3827,8 @@
 				if (result == null)
 					result = caseActivityNode(startClassifierBehaviorAction);
 				if (result == null)
-					result = caseRedefinableElement(startClassifierBehaviorAction);
+					result = caseRedefinableElement(
+						startClassifierBehaviorAction);
 				if (result == null)
 					result = caseActivityContent(startClassifierBehaviorAction);
 				if (result == null)
@@ -3797,7 +3843,8 @@
 			}
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION : {
 				StartObjectBehaviorAction startObjectBehaviorAction = (StartObjectBehaviorAction) theEObject;
-				T result = caseStartObjectBehaviorAction(startObjectBehaviorAction);
+				T result = caseStartObjectBehaviorAction(
+					startObjectBehaviorAction);
 				if (result == null)
 					result = caseCallAction(startObjectBehaviorAction);
 				if (result == null)
@@ -4846,11 +4893,14 @@
 			}
 			case UMLPackage.ACTION_EXECUTION_SPECIFICATION : {
 				ActionExecutionSpecification actionExecutionSpecification = (ActionExecutionSpecification) theEObject;
-				T result = caseActionExecutionSpecification(actionExecutionSpecification);
+				T result = caseActionExecutionSpecification(
+					actionExecutionSpecification);
 				if (result == null)
-					result = caseExecutionSpecification(actionExecutionSpecification);
+					result = caseExecutionSpecification(
+						actionExecutionSpecification);
 				if (result == null)
-					result = caseInteractionFragment(actionExecutionSpecification);
+					result = caseInteractionFragment(
+						actionExecutionSpecification);
 				if (result == null)
 					result = caseNamedElement(actionExecutionSpecification);
 				if (result == null)
@@ -4878,11 +4928,14 @@
 			}
 			case UMLPackage.BEHAVIOR_EXECUTION_SPECIFICATION : {
 				BehaviorExecutionSpecification behaviorExecutionSpecification = (BehaviorExecutionSpecification) theEObject;
-				T result = caseBehaviorExecutionSpecification(behaviorExecutionSpecification);
+				T result = caseBehaviorExecutionSpecification(
+					behaviorExecutionSpecification);
 				if (result == null)
-					result = caseExecutionSpecification(behaviorExecutionSpecification);
+					result = caseExecutionSpecification(
+						behaviorExecutionSpecification);
 				if (result == null)
-					result = caseInteractionFragment(behaviorExecutionSpecification);
+					result = caseInteractionFragment(
+						behaviorExecutionSpecification);
 				if (result == null)
 					result = caseNamedElement(behaviorExecutionSpecification);
 				if (result == null)
@@ -4942,34 +4995,43 @@
 			}
 			case UMLPackage.DESTRUCTION_OCCURRENCE_SPECIFICATION : {
 				DestructionOccurrenceSpecification destructionOccurrenceSpecification = (DestructionOccurrenceSpecification) theEObject;
-				T result = caseDestructionOccurrenceSpecification(destructionOccurrenceSpecification);
+				T result = caseDestructionOccurrenceSpecification(
+					destructionOccurrenceSpecification);
 				if (result == null)
-					result = caseMessageOccurrenceSpecification(destructionOccurrenceSpecification);
+					result = caseMessageOccurrenceSpecification(
+						destructionOccurrenceSpecification);
 				if (result == null)
-					result = caseOccurrenceSpecification(destructionOccurrenceSpecification);
+					result = caseOccurrenceSpecification(
+						destructionOccurrenceSpecification);
 				if (result == null)
 					result = caseMessageEnd(destructionOccurrenceSpecification);
 				if (result == null)
-					result = caseInteractionFragment(destructionOccurrenceSpecification);
+					result = caseInteractionFragment(
+						destructionOccurrenceSpecification);
 				if (result == null)
-					result = caseNamedElement(destructionOccurrenceSpecification);
+					result = caseNamedElement(
+						destructionOccurrenceSpecification);
 				if (result == null)
 					result = caseElement(destructionOccurrenceSpecification);
 				if (result == null)
-					result = caseEModelElement(destructionOccurrenceSpecification);
+					result = caseEModelElement(
+						destructionOccurrenceSpecification);
 				if (result == null)
 					result = defaultCase(theEObject);
 				return result;
 			}
 			case UMLPackage.MESSAGE_OCCURRENCE_SPECIFICATION : {
 				MessageOccurrenceSpecification messageOccurrenceSpecification = (MessageOccurrenceSpecification) theEObject;
-				T result = caseMessageOccurrenceSpecification(messageOccurrenceSpecification);
+				T result = caseMessageOccurrenceSpecification(
+					messageOccurrenceSpecification);
 				if (result == null)
-					result = caseOccurrenceSpecification(messageOccurrenceSpecification);
+					result = caseOccurrenceSpecification(
+						messageOccurrenceSpecification);
 				if (result == null)
 					result = caseMessageEnd(messageOccurrenceSpecification);
 				if (result == null)
-					result = caseInteractionFragment(messageOccurrenceSpecification);
+					result = caseInteractionFragment(
+						messageOccurrenceSpecification);
 				if (result == null)
 					result = caseNamedElement(messageOccurrenceSpecification);
 				if (result == null)
@@ -4982,17 +5044,21 @@
 			}
 			case UMLPackage.EXECUTION_OCCURRENCE_SPECIFICATION : {
 				ExecutionOccurrenceSpecification executionOccurrenceSpecification = (ExecutionOccurrenceSpecification) theEObject;
-				T result = caseExecutionOccurrenceSpecification(executionOccurrenceSpecification);
+				T result = caseExecutionOccurrenceSpecification(
+					executionOccurrenceSpecification);
 				if (result == null)
-					result = caseOccurrenceSpecification(executionOccurrenceSpecification);
+					result = caseOccurrenceSpecification(
+						executionOccurrenceSpecification);
 				if (result == null)
-					result = caseInteractionFragment(executionOccurrenceSpecification);
+					result = caseInteractionFragment(
+						executionOccurrenceSpecification);
 				if (result == null)
 					result = caseNamedElement(executionOccurrenceSpecification);
 				if (result == null)
 					result = caseElement(executionOccurrenceSpecification);
 				if (result == null)
-					result = caseEModelElement(executionOccurrenceSpecification);
+					result = caseEModelElement(
+						executionOccurrenceSpecification);
 				if (result == null)
 					result = defaultCase(theEObject);
 				return result;
@@ -6777,7 +6843,8 @@
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseClassifierTemplateParameter(ClassifierTemplateParameter object) {
+	public T caseClassifierTemplateParameter(
+			ClassifierTemplateParameter object) {
 		return null;
 	}
 
@@ -7392,7 +7459,8 @@
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseInterruptibleActivityRegion(InterruptibleActivityRegion object) {
+	public T caseInterruptibleActivityRegion(
+			InterruptibleActivityRegion object) {
 		return null;
 	}
 
@@ -7847,7 +7915,8 @@
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseReadStructuralFeatureAction(ReadStructuralFeatureAction object) {
+	public T caseReadStructuralFeatureAction(
+			ReadStructuralFeatureAction object) {
 		return null;
 	}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java
index 7252faa..0ae1732 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 205188, 204200
  *   Kenn Hussey - 286329, 320318, 323000, 323181, 354453
- *   Kenn Hussey (CEA) - 327039, 351774, 297216, 212765, 408610, 414970, 418466, 460314
+ *   Kenn Hussey (CEA) - 327039, 351774, 297216, 212765, 408610, 414970, 418466, 460314, 485756
  *
  */
 package org.eclipse.uml2.uml.util;
@@ -4012,7 +4012,8 @@
 					context);
 			case UMLPackage.TEMPLATE_PARAMETER_SUBSTITUTION :
 				return validateTemplateParameterSubstitution(
-					(TemplateParameterSubstitution) value, diagnostics, context);
+					(TemplateParameterSubstitution) value, diagnostics,
+					context);
 			case UMLPackage.TYPE :
 				return validateType((Type) value, diagnostics, context);
 			case UMLPackage.ASSOCIATION :
@@ -4057,8 +4058,8 @@
 				return validateDeployedArtifact((DeployedArtifact) value,
 					diagnostics, context);
 			case UMLPackage.MANIFESTATION :
-				return validateManifestation((Manifestation) value,
-					diagnostics, context);
+				return validateManifestation((Manifestation) value, diagnostics,
+					context);
 			case UMLPackage.ABSTRACTION :
 				return validateAbstraction((Abstraction) value, diagnostics,
 					context);
@@ -4149,14 +4150,14 @@
 			case UMLPackage.SLOT :
 				return validateSlot((Slot) value, diagnostics, context);
 			case UMLPackage.PRIMITIVE_TYPE :
-				return validatePrimitiveType((PrimitiveType) value,
-					diagnostics, context);
+				return validatePrimitiveType((PrimitiveType) value, diagnostics,
+					context);
 			case UMLPackage.ELEMENT_IMPORT :
-				return validateElementImport((ElementImport) value,
-					diagnostics, context);
+				return validateElementImport((ElementImport) value, diagnostics,
+					context);
 			case UMLPackage.PACKAGE_IMPORT :
-				return validatePackageImport((PackageImport) value,
-					diagnostics, context);
+				return validatePackageImport((PackageImport) value, diagnostics,
+					context);
 			case UMLPackage.EXTENSION :
 				return validateExtension((Extension) value, diagnostics,
 					context);
@@ -4177,8 +4178,8 @@
 				return validateCollaborationUse((CollaborationUse) value,
 					diagnostics, context);
 			case UMLPackage.COLLABORATION :
-				return validateCollaboration((Collaboration) value,
-					diagnostics, context);
+				return validateCollaboration((Collaboration) value, diagnostics,
+					context);
 			case UMLPackage.STRUCTURED_CLASSIFIER :
 				return validateStructuredClassifier(
 					(StructuredClassifier) value, diagnostics, context);
@@ -4219,8 +4220,8 @@
 				return validateEncapsulatedClassifier(
 					(EncapsulatedClassifier) value, diagnostics, context);
 			case UMLPackage.ACTIVITY_GROUP :
-				return validateActivityGroup((ActivityGroup) value,
-					diagnostics, context);
+				return validateActivityGroup((ActivityGroup) value, diagnostics,
+					context);
 			case UMLPackage.ACTIVITY_EDGE :
 				return validateActivityEdge((ActivityEdge) value, diagnostics,
 					context);
@@ -4350,8 +4351,8 @@
 				return validateDestroyObjectAction((DestroyObjectAction) value,
 					diagnostics, context);
 			case UMLPackage.EXPANSION_NODE :
-				return validateExpansionNode((ExpansionNode) value,
-					diagnostics, context);
+				return validateExpansionNode((ExpansionNode) value, diagnostics,
+					context);
 			case UMLPackage.EXPANSION_REGION :
 				return validateExpansionRegion((ExpansionRegion) value,
 					diagnostics, context);
@@ -4415,7 +4416,8 @@
 					context);
 			case UMLPackage.START_CLASSIFIER_BEHAVIOR_ACTION :
 				return validateStartClassifierBehaviorAction(
-					(StartClassifierBehaviorAction) value, diagnostics, context);
+					(StartClassifierBehaviorAction) value, diagnostics,
+					context);
 			case UMLPackage.START_OBJECT_BEHAVIOR_ACTION :
 				return validateStartObjectBehaviorAction(
 					(StartObjectBehaviorAction) value, diagnostics, context);
@@ -4446,8 +4448,8 @@
 				return validateControlFlow((ControlFlow) value, diagnostics,
 					context);
 			case UMLPackage.DATA_STORE_NODE :
-				return validateDataStoreNode((DataStoreNode) value,
-					diagnostics, context);
+				return validateDataStoreNode((DataStoreNode) value, diagnostics,
+					context);
 			case UMLPackage.DECISION_NODE :
 				return validateDecisionNode((DecisionNode) value, diagnostics,
 					context);
@@ -4455,8 +4457,8 @@
 				return validateObjectFlow((ObjectFlow) value, diagnostics,
 					context);
 			case UMLPackage.FLOW_FINAL_NODE :
-				return validateFlowFinalNode((FlowFinalNode) value,
-					diagnostics, context);
+				return validateFlowFinalNode((FlowFinalNode) value, diagnostics,
+					context);
 			case UMLPackage.FORK_NODE :
 				return validateForkNode((ForkNode) value, diagnostics, context);
 			case UMLPackage.INITIAL_NODE :
@@ -4468,8 +4470,8 @@
 				return validateMergeNode((MergeNode) value, diagnostics,
 					context);
 			case UMLPackage.INSTANCE_VALUE :
-				return validateInstanceValue((InstanceValue) value,
-					diagnostics, context);
+				return validateInstanceValue((InstanceValue) value, diagnostics,
+					context);
 			case UMLPackage.ANY_RECEIVE_EVENT :
 				return validateAnyReceiveEvent((AnyReceiveEvent) value,
 					diagnostics, context);
@@ -4632,8 +4634,8 @@
 				return validateLiteralReal((LiteralReal) value, diagnostics,
 					context);
 			case UMLPackage.LITERAL_STRING :
-				return validateLiteralString((LiteralString) value,
-					diagnostics, context);
+				return validateLiteralString((LiteralString) value, diagnostics,
+					context);
 			case UMLPackage.LITERAL_UNLIMITED_NATURAL :
 				return validateLiteralUnlimitedNatural(
 					(LiteralUnlimitedNatural) value, diagnostics, context);
@@ -4668,14 +4670,14 @@
 				return validateAggregationKind((AggregationKind) value,
 					diagnostics, context);
 			case UMLPackage.CONNECTOR_KIND :
-				return validateConnectorKind((ConnectorKind) value,
-					diagnostics, context);
+				return validateConnectorKind((ConnectorKind) value, diagnostics,
+					context);
 			case UMLPackage.OBJECT_NODE_ORDERING_KIND :
 				return validateObjectNodeOrderingKind(
 					(ObjectNodeOrderingKind) value, diagnostics, context);
 			case UMLPackage.EXPANSION_KIND :
-				return validateExpansionKind((ExpansionKind) value,
-					diagnostics, context);
+				return validateExpansionKind((ExpansionKind) value, diagnostics,
+					context);
 			case UMLPackage.MESSAGE_KIND :
 				return validateMessageKind((MessageKind) value, diagnostics,
 					context);
@@ -4706,8 +4708,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateComment(Comment comment,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateComment(Comment comment, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(comment, diagnostics, context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(comment,
@@ -4722,7 +4724,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(comment,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(comment, diagnostics, context);
+			result &= validate_EveryProxyResolves(comment, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(comment, diagnostics, context);
 		if (result || diagnostics != null)
@@ -4744,8 +4747,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateElement(Element element,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateElement(Element element, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(element, diagnostics, context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(element,
@@ -4760,7 +4763,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(element,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(element, diagnostics, context);
+			result &= validate_EveryProxyResolves(element, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(element, diagnostics, context);
 		if (result || diagnostics != null)
@@ -4851,8 +4855,8 @@
 			result &= validate_UniqueID(directedRelationship, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(directedRelationship,
-				diagnostics, context);
+			result &= validate_EveryKeyUnique(directedRelationship, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(directedRelationship,
 				diagnostics, context);
@@ -4877,14 +4881,14 @@
 		boolean result = validate_EveryMultiplicityConforms(relationship,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(relationship,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(relationship, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(relationship,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				relationship, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(relationship,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(relationship, diagnostics,
 				context);
@@ -4934,8 +4938,8 @@
 			result &= validate_UniqueID(literalSpecification, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(literalSpecification,
-				diagnostics, context);
+			result &= validate_EveryKeyUnique(literalSpecification, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(literalSpecification,
 				diagnostics, context);
@@ -5027,14 +5031,14 @@
 		boolean result = validate_EveryMultiplicityConforms(typedElement,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(typedElement,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(typedElement, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(typedElement,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				typedElement, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(typedElement,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(typedElement, diagnostics,
 				context);
@@ -5076,14 +5080,14 @@
 		boolean result = validate_EveryMultiplicityConforms(namedElement,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(namedElement,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(namedElement, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(namedElement,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				namedElement, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(namedElement,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(namedElement, diagnostics,
 				context);
@@ -5298,8 +5302,8 @@
 			result &= validate_UniqueID(parameterableElement, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(parameterableElement,
-				diagnostics, context);
+			result &= validate_EveryKeyUnique(parameterableElement, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(parameterableElement,
 				diagnostics, context);
@@ -5338,7 +5342,8 @@
 			result &= validate_EveryProxyResolves(templateParameter,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_UniqueID(templateParameter, diagnostics, context);
+			result &= validate_UniqueID(templateParameter, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(templateParameter, diagnostics,
 				context);
@@ -5395,7 +5400,8 @@
 			result &= validate_EveryProxyResolves(templateSignature,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_UniqueID(templateSignature, diagnostics, context);
+			result &= validate_UniqueID(templateSignature, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(templateSignature, diagnostics,
 				context);
@@ -5452,8 +5458,8 @@
 		if (!validate_NoCircularContainment(templateableElement, diagnostics,
 			context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(
-			templateableElement, diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(templateableElement,
+			diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(templateableElement,
 				diagnostics, context);
@@ -5514,8 +5520,8 @@
 			result &= validate_EveryKeyUnique(templateBinding, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(templateBinding,
-				diagnostics, context);
+			result &= validate_EveryMapEntryUnique(templateBinding, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(templateBinding,
 				diagnostics, context);
@@ -5580,8 +5586,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				templateParameterSubstitution, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(
-				templateParameterSubstitution, diagnostics, context);
+			result &= validate_EveryProxyResolves(templateParameterSubstitution,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(templateParameterSubstitution,
 				diagnostics, context);
@@ -5612,8 +5618,8 @@
 	public boolean validateTemplateParameterSubstitution_validateMustBeCompatible(
 			TemplateParameterSubstitution templateParameterSubstitution,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return templateParameterSubstitution.validateMustBeCompatible(
-			diagnostics, context);
+		return templateParameterSubstitution
+			.validateMustBeCompatible(diagnostics, context);
 	}
 
 	/**
@@ -5631,8 +5637,8 @@
 			result &= validate_EveryDataValueConforms(namespace, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(namespace,
-				diagnostics, context);
+			result &= validate_EveryReferenceIsContained(namespace, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(namespace,
 				diagnostics, context);
@@ -5650,8 +5656,8 @@
 			result &= validateElement_validateHasOwner(namespace, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(namespace,
-				diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(namespace, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				namespace, diagnostics, context);
@@ -5659,8 +5665,8 @@
 			result &= validateNamedElement_validateHasQualifiedName(namespace,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasNoQualifiedName(
-				namespace, diagnostics, context);
+			result &= validateNamedElement_validateHasNoQualifiedName(namespace,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamespace_validateMembersDistinguishable(
 				namespace, diagnostics, context);
@@ -5716,7 +5722,8 @@
 	 */
 	public boolean validateElementImport(ElementImport elementImport,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(elementImport, diagnostics, context))
+		if (!validate_NoCircularContainment(elementImport, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(elementImport,
 			diagnostics, context);
@@ -5788,7 +5795,8 @@
 	 */
 	public boolean validatePackageImport(PackageImport packageImport,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(packageImport, diagnostics, context))
+		if (!validate_NoCircularContainment(packageImport, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(packageImport,
 			diagnostics, context);
@@ -5882,8 +5890,8 @@
 			result &= validateNamedElement_validateHasNoQualifiedName(package_,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamespace_validateMembersDistinguishable(
-				package_, diagnostics, context);
+			result &= validateNamespace_validateMembersDistinguishable(package_,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamespace_validateCannotImportSelf(package_,
 				diagnostics, context);
@@ -5923,14 +5931,14 @@
 		boolean result = validate_EveryMultiplicityConforms(packageMerge,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(packageMerge,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(packageMerge, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(packageMerge,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				packageMerge, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(packageMerge,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(packageMerge, diagnostics,
 				context);
@@ -6048,8 +6056,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateProfile(Profile profile,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateProfile(Profile profile, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(profile, diagnostics, context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(profile,
@@ -6064,7 +6072,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(profile,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(profile, diagnostics, context);
+			result &= validate_EveryProxyResolves(profile, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(profile, diagnostics, context);
 		if (result || diagnostics != null)
@@ -6338,8 +6347,8 @@
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(class_, diagnostics, context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(class_,
-			diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(class_, diagnostics,
+			context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(class_, diagnostics,
 				context);
@@ -6356,7 +6365,8 @@
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(class_, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(class_, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(class_, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(class_, diagnostics,
 				context);
@@ -6379,8 +6389,8 @@
 			result &= validateNamespace_validateCannotImportSelf(class_,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamespace_validateCannotImportOwnedMembers(
-				class_, diagnostics, context);
+			result &= validateNamespace_validateCannotImportOwnedMembers(class_,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateRedefinableElement_validateRedefinitionConsistent(
 				class_, diagnostics, context);
@@ -6397,8 +6407,8 @@
 			result &= validateClassifier_validateSpecializeType(class_,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateClassifier_validateMapsToGeneralizationSet(
-				class_, diagnostics, context);
+			result &= validateClassifier_validateMapsToGeneralizationSet(class_,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateClassifier_validateNonFinalParents(class_,
 				diagnostics, context);
@@ -6406,8 +6416,8 @@
 			result &= validateClassifier_validateNoCyclesInGeneralization(
 				class_, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateBehavioredClassifier_validateClassBehavior(
-				class_, diagnostics, context);
+			result &= validateBehavioredClassifier_validateClassBehavior(class_,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateClass_validatePassiveClass(class_, diagnostics,
 				context);
@@ -6455,8 +6465,8 @@
 			result &= validate_UniqueID(behavioredClassifier, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(behavioredClassifier,
-				diagnostics, context);
+			result &= validate_EveryKeyUnique(behavioredClassifier, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(behavioredClassifier,
 				diagnostics, context);
@@ -6616,8 +6626,8 @@
 	public boolean validateClassifier_validateNoCyclesInGeneralization(
 			Classifier classifier, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return classifier
-			.validateNoCyclesInGeneralization(diagnostics, context);
+		return classifier.validateNoCyclesInGeneralization(diagnostics,
+			context);
 	}
 
 	/**
@@ -6823,7 +6833,8 @@
 			result &= validate_EveryProxyResolves(generalizationSet,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_UniqueID(generalizationSet, diagnostics, context);
+			result &= validate_UniqueID(generalizationSet, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(generalizationSet, diagnostics,
 				context);
@@ -6866,8 +6877,8 @@
 	public boolean validateGeneralizationSet_validateGeneralizationSameClassifier(
 			GeneralizationSet generalizationSet, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return generalizationSet.validateGeneralizationSameClassifier(
-			diagnostics, context);
+		return generalizationSet
+			.validateGeneralizationSameClassifier(diagnostics, context);
 	}
 
 	/**
@@ -6888,8 +6899,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateFeature(Feature feature,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateFeature(Feature feature, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(feature, diagnostics, context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(feature,
@@ -6904,7 +6915,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(feature,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(feature, diagnostics, context);
+			result &= validate_EveryProxyResolves(feature, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(feature, diagnostics, context);
 		if (result || diagnostics != null)
@@ -6944,8 +6956,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateUseCase(UseCase useCase,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateUseCase(UseCase useCase, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(useCase, diagnostics, context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(useCase,
@@ -6960,7 +6972,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(useCase,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(useCase, diagnostics, context);
+			result &= validate_EveryProxyResolves(useCase, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(useCase, diagnostics, context);
 		if (result || diagnostics != null)
@@ -7029,8 +7042,8 @@
 			result &= validateUseCase_validateCannotIncludeSelf(useCase,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateUseCase_validateMustHaveName(useCase,
-				diagnostics, context);
+			result &= validateUseCase_validateMustHaveName(useCase, diagnostics,
+				context);
 		return result;
 	}
 
@@ -7084,8 +7097,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateInclude(Include include,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateInclude(Include include, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(include, diagnostics, context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(include,
@@ -7100,7 +7113,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(include,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(include, diagnostics, context);
+			result &= validate_EveryProxyResolves(include, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(include, diagnostics, context);
 		if (result || diagnostics != null)
@@ -7135,8 +7149,8 @@
 			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(extend, diagnostics, context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(extend,
-			diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(extend, diagnostics,
+			context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(extend, diagnostics,
 				context);
@@ -7153,7 +7167,8 @@
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(extend, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(extend, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(extend, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(extend, diagnostics,
 				context);
@@ -7368,14 +7383,14 @@
 		boolean result = validate_EveryMultiplicityConforms(substitution,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(substitution,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(substitution, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(substitution,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				substitution, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(substitution,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(substitution, diagnostics,
 				context);
@@ -7434,13 +7449,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(realization, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(realization, diagnostics, context);
+			result &= validate_EveryKeyUnique(realization, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(realization, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(realization,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(realization, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(realization,
 				diagnostics, context);
@@ -7448,8 +7464,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				realization, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				realization, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(realization,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				realization, diagnostics, context);
@@ -7485,13 +7501,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(abstraction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(abstraction, diagnostics, context);
+			result &= validate_EveryKeyUnique(abstraction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(abstraction, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(abstraction,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(abstraction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(abstraction,
 				diagnostics, context);
@@ -7499,8 +7516,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				abstraction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				abstraction, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(abstraction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				abstraction, diagnostics, context);
@@ -7532,8 +7549,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				opaqueExpression, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(opaqueExpression,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(opaqueExpression, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(opaqueExpression, diagnostics, context);
 		if (result || diagnostics != null)
@@ -7625,8 +7642,8 @@
 			result &= validate_EveryDataValueConforms(parameter, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(parameter,
-				diagnostics, context);
+			result &= validate_EveryReferenceIsContained(parameter, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(parameter,
 				diagnostics, context);
@@ -7644,8 +7661,8 @@
 			result &= validateElement_validateHasOwner(parameter, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(parameter,
-				diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(parameter, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				parameter, diagnostics, context);
@@ -7653,8 +7670,8 @@
 			result &= validateNamedElement_validateHasQualifiedName(parameter,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasNoQualifiedName(
-				parameter, diagnostics, context);
+			result &= validateNamedElement_validateHasNoQualifiedName(parameter,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateMultiplicityElement_validateUpperGeLower(
 				parameter, diagnostics, context);
@@ -7674,8 +7691,8 @@
 			result &= validateMultiplicityElement_validateUpperIsUnlimitedNatural(
 				parameter, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateParameter_validateInAndOut(parameter,
-				diagnostics, context);
+			result &= validateParameter_validateInAndOut(parameter, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateParameter_validateNotException(parameter,
 				diagnostics, context);
@@ -7773,8 +7790,8 @@
 		if (!validate_NoCircularContainment(multiplicityElement, diagnostics,
 			context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(
-			multiplicityElement, diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(multiplicityElement,
+			diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(multiplicityElement,
 				diagnostics, context);
@@ -7856,8 +7873,8 @@
 	public boolean validateMultiplicityElement_validateValueSpecificationNoSideEffects(
 			MultiplicityElement multiplicityElement,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return multiplicityElement.validateValueSpecificationNoSideEffects(
-			diagnostics, context);
+		return multiplicityElement
+			.validateValueSpecificationNoSideEffects(diagnostics, context);
 	}
 
 	/**
@@ -7869,8 +7886,8 @@
 	public boolean validateMultiplicityElement_validateValueSpecificationConstant(
 			MultiplicityElement multiplicityElement,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return multiplicityElement.validateValueSpecificationConstant(
-			diagnostics, context);
+		return multiplicityElement
+			.validateValueSpecificationConstant(diagnostics, context);
 	}
 
 	/**
@@ -7962,14 +7979,14 @@
 		boolean result = validate_EveryMultiplicityConforms(connectorEnd,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(connectorEnd,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(connectorEnd, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(connectorEnd,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				connectorEnd, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(connectorEnd,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(connectorEnd, diagnostics,
 				context);
@@ -7991,8 +8008,8 @@
 			result &= validateMultiplicityElement_validateUpperGeLower(
 				connectorEnd, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateMultiplicityElement_validateLowerGe0(
-				connectorEnd, diagnostics, context);
+			result &= validateMultiplicityElement_validateLowerGe0(connectorEnd,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateMultiplicityElement_validateValueSpecificationNoSideEffects(
 				connectorEnd, diagnostics, context);
@@ -8123,8 +8140,8 @@
 			result &= validateRedefinableElement_validateRedefinitionContextValid(
 				property, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateMultiplicityElement_validateUpperGeLower(
-				property, diagnostics, context);
+			result &= validateMultiplicityElement_validateUpperGeLower(property,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateMultiplicityElement_validateLowerGe0(property,
 				diagnostics, context);
@@ -8147,8 +8164,8 @@
 			result &= validateProperty_validateDerivedUnionIsReadOnly(property,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateProperty_validateMultiplicityOfComposite(
-				property, diagnostics, context);
+			result &= validateProperty_validateMultiplicityOfComposite(property,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateProperty_validateRedefinedPropertyInherited(
 				property, diagnostics, context);
@@ -8209,8 +8226,8 @@
 	public boolean validateProperty_validateRedefinedPropertyInherited(
 			Property property, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return property
-			.validateRedefinedPropertyInherited(diagnostics, context);
+		return property.validateRedefinedPropertyInherited(diagnostics,
+			context);
 	}
 
 	/**
@@ -8266,9 +8283,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateProperty_validateTypeOfOppositeEnd(
-			Property property, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateProperty_validateTypeOfOppositeEnd(Property property,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return property.validateTypeOfOppositeEnd(diagnostics, context);
 	}
 
@@ -8329,8 +8345,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				deploymentTarget, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(deploymentTarget,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(deploymentTarget, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(deploymentTarget, diagnostics, context);
 		if (result || diagnostics != null)
@@ -8430,8 +8446,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				deployedArtifact, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(deployedArtifact,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(deployedArtifact, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(deployedArtifact, diagnostics, context);
 		if (result || diagnostics != null)
@@ -8621,8 +8637,8 @@
 			result &= validateNamedElement_validateHasNoQualifiedName(artifact,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamespace_validateMembersDistinguishable(
-				artifact, diagnostics, context);
+			result &= validateNamespace_validateMembersDistinguishable(artifact,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamespace_validateCannotImportSelf(artifact,
 				diagnostics, context);
@@ -8663,7 +8679,8 @@
 	 */
 	public boolean validateManifestation(Manifestation manifestation,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(manifestation, diagnostics, context))
+		if (!validate_NoCircularContainment(manifestation, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(manifestation,
 			diagnostics, context);
@@ -8723,8 +8740,8 @@
 			result &= validate_EveryDataValueConforms(operation, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(operation,
-				diagnostics, context);
+			result &= validate_EveryReferenceIsContained(operation, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(operation,
 				diagnostics, context);
@@ -8742,8 +8759,8 @@
 			result &= validateElement_validateHasOwner(operation, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(operation,
-				diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(operation, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				operation, diagnostics, context);
@@ -8751,8 +8768,8 @@
 			result &= validateNamedElement_validateHasQualifiedName(operation,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasNoQualifiedName(
-				operation, diagnostics, context);
+			result &= validateNamedElement_validateHasNoQualifiedName(operation,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamespace_validateMembersDistinguishable(
 				operation, diagnostics, context);
@@ -8833,7 +8850,8 @@
 			result &= validate_EveryProxyResolves(behavioralFeature,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_UniqueID(behavioralFeature, diagnostics, context);
+			result &= validate_UniqueID(behavioralFeature, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(behavioralFeature, diagnostics,
 				context);
@@ -8937,8 +8955,8 @@
 			result &= validateNamedElement_validateHasNoQualifiedName(behavior,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamespace_validateMembersDistinguishable(
-				behavior, diagnostics, context);
+			result &= validateNamespace_validateMembersDistinguishable(behavior,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamespace_validateCannotImportSelf(behavior,
 				diagnostics, context);
@@ -9018,8 +9036,8 @@
 	public boolean validateBehavior_validateFeatureOfContextClassifier(
 			Behavior behavior, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return behavior
-			.validateFeatureOfContextClassifier(diagnostics, context);
+		return behavior.validateFeatureOfContextClassifier(diagnostics,
+			context);
 	}
 
 	/**
@@ -9034,14 +9052,14 @@
 		boolean result = validate_EveryMultiplicityConforms(parameterSet,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(parameterSet,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(parameterSet, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(parameterSet,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				parameterSet, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(parameterSet,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(parameterSet, diagnostics,
 				context);
@@ -9099,9 +9117,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateParameterSet_validateInput(
-			ParameterSet parameterSet, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateParameterSet_validateInput(ParameterSet parameterSet,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return parameterSet.validateInput(diagnostics, context);
 	}
 
@@ -9163,8 +9180,8 @@
 			result &= validateNamedElement_validateHasNoQualifiedName(dataType,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamespace_validateMembersDistinguishable(
-				dataType, diagnostics, context);
+			result &= validateNamespace_validateMembersDistinguishable(dataType,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamespace_validateCannotImportSelf(dataType,
 				diagnostics, context);
@@ -9308,8 +9325,8 @@
 			result &= validate_EveryDataValueConforms(reception, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(reception,
-				diagnostics, context);
+			result &= validate_EveryReferenceIsContained(reception, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(reception,
 				diagnostics, context);
@@ -9327,8 +9344,8 @@
 			result &= validateElement_validateHasOwner(reception, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(reception,
-				diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(reception, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				reception, diagnostics, context);
@@ -9336,8 +9353,8 @@
 			result &= validateNamedElement_validateHasQualifiedName(reception,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasNoQualifiedName(
-				reception, diagnostics, context);
+			result &= validateNamedElement_validateHasNoQualifiedName(reception,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamespace_validateMembersDistinguishable(
 				reception, diagnostics, context);
@@ -9363,8 +9380,8 @@
 			result &= validateReception_validateSameNameAsSignal(reception,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateReception_validateSameStructureAsSignal(
-				reception, diagnostics, context);
+			result &= validateReception_validateSameStructureAsSignal(reception,
+				diagnostics, context);
 		return result;
 	}
 
@@ -9401,8 +9418,8 @@
 			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(signal, diagnostics, context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(signal,
-			diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(signal, diagnostics,
+			context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(signal, diagnostics,
 				context);
@@ -9419,7 +9436,8 @@
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(signal, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(signal, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(signal, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(signal, diagnostics,
 				context);
@@ -9442,8 +9460,8 @@
 			result &= validateNamespace_validateCannotImportSelf(signal,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamespace_validateCannotImportOwnedMembers(
-				signal, diagnostics, context);
+			result &= validateNamespace_validateCannotImportOwnedMembers(signal,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateRedefinableElement_validateRedefinitionConsistent(
 				signal, diagnostics, context);
@@ -9460,8 +9478,8 @@
 			result &= validateClassifier_validateSpecializeType(signal,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateClassifier_validateMapsToGeneralizationSet(
-				signal, diagnostics, context);
+			result &= validateClassifier_validateMapsToGeneralizationSet(signal,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateClassifier_validateNonFinalParents(signal,
 				diagnostics, context);
@@ -9500,8 +9518,8 @@
 			result &= validate_UniqueID(protocolStateMachine, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(protocolStateMachine,
-				diagnostics, context);
+			result &= validate_EveryKeyUnique(protocolStateMachine, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(protocolStateMachine,
 				diagnostics, context);
@@ -9655,14 +9673,14 @@
 		boolean result = validate_EveryMultiplicityConforms(stateMachine,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(stateMachine,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(stateMachine, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(stateMachine,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				stateMachine, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(stateMachine,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(stateMachine, diagnostics,
 				context);
@@ -9809,8 +9827,8 @@
 			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(region, diagnostics, context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(region,
-			diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(region, diagnostics,
+			context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(region, diagnostics,
 				context);
@@ -9827,7 +9845,8 @@
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(region, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(region, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(region, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(region, diagnostics,
 				context);
@@ -9850,8 +9869,8 @@
 			result &= validateNamespace_validateCannotImportSelf(region,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamespace_validateCannotImportOwnedMembers(
-				region, diagnostics, context);
+			result &= validateNamespace_validateCannotImportOwnedMembers(region,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateRedefinableElement_validateRedefinitionConsistent(
 				region, diagnostics, context);
@@ -9868,7 +9887,8 @@
 			result &= validateRegion_validateShallowHistoryVertex(region,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateRegion_validateOwned(region, diagnostics, context);
+			result &= validateRegion_validateOwned(region, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateRegion_validateInitialVertex(region, diagnostics,
 				context);
@@ -9928,8 +9948,8 @@
 			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(vertex, diagnostics, context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(vertex,
-			diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(vertex, diagnostics,
+			context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(vertex, diagnostics,
 				context);
@@ -9946,7 +9966,8 @@
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(vertex, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(vertex, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(vertex, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(vertex, diagnostics,
 				context);
@@ -10171,8 +10192,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateTrigger(Trigger trigger,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateTrigger(Trigger trigger, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(trigger, diagnostics, context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(trigger,
@@ -10187,7 +10208,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(trigger,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(trigger, diagnostics, context);
+			result &= validate_EveryProxyResolves(trigger, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(trigger, diagnostics, context);
 		if (result || diagnostics != null)
@@ -10489,8 +10511,8 @@
 			result &= validateState_validateEntryOrExit(state, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateState_validateSubmachineStates(state,
-				diagnostics, context);
+			result &= validateState_validateSubmachineStates(state, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateState_validateCompositeStates(state, diagnostics,
 				context);
@@ -10595,8 +10617,8 @@
 			result &= validate_EveryMapEntryUnique(connectionPointReference,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(
-				connectionPointReference, diagnostics, context);
+			result &= validateElement_validateHasOwner(connectionPointReference,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(
 				connectionPointReference, diagnostics, context);
@@ -10670,13 +10692,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(pseudostate, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(pseudostate, diagnostics, context);
+			result &= validate_EveryKeyUnique(pseudostate, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(pseudostate, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(pseudostate,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(pseudostate, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(pseudostate,
 				diagnostics, context);
@@ -10684,8 +10707,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				pseudostate, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				pseudostate, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(pseudostate,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				pseudostate, diagnostics, context);
@@ -10838,8 +10861,8 @@
 		if (!validate_NoCircularContainment(protocolConformance, diagnostics,
 			context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(
-			protocolConformance, diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(protocolConformance,
+			diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(protocolConformance,
 				diagnostics, context);
@@ -10896,8 +10919,8 @@
 			result &= validate_EveryProxyResolves(operationTemplateParameter,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_UniqueID(operationTemplateParameter,
-				diagnostics, context);
+			result &= validate_UniqueID(operationTemplateParameter, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(operationTemplateParameter,
 				diagnostics, context);
@@ -10928,8 +10951,8 @@
 	public boolean validateOperationTemplateParameter_validateMatchDefaultSignature(
 			OperationTemplateParameter operationTemplateParameter,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return operationTemplateParameter.validateMatchDefaultSignature(
-			diagnostics, context);
+		return operationTemplateParameter
+			.validateMatchDefaultSignature(diagnostics, context);
 	}
 
 	/**
@@ -10958,7 +10981,8 @@
 			result &= validate_EveryProxyResolves(structuralFeature,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_UniqueID(structuralFeature, diagnostics, context);
+			result &= validate_UniqueID(structuralFeature, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(structuralFeature, diagnostics,
 				context);
@@ -11036,13 +11060,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(association, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(association, diagnostics, context);
+			result &= validate_EveryKeyUnique(association, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(association, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(association,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(association, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(association,
 				diagnostics, context);
@@ -11050,8 +11075,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				association, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				association, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(association,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				association, diagnostics, context);
@@ -11174,8 +11199,8 @@
 	public boolean validateConnectableElementTemplateParameter(
 			ConnectableElementTemplateParameter connectableElementTemplateParameter,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(
-			connectableElementTemplateParameter, diagnostics, context))
+		if (!validate_NoCircularContainment(connectableElementTemplateParameter,
+			diagnostics, context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(
 			connectableElementTemplateParameter, diagnostics, context);
@@ -11234,8 +11259,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				collaborationUse, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(collaborationUse,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(collaborationUse, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(collaborationUse, diagnostics, context);
 		if (result || diagnostics != null)
@@ -11314,7 +11339,8 @@
 	 */
 	public boolean validateCollaboration(Collaboration collaboration,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(collaboration, diagnostics, context))
+		if (!validate_NoCircularContainment(collaboration, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(collaboration,
 			diagnostics, context);
@@ -11421,8 +11447,8 @@
 			result &= validate_UniqueID(structuredClassifier, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(structuredClassifier,
-				diagnostics, context);
+			result &= validate_EveryKeyUnique(structuredClassifier, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(structuredClassifier,
 				diagnostics, context);
@@ -11492,8 +11518,8 @@
 			result &= validate_EveryDataValueConforms(connector, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(connector,
-				diagnostics, context);
+			result &= validate_EveryReferenceIsContained(connector, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(connector,
 				diagnostics, context);
@@ -11511,8 +11537,8 @@
 			result &= validateElement_validateHasOwner(connector, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(connector,
-				diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(connector, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				connector, diagnostics, context);
@@ -11520,8 +11546,8 @@
 			result &= validateNamedElement_validateHasQualifiedName(connector,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasNoQualifiedName(
-				connector, diagnostics, context);
+			result &= validateNamedElement_validateHasNoQualifiedName(connector,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateRedefinableElement_validateRedefinitionConsistent(
 				connector, diagnostics, context);
@@ -11594,8 +11620,8 @@
 			result &= validate_EveryKeyUnique(redefinableTemplateSignature,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(
-				redefinableTemplateSignature, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(redefinableTemplateSignature,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(
 				redefinableTemplateSignature, diagnostics, context);
@@ -11641,8 +11667,8 @@
 	public boolean validateRedefinableTemplateSignature_validateRedefinesParents(
 			RedefinableTemplateSignature redefinableTemplateSignature,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return redefinableTemplateSignature.validateRedefinesParents(
-			diagnostics, context);
+		return redefinableTemplateSignature
+			.validateRedefinesParents(diagnostics, context);
 	}
 
 	/**
@@ -11718,8 +11744,8 @@
 	public boolean validateClassifierTemplateParameter_validateHasConstrainingClassifier(
 			ClassifierTemplateParameter classifierTemplateParameter,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return classifierTemplateParameter.validateHasConstrainingClassifier(
-			diagnostics, context);
+		return classifierTemplateParameter
+			.validateHasConstrainingClassifier(diagnostics, context);
 	}
 
 	/**
@@ -11744,8 +11770,8 @@
 	public boolean validateClassifierTemplateParameter_validateMatchingAbstract(
 			ClassifierTemplateParameter classifierTemplateParameter,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return classifierTemplateParameter.validateMatchingAbstract(
-			diagnostics, context);
+		return classifierTemplateParameter.validateMatchingAbstract(diagnostics,
+			context);
 	}
 
 	/**
@@ -11757,8 +11783,8 @@
 	public boolean validateClassifierTemplateParameter_validateActualIsClassifier(
 			ClassifierTemplateParameter classifierTemplateParameter,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return classifierTemplateParameter.validateActualIsClassifier(
-			diagnostics, context);
+		return classifierTemplateParameter
+			.validateActualIsClassifier(diagnostics, context);
 	}
 
 	/**
@@ -11817,8 +11843,8 @@
 			result &= validate_UniqueID(interfaceRealization, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(interfaceRealization,
-				diagnostics, context);
+			result &= validate_EveryKeyUnique(interfaceRealization, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(interfaceRealization,
 				diagnostics, context);
@@ -11851,8 +11877,8 @@
 	public boolean validateEncapsulatedClassifier(
 			EncapsulatedClassifier encapsulatedClassifier,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(encapsulatedClassifier,
-			diagnostics, context))
+		if (!validate_NoCircularContainment(encapsulatedClassifier, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(
 			encapsulatedClassifier, diagnostics, context);
@@ -11860,8 +11886,8 @@
 			result &= validate_EveryDataValueConforms(encapsulatedClassifier,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(
-				encapsulatedClassifier, diagnostics, context);
+			result &= validate_EveryReferenceIsContained(encapsulatedClassifier,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				encapsulatedClassifier, diagnostics, context);
@@ -11881,8 +11907,8 @@
 			result &= validateElement_validateHasOwner(encapsulatedClassifier,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(
-				encapsulatedClassifier, diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(encapsulatedClassifier,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				encapsulatedClassifier, diagnostics, context);
@@ -11943,8 +11969,8 @@
 			result &= validate_EveryDataValueConforms(extension, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(extension,
-				diagnostics, context);
+			result &= validate_EveryReferenceIsContained(extension, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(extension,
 				diagnostics, context);
@@ -11962,8 +11988,8 @@
 			result &= validateElement_validateHasOwner(extension, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(extension,
-				diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(extension, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				extension, diagnostics, context);
@@ -11971,8 +11997,8 @@
 			result &= validateNamedElement_validateHasQualifiedName(extension,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasNoQualifiedName(
-				extension, diagnostics, context);
+			result &= validateNamedElement_validateHasNoQualifiedName(extension,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamespace_validateMembersDistinguishable(
 				extension, diagnostics, context);
@@ -12010,8 +12036,8 @@
 			result &= validateAssociation_validateSpecializedEndNumber(
 				extension, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateAssociation_validateSpecializedEndTypes(
-				extension, diagnostics, context);
+			result &= validateAssociation_validateSpecializedEndTypes(extension,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateAssociation_validateBinaryAssociations(extension,
 				diagnostics, context);
@@ -12025,8 +12051,8 @@
 			result &= validateExtension_validateNonOwnedEnd(extension,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateExtension_validateIsBinary(extension,
-				diagnostics, context);
+			result &= validateExtension_validateIsBinary(extension, diagnostics,
+				context);
 		return result;
 	}
 
@@ -12064,14 +12090,14 @@
 		boolean result = validate_EveryMultiplicityConforms(extensionEnd,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(extensionEnd,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(extensionEnd, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(extensionEnd,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				extensionEnd, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(extensionEnd,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(extensionEnd, diagnostics,
 				context);
@@ -12111,8 +12137,8 @@
 			result &= validateMultiplicityElement_validateUpperGeLower(
 				extensionEnd, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateMultiplicityElement_validateLowerGe0(
-				extensionEnd, diagnostics, context);
+			result &= validateMultiplicityElement_validateLowerGe0(extensionEnd,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateMultiplicityElement_validateValueSpecificationNoSideEffects(
 				extensionEnd, diagnostics, context);
@@ -12250,8 +12276,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				stringExpression, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(stringExpression,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(stringExpression, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(stringExpression, diagnostics, context);
 		if (result || diagnostics != null)
@@ -12422,7 +12448,8 @@
 	 */
 	public boolean validateLiteralString(LiteralString literalString,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(literalString, diagnostics, context))
+		if (!validate_NoCircularContainment(literalString, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(literalString,
 			diagnostics, context);
@@ -12546,13 +12573,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(literalNull, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(literalNull, diagnostics, context);
+			result &= validate_EveryKeyUnique(literalNull, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(literalNull, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(literalNull,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(literalNull, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(literalNull,
 				diagnostics, context);
@@ -12560,8 +12588,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				literalNull, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				literalNull, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(literalNull,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				literalNull, diagnostics, context);
@@ -12597,13 +12625,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(literalReal, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(literalReal, diagnostics, context);
+			result &= validate_EveryKeyUnique(literalReal, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(literalReal, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(literalReal,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(literalReal, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(literalReal,
 				diagnostics, context);
@@ -12611,8 +12640,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				literalReal, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				literalReal, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(literalReal,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				literalReal, diagnostics, context);
@@ -12804,13 +12833,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(enumeration, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(enumeration, diagnostics, context);
+			result &= validate_EveryKeyUnique(enumeration, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(enumeration, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(enumeration,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(enumeration, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(enumeration,
 				diagnostics, context);
@@ -12818,8 +12848,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				enumeration, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				enumeration, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(enumeration,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				enumeration, diagnostics, context);
@@ -12948,7 +12978,8 @@
 	 */
 	public boolean validatePrimitiveType(PrimitiveType primitiveType,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(primitiveType, diagnostics, context))
+		if (!validate_NoCircularContainment(primitiveType, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(primitiveType,
 			diagnostics, context);
@@ -13030,7 +13061,8 @@
 	 */
 	public boolean validateInstanceValue(InstanceValue instanceValue,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(instanceValue, diagnostics, context))
+		if (!validate_NoCircularContainment(instanceValue, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(instanceValue,
 			diagnostics, context);
@@ -13181,8 +13213,8 @@
 			result &= validateNamespace_validateMembersDistinguishable(
 				opaqueBehavior, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamespace_validateCannotImportSelf(
-				opaqueBehavior, diagnostics, context);
+			result &= validateNamespace_validateCannotImportSelf(opaqueBehavior,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamespace_validateCannotImportOwnedMembers(
 				opaqueBehavior, diagnostics, context);
@@ -13205,8 +13237,8 @@
 			result &= validateClassifier_validateMapsToGeneralizationSet(
 				opaqueBehavior, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateClassifier_validateNonFinalParents(
-				opaqueBehavior, diagnostics, context);
+			result &= validateClassifier_validateNonFinalParents(opaqueBehavior,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateClassifier_validateNoCyclesInGeneralization(
 				opaqueBehavior, diagnostics, context);
@@ -13250,8 +13282,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				functionBehavior, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(functionBehavior,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(functionBehavior, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(functionBehavior, diagnostics, context);
 		if (result || diagnostics != null)
@@ -13315,11 +13347,11 @@
 			result &= validateClass_validatePassiveClass(functionBehavior,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateBehavior_validateMostOneBehavior(
-				functionBehavior, diagnostics, context);
+			result &= validateBehavior_validateMostOneBehavior(functionBehavior,
+				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateBehavior_validateParametersMatch(
-				functionBehavior, diagnostics, context);
+			result &= validateBehavior_validateParametersMatch(functionBehavior,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateBehavior_validateFeatureOfContextClassifier(
 				functionBehavior, diagnostics, context);
@@ -13341,8 +13373,8 @@
 	public boolean validateFunctionBehavior_validateOneOutputParameter(
 			FunctionBehavior functionBehavior, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return functionBehavior
-			.validateOneOutputParameter(diagnostics, context);
+		return functionBehavior.validateOneOutputParameter(diagnostics,
+			context);
 	}
 
 	/**
@@ -13431,8 +13463,8 @@
 			result &= validateClassifier_validateNonFinalParents(actor,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateClassifier_validateNoCyclesInGeneralization(
-				actor, diagnostics, context);
+			result &= validateClassifier_validateNoCyclesInGeneralization(actor,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateBehavioredClassifier_validateClassBehavior(actor,
 				diagnostics, context);
@@ -13521,8 +13553,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateMessage(Message message,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateMessage(Message message, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(message, diagnostics, context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(message,
@@ -13537,7 +13569,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(message,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(message, diagnostics, context);
+			result &= validate_EveryProxyResolves(message, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(message, diagnostics, context);
 		if (result || diagnostics != null)
@@ -13582,8 +13615,8 @@
 			result &= validateMessage_validateSignatureIsOperationRequest(
 				message, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateMessage_validateSignatureIsOperationReply(
-				message, diagnostics, context);
+			result &= validateMessage_validateSignatureIsOperationReply(message,
+				diagnostics, context);
 		return result;
 	}
 
@@ -13620,8 +13653,8 @@
 	public boolean validateMessage_validateSignatureIsOperationRequest(
 			Message message, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return message
-			.validateSignatureIsOperationRequest(diagnostics, context);
+		return message.validateSignatureIsOperationRequest(diagnostics,
+			context);
 	}
 
 	/**
@@ -13756,13 +13789,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(interaction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(interaction, diagnostics, context);
+			result &= validate_EveryKeyUnique(interaction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(interaction, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(interaction,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(interaction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(interaction,
 				diagnostics, context);
@@ -13770,8 +13804,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				interaction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				interaction, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(interaction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				interaction, diagnostics, context);
@@ -13852,8 +13886,8 @@
 		if (!validate_NoCircularContainment(interactionFragment, diagnostics,
 			context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(
-			interactionFragment, diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(interactionFragment,
+			diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(interactionFragment,
 				diagnostics, context);
@@ -13972,9 +14006,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateLifeline_validateSelectorSpecified(
-			Lifeline lifeline, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateLifeline_validateSelectorSpecified(Lifeline lifeline,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return lifeline.validateSelectorSpecified(diagnostics, context);
 	}
 
@@ -14027,7 +14060,8 @@
 			result &= validate_EveryProxyResolves(partDecomposition,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_UniqueID(partDecomposition, diagnostics, context);
+			result &= validate_UniqueID(partDecomposition, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(partDecomposition, diagnostics,
 				context);
@@ -14113,8 +14147,8 @@
 	public boolean validatePartDecomposition_validateCommutativityOfDecomposition(
 			PartDecomposition partDecomposition, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return partDecomposition.validateCommutativityOfDecomposition(
-			diagnostics, context);
+		return partDecomposition
+			.validateCommutativityOfDecomposition(diagnostics, context);
 	}
 
 	/**
@@ -14218,8 +14252,8 @@
 	public boolean validateInteractionUse_validateArgumentsCorrespondToParameters(
 			InteractionUse interactionUse, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return interactionUse.validateArgumentsCorrespondToParameters(
-			diagnostics, context);
+		return interactionUse
+			.validateArgumentsCorrespondToParameters(diagnostics, context);
 	}
 
 	/**
@@ -14414,8 +14448,8 @@
 			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(action, diagnostics, context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(action,
-			diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(action, diagnostics,
+			context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(action, diagnostics,
 				context);
@@ -14432,7 +14466,8 @@
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(action, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(action, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(action, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(action, diagnostics,
 				context);
@@ -14531,14 +14566,14 @@
 		boolean result = validate_EveryMultiplicityConforms(activityNode,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(activityNode,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(activityNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(activityNode,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				activityNode, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(activityNode,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(activityNode, diagnostics,
 				context);
@@ -14589,14 +14624,14 @@
 		boolean result = validate_EveryMultiplicityConforms(activityEdge,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(activityEdge,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(activityEdge, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(activityEdge,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				activityEdge, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(activityEdge,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(activityEdge, diagnostics,
 				context);
@@ -14633,8 +14668,8 @@
 			result &= validateRedefinableElement_validateRedefinitionContextValid(
 				activityEdge, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateActivityEdge_validateSourceAndTarget(
-				activityEdge, diagnostics, context);
+			result &= validateActivityEdge_validateSourceAndTarget(activityEdge,
+				diagnostics, context);
 		return result;
 	}
 
@@ -14696,8 +14731,8 @@
 			result &= validateNamedElement_validateHasNoQualifiedName(activity,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamespace_validateMembersDistinguishable(
-				activity, diagnostics, context);
+			result &= validateNamespace_validateMembersDistinguishable(activity,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamespace_validateCannotImportSelf(activity,
 				diagnostics, context);
@@ -14744,8 +14779,8 @@
 			result &= validateBehavior_validateFeatureOfContextClassifier(
 				activity, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateActivity_validateMaximumOneParameterNode(
-				activity, diagnostics, context);
+			result &= validateActivity_validateMaximumOneParameterNode(activity,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateActivity_validateMaximumTwoParameterNodes(
 				activity, diagnostics, context);
@@ -14802,7 +14837,8 @@
 			result &= validate_EveryProxyResolves(activityPartition,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_UniqueID(activityPartition, diagnostics, context);
+			result &= validate_UniqueID(activityPartition, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(activityPartition, diagnostics,
 				context);
@@ -14880,8 +14916,8 @@
 	public boolean validateActivityPartition_validateRepresentsPropertyAndIsContained(
 			ActivityPartition activityPartition, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return activityPartition.validateRepresentsPropertyAndIsContained(
-			diagnostics, context);
+		return activityPartition
+			.validateRepresentsPropertyAndIsContained(diagnostics, context);
 	}
 
 	/**
@@ -14904,7 +14940,8 @@
 	 */
 	public boolean validateActivityGroup(ActivityGroup activityGroup,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(activityGroup, diagnostics, context))
+		if (!validate_NoCircularContainment(activityGroup, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(activityGroup,
 			diagnostics, context);
@@ -14944,8 +14981,8 @@
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				activityGroup, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateActivityGroup_validateNodesAndEdges(
-				activityGroup, diagnostics, context);
+			result &= validateActivityGroup_validateNodesAndEdges(activityGroup,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateActivityGroup_validateNotContained(activityGroup,
 				diagnostics, context);
@@ -14984,8 +15021,8 @@
 	public boolean validateStructuredActivityNode(
 			StructuredActivityNode structuredActivityNode,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(structuredActivityNode,
-			diagnostics, context))
+		if (!validate_NoCircularContainment(structuredActivityNode, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(
 			structuredActivityNode, diagnostics, context);
@@ -14993,8 +15030,8 @@
 			result &= validate_EveryDataValueConforms(structuredActivityNode,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(
-				structuredActivityNode, diagnostics, context);
+			result &= validate_EveryReferenceIsContained(structuredActivityNode,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				structuredActivityNode, diagnostics, context);
@@ -15014,8 +15051,8 @@
 			result &= validateElement_validateHasOwner(structuredActivityNode,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(
-				structuredActivityNode, diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(structuredActivityNode,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				structuredActivityNode, diagnostics, context);
@@ -15145,8 +15182,8 @@
 			result &= validateNamedElement_validateHasNoQualifiedName(variable,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateMultiplicityElement_validateUpperGeLower(
-				variable, diagnostics, context);
+			result &= validateMultiplicityElement_validateUpperGeLower(variable,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateMultiplicityElement_validateLowerGe0(variable,
 				diagnostics, context);
@@ -15235,8 +15272,8 @@
 	public boolean validateInterruptibleActivityRegion_validateInterruptingEdges(
 			InterruptibleActivityRegion interruptibleActivityRegion,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return interruptibleActivityRegion.validateInterruptingEdges(
-			diagnostics, context);
+		return interruptibleActivityRegion
+			.validateInterruptingEdges(diagnostics, context);
 	}
 
 	/**
@@ -15261,8 +15298,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				exceptionHandler, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(exceptionHandler,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(exceptionHandler, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(exceptionHandler, diagnostics, context);
 		if (result || diagnostics != null)
@@ -15367,8 +15404,8 @@
 	public boolean validateExceptionHandler_validateExceptionInputType(
 			ExceptionHandler exceptionHandler, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return exceptionHandler
-			.validateExceptionInputType(diagnostics, context);
+		return exceptionHandler.validateExceptionInputType(diagnostics,
+			context);
 	}
 
 	/**
@@ -15488,8 +15525,8 @@
 			result &= validate_EveryDataValueConforms(outputPin, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(outputPin,
-				diagnostics, context);
+			result &= validate_EveryReferenceIsContained(outputPin, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(outputPin,
 				diagnostics, context);
@@ -15507,8 +15544,8 @@
 			result &= validateElement_validateHasOwner(outputPin, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(outputPin,
-				diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(outputPin, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				outputPin, diagnostics, context);
@@ -15516,8 +15553,8 @@
 			result &= validateNamedElement_validateHasQualifiedName(outputPin,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasNoQualifiedName(
-				outputPin, diagnostics, context);
+			result &= validateNamedElement_validateHasNoQualifiedName(outputPin,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateRedefinableElement_validateRedefinitionConsistent(
 				outputPin, diagnostics, context);
@@ -15528,8 +15565,8 @@
 			result &= validateRedefinableElement_validateRedefinitionContextValid(
 				outputPin, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateObjectNode_validateInputOutputParameter(
-				outputPin, diagnostics, context);
+			result &= validateObjectNode_validateInputOutputParameter(outputPin,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateObjectNode_validateSelectionBehavior(outputPin,
 				diagnostics, context);
@@ -15591,7 +15628,8 @@
 		boolean result = validate_EveryMultiplicityConforms(pin, diagnostics,
 			context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(pin, diagnostics, context);
+			result &= validate_EveryDataValueConforms(pin, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(pin, diagnostics,
 				context);
@@ -15613,8 +15651,8 @@
 			result &= validateElement_validateNotOwnSelf(pin, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateVisibilityNeedsOwnership(
-				pin, diagnostics, context);
+			result &= validateNamedElement_validateVisibilityNeedsOwnership(pin,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasQualifiedName(pin,
 				diagnostics, context);
@@ -15658,7 +15696,8 @@
 			result &= validateMultiplicityElement_validateUpperIsUnlimitedNatural(
 				pin, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validatePin_validateControlPins(pin, diagnostics, context);
+			result &= validatePin_validateControlPins(pin, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validatePin_validateNotUnique(pin, diagnostics, context);
 		return result;
@@ -15750,8 +15789,8 @@
 			result &= validateObjectNode_validateObjectFlowEdges(inputPin,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateMultiplicityElement_validateUpperGeLower(
-				inputPin, diagnostics, context);
+			result &= validateMultiplicityElement_validateUpperGeLower(inputPin,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateMultiplicityElement_validateLowerGe0(inputPin,
 				diagnostics, context);
@@ -15822,8 +15861,8 @@
 			result &= validate_EveryKeyUnique(generalOrdering, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(generalOrdering,
-				diagnostics, context);
+			result &= validate_EveryMapEntryUnique(generalOrdering, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(generalOrdering,
 				diagnostics, context);
@@ -15854,8 +15893,8 @@
 	public boolean validateGeneralOrdering_validateIrreflexiveTransitiveClosure(
 			GeneralOrdering generalOrdering, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return generalOrdering.validateIrreflexiveTransitiveClosure(
-			diagnostics, context);
+		return generalOrdering.validateIrreflexiveTransitiveClosure(diagnostics,
+			context);
 	}
 
 	/**
@@ -16157,8 +16196,8 @@
 	public boolean validateInteractionConstraint_validateMaxintGreaterEqualMinint(
 			InteractionConstraint interactionConstraint,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return interactionConstraint.validateMaxintGreaterEqualMinint(
-			diagnostics, context);
+		return interactionConstraint
+			.validateMaxintGreaterEqualMinint(diagnostics, context);
 	}
 
 	/**
@@ -16169,8 +16208,8 @@
 	public boolean validateExecutionSpecification(
 			ExecutionSpecification executionSpecification,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(executionSpecification,
-			diagnostics, context))
+		if (!validate_NoCircularContainment(executionSpecification, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(
 			executionSpecification, diagnostics, context);
@@ -16178,8 +16217,8 @@
 			result &= validate_EveryDataValueConforms(executionSpecification,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(
-				executionSpecification, diagnostics, context);
+			result &= validate_EveryReferenceIsContained(executionSpecification,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				executionSpecification, diagnostics, context);
@@ -16199,8 +16238,8 @@
 			result &= validateElement_validateHasOwner(executionSpecification,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(
-				executionSpecification, diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(executionSpecification,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				executionSpecification, diagnostics, context);
@@ -16225,8 +16264,8 @@
 	public boolean validateExecutionSpecification_validateSameLifeline(
 			ExecutionSpecification executionSpecification,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return executionSpecification
-			.validateSameLifeline(diagnostics, context);
+		return executionSpecification.validateSameLifeline(diagnostics,
+			context);
 	}
 
 	/**
@@ -16363,8 +16402,8 @@
 			result &= validate_EveryKeyUnique(actionExecutionSpecification,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(
-				actionExecutionSpecification, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(actionExecutionSpecification,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(
 				actionExecutionSpecification, diagnostics, context);
@@ -16398,8 +16437,8 @@
 	public boolean validateActionExecutionSpecification_validateActionReferenced(
 			ActionExecutionSpecification actionExecutionSpecification,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return actionExecutionSpecification.validateActionReferenced(
-			diagnostics, context);
+		return actionExecutionSpecification
+			.validateActionReferenced(diagnostics, context);
 	}
 
 	/**
@@ -16469,14 +16508,14 @@
 		boolean result = validate_EveryMultiplicityConforms(messageEvent,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(messageEvent,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(messageEvent, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(messageEvent,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				messageEvent, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(messageEvent,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(messageEvent, diagnostics,
 				context);
@@ -16583,8 +16622,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				combinedFragment, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(combinedFragment,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(combinedFragment, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(combinedFragment, diagnostics, context);
 		if (result || diagnostics != null)
@@ -16668,14 +16707,14 @@
 		boolean result = validate_EveryMultiplicityConforms(continuation,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(continuation,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(continuation, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(continuation,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				continuation, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(continuation,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(continuation, diagnostics,
 				context);
@@ -16759,8 +16798,8 @@
 	public boolean validateConsiderIgnoreFragment(
 			ConsiderIgnoreFragment considerIgnoreFragment,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(considerIgnoreFragment,
-			diagnostics, context))
+		if (!validate_NoCircularContainment(considerIgnoreFragment, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(
 			considerIgnoreFragment, diagnostics, context);
@@ -16768,8 +16807,8 @@
 			result &= validate_EveryDataValueConforms(considerIgnoreFragment,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(
-				considerIgnoreFragment, diagnostics, context);
+			result &= validate_EveryReferenceIsContained(considerIgnoreFragment,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				considerIgnoreFragment, diagnostics, context);
@@ -16789,8 +16828,8 @@
 			result &= validateElement_validateHasOwner(considerIgnoreFragment,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(
-				considerIgnoreFragment, diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(considerIgnoreFragment,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				considerIgnoreFragment, diagnostics, context);
@@ -16858,8 +16897,8 @@
 			result &= validate_EveryDataValueConforms(callEvent, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(callEvent,
-				diagnostics, context);
+			result &= validate_EveryReferenceIsContained(callEvent, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(callEvent,
 				diagnostics, context);
@@ -16877,8 +16916,8 @@
 			result &= validateElement_validateHasOwner(callEvent, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(callEvent,
-				diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(callEvent, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				callEvent, diagnostics, context);
@@ -16886,8 +16925,8 @@
 			result &= validateNamedElement_validateHasQualifiedName(callEvent,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasNoQualifiedName(
-				callEvent, diagnostics, context);
+			result &= validateNamedElement_validateHasNoQualifiedName(callEvent,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validatePackageableElement_validateNamespaceNeedsVisibility(
 				callEvent, diagnostics, context);
@@ -16920,13 +16959,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(changeEvent, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(changeEvent, diagnostics, context);
+			result &= validate_EveryKeyUnique(changeEvent, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(changeEvent, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(changeEvent,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(changeEvent, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(changeEvent,
 				diagnostics, context);
@@ -16934,8 +16974,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				changeEvent, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				changeEvent, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(changeEvent,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				changeEvent, diagnostics, context);
@@ -16971,13 +17011,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(signalEvent, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(signalEvent, diagnostics, context);
+			result &= validate_EveryKeyUnique(signalEvent, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(signalEvent, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(signalEvent,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(signalEvent, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(signalEvent,
 				diagnostics, context);
@@ -16985,8 +17026,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				signalEvent, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				signalEvent, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(signalEvent,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				signalEvent, diagnostics, context);
@@ -17026,8 +17067,8 @@
 			result &= validate_EveryKeyUnique(anyReceiveEvent, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(anyReceiveEvent,
-				diagnostics, context);
+			result &= validate_EveryMapEntryUnique(anyReceiveEvent, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(anyReceiveEvent,
 				diagnostics, context);
@@ -17144,8 +17185,8 @@
 	public boolean validateCreateObjectAction_validateClassifierNotAssociationClass(
 			CreateObjectAction createObjectAction, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return createObjectAction.validateClassifierNotAssociationClass(
-			diagnostics, context);
+		return createObjectAction
+			.validateClassifierNotAssociationClass(diagnostics, context);
 	}
 
 	/**
@@ -17183,8 +17224,8 @@
 		if (!validate_NoCircularContainment(destroyObjectAction, diagnostics,
 			context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(
-			destroyObjectAction, diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(destroyObjectAction,
+			diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(destroyObjectAction,
 				diagnostics, context);
@@ -17690,8 +17731,8 @@
 	public boolean validateStructuralFeatureAction_validateOneFeaturingClassifier(
 			StructuralFeatureAction structuralFeatureAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return structuralFeatureAction.validateOneFeaturingClassifier(
-			diagnostics, context);
+		return structuralFeatureAction
+			.validateOneFeaturingClassifier(diagnostics, context);
 	}
 
 	/**
@@ -17831,8 +17872,8 @@
 			result &= validate_EveryKeyUnique(writeStructuralFeatureAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(
-				writeStructuralFeatureAction, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(writeStructuralFeatureAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(
 				writeStructuralFeatureAction, diagnostics, context);
@@ -17909,8 +17950,8 @@
 	public boolean validateWriteStructuralFeatureAction_validateMultiplicityOfResult(
 			WriteStructuralFeatureAction writeStructuralFeatureAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return writeStructuralFeatureAction.validateMultiplicityOfResult(
-			diagnostics, context);
+		return writeStructuralFeatureAction
+			.validateMultiplicityOfResult(diagnostics, context);
 	}
 
 	/**
@@ -17935,8 +17976,8 @@
 	public boolean validateWriteStructuralFeatureAction_validateMultiplicityOfValue(
 			WriteStructuralFeatureAction writeStructuralFeatureAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return writeStructuralFeatureAction.validateMultiplicityOfValue(
-			diagnostics, context);
+		return writeStructuralFeatureAction
+			.validateMultiplicityOfValue(diagnostics, context);
 	}
 
 	/**
@@ -17971,8 +18012,8 @@
 			result &= validate_EveryKeyUnique(clearStructuralFeatureAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(
-				clearStructuralFeatureAction, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(clearStructuralFeatureAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(
 				clearStructuralFeatureAction, diagnostics, context);
@@ -18043,8 +18084,8 @@
 	public boolean validateClearStructuralFeatureAction_validateMultiplicityOfResult(
 			ClearStructuralFeatureAction clearStructuralFeatureAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return clearStructuralFeatureAction.validateMultiplicityOfResult(
-			diagnostics, context);
+		return clearStructuralFeatureAction
+			.validateMultiplicityOfResult(diagnostics, context);
 	}
 
 	/**
@@ -18147,8 +18188,8 @@
 	public boolean validateRemoveStructuralFeatureValueAction_validateRemoveAtAndValue(
 			RemoveStructuralFeatureValueAction removeStructuralFeatureValueAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return removeStructuralFeatureValueAction.validateRemoveAtAndValue(
-			diagnostics, context);
+		return removeStructuralFeatureValueAction
+			.validateRemoveAtAndValue(diagnostics, context);
 	}
 
 	/**
@@ -18254,8 +18295,8 @@
 	public boolean validateAddStructuralFeatureValueAction_validateRequiredValue(
 			AddStructuralFeatureValueAction addStructuralFeatureValueAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return addStructuralFeatureValueAction.validateRequiredValue(
-			diagnostics, context);
+		return addStructuralFeatureValueAction
+			.validateRequiredValue(diagnostics, context);
 	}
 
 	/**
@@ -18397,13 +18438,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(linkEndData, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(linkEndData, diagnostics, context);
+			result &= validate_EveryKeyUnique(linkEndData, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(linkEndData, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(linkEndData,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(linkEndData, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(linkEndData,
 				diagnostics, context);
@@ -18414,8 +18456,8 @@
 			result &= validateLinkEndData_validateMultiplicity(linkEndData,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateLinkEndData_validateEndObjectInputPin(
-				linkEndData, diagnostics, context);
+			result &= validateLinkEndData_validateEndObjectInputPin(linkEndData,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateLinkEndData_validatePropertyIsAssociationEnd(
 				linkEndData, diagnostics, context);
@@ -18444,9 +18486,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateLinkEndData_validateSameType(
-			LinkEndData linkEndData, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateLinkEndData_validateSameType(LinkEndData linkEndData,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return linkEndData.validateSameType(diagnostics, context);
 	}
 
@@ -18633,8 +18674,8 @@
 			result &= validateLinkAction_validateSamePins(readLinkAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateLinkAction_validateSameAssociation(
-				readLinkAction, diagnostics, context);
+			result &= validateLinkAction_validateSameAssociation(readLinkAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateLinkAction_validateNotStatic(readLinkAction,
 				diagnostics, context);
@@ -18728,8 +18769,8 @@
 		if (!validate_NoCircularContainment(linkEndCreationData, diagnostics,
 			context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(
-			linkEndCreationData, diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(linkEndCreationData,
+			diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(linkEndCreationData,
 				diagnostics, context);
@@ -18812,8 +18853,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				createLinkAction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(createLinkAction,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(createLinkAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(createLinkAction, diagnostics, context);
 		if (result || diagnostics != null)
@@ -18907,8 +18948,8 @@
 			result &= validate_EveryKeyUnique(writeLinkAction, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(writeLinkAction,
-				diagnostics, context);
+			result &= validate_EveryMapEntryUnique(writeLinkAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(writeLinkAction,
 				diagnostics, context);
@@ -18986,7 +19027,8 @@
 			result &= validate_EveryProxyResolves(destroyLinkAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_UniqueID(destroyLinkAction, diagnostics, context);
+			result &= validate_UniqueID(destroyLinkAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(destroyLinkAction, diagnostics,
 				context);
@@ -19040,8 +19082,8 @@
 	public boolean validateLinkEndDestructionData(
 			LinkEndDestructionData linkEndDestructionData,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(linkEndDestructionData,
-			diagnostics, context))
+		if (!validate_NoCircularContainment(linkEndDestructionData, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(
 			linkEndDestructionData, diagnostics, context);
@@ -19049,8 +19091,8 @@
 			result &= validate_EveryDataValueConforms(linkEndDestructionData,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(
-				linkEndDestructionData, diagnostics, context);
+			result &= validate_EveryReferenceIsContained(linkEndDestructionData,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				linkEndDestructionData, diagnostics, context);
@@ -19070,8 +19112,8 @@
 			result &= validateElement_validateHasOwner(linkEndDestructionData,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(
-				linkEndDestructionData, diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(linkEndDestructionData,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateLinkEndData_validateSameType(
 				linkEndDestructionData, diagnostics, context);
@@ -19102,8 +19144,8 @@
 	public boolean validateLinkEndDestructionData_validateDestroyAtPin(
 			LinkEndDestructionData linkEndDestructionData,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return linkEndDestructionData
-			.validateDestroyAtPin(diagnostics, context);
+		return linkEndDestructionData.validateDestroyAtPin(diagnostics,
+			context);
 	}
 
 	/**
@@ -19114,8 +19156,8 @@
 	public boolean validateClearAssociationAction(
 			ClearAssociationAction clearAssociationAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(clearAssociationAction,
-			diagnostics, context))
+		if (!validate_NoCircularContainment(clearAssociationAction, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(
 			clearAssociationAction, diagnostics, context);
@@ -19123,8 +19165,8 @@
 			result &= validate_EveryDataValueConforms(clearAssociationAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(
-				clearAssociationAction, diagnostics, context);
+			result &= validate_EveryReferenceIsContained(clearAssociationAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				clearAssociationAction, diagnostics, context);
@@ -19144,8 +19186,8 @@
 			result &= validateElement_validateHasOwner(clearAssociationAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(
-				clearAssociationAction, diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(clearAssociationAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				clearAssociationAction, diagnostics, context);
@@ -19194,8 +19236,8 @@
 	public boolean validateClearAssociationAction_validateMultiplicity(
 			ClearAssociationAction clearAssociationAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return clearAssociationAction
-			.validateMultiplicity(diagnostics, context);
+		return clearAssociationAction.validateMultiplicity(diagnostics,
+			context);
 	}
 
 	/**
@@ -19290,8 +19332,8 @@
 	public boolean validateBroadcastSignalAction_validateTypeOrderingMultiplicity(
 			BroadcastSignalAction broadcastSignalAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return broadcastSignalAction.validateTypeOrderingMultiplicity(
-			diagnostics, context);
+		return broadcastSignalAction
+			.validateTypeOrderingMultiplicity(diagnostics, context);
 	}
 
 	/**
@@ -19328,8 +19370,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				invocationAction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(invocationAction,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(invocationAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(invocationAction, diagnostics, context);
 		if (result || diagnostics != null)
@@ -19387,8 +19429,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				sendObjectAction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(sendObjectAction,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(sendObjectAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(sendObjectAction, diagnostics, context);
 		if (result || diagnostics != null)
@@ -19474,8 +19516,8 @@
 			result &= validate_EveryMapEntryUnique(valueSpecificationAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(
-				valueSpecificationAction, diagnostics, context);
+			result &= validateElement_validateHasOwner(valueSpecificationAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(
 				valueSpecificationAction, diagnostics, context);
@@ -19627,13 +19669,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(observation, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(observation, diagnostics, context);
+			result &= validate_EveryKeyUnique(observation, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(observation, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(observation,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(observation, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(observation,
 				diagnostics, context);
@@ -19641,8 +19684,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				observation, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				observation, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(observation,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				observation, diagnostics, context);
@@ -19782,8 +19825,8 @@
 			result &= validateObjectNode_validateObjectFlowEdges(valuePin,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateMultiplicityElement_validateUpperGeLower(
-				valuePin, diagnostics, context);
+			result &= validateMultiplicityElement_validateUpperGeLower(valuePin,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateMultiplicityElement_validateLowerGe0(valuePin,
 				diagnostics, context);
@@ -19861,8 +19904,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				durationInterval, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(durationInterval,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(durationInterval, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(durationInterval, diagnostics, context);
 		if (result || diagnostics != null)
@@ -20097,14 +20140,14 @@
 		boolean result = validate_EveryMultiplicityConforms(timeInterval,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(timeInterval,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(timeInterval, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(timeInterval,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				timeInterval, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(timeInterval,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(timeInterval, diagnostics,
 				context);
@@ -20229,8 +20272,8 @@
 	public boolean validateDurationConstraint_validateHasOneOrTwoConstrainedElements(
 			DurationConstraint durationConstraint, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return durationConstraint.validateHasOneOrTwoConstrainedElements(
-			diagnostics, context);
+		return durationConstraint
+			.validateHasOneOrTwoConstrainedElements(diagnostics, context);
 	}
 
 	/**
@@ -20263,8 +20306,8 @@
 			result &= validate_EveryKeyUnique(timeObservation, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(timeObservation,
-				diagnostics, context);
+			result &= validate_EveryMapEntryUnique(timeObservation, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(timeObservation,
 				diagnostics, context);
@@ -20297,8 +20340,8 @@
 		if (!validate_NoCircularContainment(durationObservation, diagnostics,
 			context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(
-			durationObservation, diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(durationObservation,
+			diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(durationObservation,
 				diagnostics, context);
@@ -20369,14 +20412,14 @@
 		boolean result = validate_EveryMultiplicityConforms(opaqueAction,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(opaqueAction,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(opaqueAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(opaqueAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				opaqueAction, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(opaqueAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(opaqueAction, diagnostics,
 				context);
@@ -20553,8 +20596,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				sendSignalAction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(sendSignalAction,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(sendSignalAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(sendSignalAction, diagnostics, context);
 		if (result || diagnostics != null)
@@ -20647,8 +20690,8 @@
 		if (!validate_NoCircularContainment(callOperationAction, diagnostics,
 			context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(
-			callOperationAction, diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(callOperationAction,
+			diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(callOperationAction,
 				diagnostics, context);
@@ -20698,8 +20741,8 @@
 			result &= validateCallAction_validateArgumentPins(
 				callOperationAction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateCallAction_validateResultPins(
-				callOperationAction, diagnostics, context);
+			result &= validateCallAction_validateResultPins(callOperationAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateCallAction_validateSynchronousCall(
 				callOperationAction, diagnostics, context);
@@ -20836,8 +20879,8 @@
 			result &= validate_EveryKeyUnique(informationItem, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(informationItem,
-				diagnostics, context);
+			result &= validate_EveryMapEntryUnique(informationItem, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(informationItem,
 				diagnostics, context);
@@ -20875,8 +20918,8 @@
 			result &= validatePackageableElement_validateNamespaceNeedsVisibility(
 				informationItem, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateClassifier_validateSpecializeType(
-				informationItem, diagnostics, context);
+			result &= validateClassifier_validateSpecializeType(informationItem,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateClassifier_validateMapsToGeneralizationSet(
 				informationItem, diagnostics, context);
@@ -20964,8 +21007,8 @@
 			result &= validate_EveryKeyUnique(informationFlow, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(informationFlow,
-				diagnostics, context);
+			result &= validate_EveryMapEntryUnique(informationFlow, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(informationFlow,
 				diagnostics, context);
@@ -21274,8 +21317,8 @@
 		if (!validate_NoCircularContainment(writeVariableAction, diagnostics,
 			context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(
-			writeVariableAction, diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(writeVariableAction,
+			diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(writeVariableAction,
 				diagnostics, context);
@@ -21368,8 +21411,8 @@
 		if (!validate_NoCircularContainment(clearVariableAction, diagnostics,
 			context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(
-			clearVariableAction, diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(clearVariableAction,
+			diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(clearVariableAction,
 				diagnostics, context);
@@ -21429,8 +21472,8 @@
 	public boolean validateAddVariableValueAction(
 			AddVariableValueAction addVariableValueAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(addVariableValueAction,
-			diagnostics, context))
+		if (!validate_NoCircularContainment(addVariableValueAction, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(
 			addVariableValueAction, diagnostics, context);
@@ -21438,8 +21481,8 @@
 			result &= validate_EveryDataValueConforms(addVariableValueAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(
-				addVariableValueAction, diagnostics, context);
+			result &= validate_EveryReferenceIsContained(addVariableValueAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				addVariableValueAction, diagnostics, context);
@@ -21459,8 +21502,8 @@
 			result &= validateElement_validateHasOwner(addVariableValueAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(
-				addVariableValueAction, diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(addVariableValueAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				addVariableValueAction, diagnostics, context);
@@ -21536,8 +21579,8 @@
 		boolean result = validate_EveryMultiplicityConforms(
 			removeVariableValueAction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(
-				removeVariableValueAction, diagnostics, context);
+			result &= validate_EveryDataValueConforms(removeVariableValueAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(
 				removeVariableValueAction, diagnostics, context);
@@ -21637,8 +21680,8 @@
 			result &= validate_UniqueID(raiseExceptionAction, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(raiseExceptionAction,
-				diagnostics, context);
+			result &= validate_EveryKeyUnique(raiseExceptionAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(raiseExceptionAction,
 				diagnostics, context);
@@ -21732,8 +21775,8 @@
 			result &= validateObjectNode_validateSelectionBehavior(
 				actionInputPin, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateObjectNode_validateObjectFlowEdges(
-				actionInputPin, diagnostics, context);
+			result &= validateObjectNode_validateObjectFlowEdges(actionInputPin,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateMultiplicityElement_validateUpperGeLower(
 				actionInputPin, diagnostics, context);
@@ -21756,8 +21799,8 @@
 			result &= validatePin_validateControlPins(actionInputPin,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validatePin_validateNotUnique(actionInputPin,
-				diagnostics, context);
+			result &= validatePin_validateNotUnique(actionInputPin, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateInputPin_validateOutgoingEdgesStructuredOnly(
 				actionInputPin, diagnostics, context);
@@ -21832,8 +21875,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				readExtentAction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(readExtentAction,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(readExtentAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(readExtentAction, diagnostics, context);
 		if (result || diagnostics != null)
@@ -21908,8 +21951,8 @@
 	public boolean validateReclassifyObjectAction(
 			ReclassifyObjectAction reclassifyObjectAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(reclassifyObjectAction,
-			diagnostics, context))
+		if (!validate_NoCircularContainment(reclassifyObjectAction, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(
 			reclassifyObjectAction, diagnostics, context);
@@ -21917,8 +21960,8 @@
 			result &= validate_EveryDataValueConforms(reclassifyObjectAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(
-				reclassifyObjectAction, diagnostics, context);
+			result &= validate_EveryReferenceIsContained(reclassifyObjectAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				reclassifyObjectAction, diagnostics, context);
@@ -21938,8 +21981,8 @@
 			result &= validateElement_validateHasOwner(reclassifyObjectAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(
-				reclassifyObjectAction, diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(reclassifyObjectAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				reclassifyObjectAction, diagnostics, context);
@@ -21979,8 +22022,8 @@
 	public boolean validateReclassifyObjectAction_validateClassifierNotAbstract(
 			ReclassifyObjectAction reclassifyObjectAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return reclassifyObjectAction.validateClassifierNotAbstract(
-			diagnostics, context);
+		return reclassifyObjectAction.validateClassifierNotAbstract(diagnostics,
+			context);
 	}
 
 	/**
@@ -21992,8 +22035,8 @@
 	public boolean validateReclassifyObjectAction_validateMultiplicity(
 			ReclassifyObjectAction reclassifyObjectAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return reclassifyObjectAction
-			.validateMultiplicity(diagnostics, context);
+		return reclassifyObjectAction.validateMultiplicity(diagnostics,
+			context);
 	}
 
 	/**
@@ -22040,8 +22083,8 @@
 			result &= validate_EveryKeyUnique(readIsClassifiedObjectAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(
-				readIsClassifiedObjectAction, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(readIsClassifiedObjectAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(
 				readIsClassifiedObjectAction, diagnostics, context);
@@ -22090,8 +22133,8 @@
 	public boolean validateReadIsClassifiedObjectAction_validateMultiplicityOfInput(
 			ReadIsClassifiedObjectAction readIsClassifiedObjectAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return readIsClassifiedObjectAction.validateMultiplicityOfInput(
-			diagnostics, context);
+		return readIsClassifiedObjectAction
+			.validateMultiplicityOfInput(diagnostics, context);
 	}
 
 	/**
@@ -22103,8 +22146,8 @@
 	public boolean validateReadIsClassifiedObjectAction_validateNoType(
 			ReadIsClassifiedObjectAction readIsClassifiedObjectAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return readIsClassifiedObjectAction
-			.validateNoType(diagnostics, context);
+		return readIsClassifiedObjectAction.validateNoType(diagnostics,
+			context);
 	}
 
 	/**
@@ -22116,8 +22159,8 @@
 	public boolean validateReadIsClassifiedObjectAction_validateMultiplicityOfOutput(
 			ReadIsClassifiedObjectAction readIsClassifiedObjectAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return readIsClassifiedObjectAction.validateMultiplicityOfOutput(
-			diagnostics, context);
+		return readIsClassifiedObjectAction
+			.validateMultiplicityOfOutput(diagnostics, context);
 	}
 
 	/**
@@ -22156,8 +22199,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				startClassifierBehaviorAction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(
-				startClassifierBehaviorAction, diagnostics, context);
+			result &= validate_EveryProxyResolves(startClassifierBehaviorAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(startClassifierBehaviorAction,
 				diagnostics, context);
@@ -22222,8 +22265,8 @@
 	public boolean validateStartClassifierBehaviorAction_validateTypeHasClassifier(
 			StartClassifierBehaviorAction startClassifierBehaviorAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return startClassifierBehaviorAction.validateTypeHasClassifier(
-			diagnostics, context);
+		return startClassifierBehaviorAction
+			.validateTypeHasClassifier(diagnostics, context);
 	}
 
 	/**
@@ -22329,8 +22372,8 @@
 	public boolean validateReadLinkObjectEndAction_validateAssociationOfAssociation(
 			ReadLinkObjectEndAction readLinkObjectEndAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return readLinkObjectEndAction.validateAssociationOfAssociation(
-			diagnostics, context);
+		return readLinkObjectEndAction
+			.validateAssociationOfAssociation(diagnostics, context);
 	}
 
 	/**
@@ -22368,8 +22411,8 @@
 	public boolean validateReadLinkObjectEndAction_validateMultiplicityOfObject(
 			ReadLinkObjectEndAction readLinkObjectEndAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return readLinkObjectEndAction.validateMultiplicityOfObject(
-			diagnostics, context);
+		return readLinkObjectEndAction.validateMultiplicityOfObject(diagnostics,
+			context);
 	}
 
 	/**
@@ -22394,8 +22437,8 @@
 	public boolean validateReadLinkObjectEndAction_validateMultiplicityOfResult(
 			ReadLinkObjectEndAction readLinkObjectEndAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return readLinkObjectEndAction.validateMultiplicityOfResult(
-			diagnostics, context);
+		return readLinkObjectEndAction.validateMultiplicityOfResult(diagnostics,
+			context);
 	}
 
 	/**
@@ -22492,8 +22535,8 @@
 	public boolean validateReadLinkObjectEndQualifierAction_validateQualifierAttribute(
 			ReadLinkObjectEndQualifierAction readLinkObjectEndQualifierAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return readLinkObjectEndQualifierAction.validateQualifierAttribute(
-			diagnostics, context);
+		return readLinkObjectEndQualifierAction
+			.validateQualifierAttribute(diagnostics, context);
 	}
 
 	/**
@@ -22518,8 +22561,8 @@
 	public boolean validateReadLinkObjectEndQualifierAction_validateEndsOfAssociation(
 			ReadLinkObjectEndQualifierAction readLinkObjectEndQualifierAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return readLinkObjectEndQualifierAction.validateEndsOfAssociation(
-			diagnostics, context);
+		return readLinkObjectEndQualifierAction
+			.validateEndsOfAssociation(diagnostics, context);
 	}
 
 	/**
@@ -22531,8 +22574,8 @@
 	public boolean validateReadLinkObjectEndQualifierAction_validateTypeOfObject(
 			ReadLinkObjectEndQualifierAction readLinkObjectEndQualifierAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return readLinkObjectEndQualifierAction.validateTypeOfObject(
-			diagnostics, context);
+		return readLinkObjectEndQualifierAction
+			.validateTypeOfObject(diagnostics, context);
 	}
 
 	/**
@@ -22557,8 +22600,8 @@
 	public boolean validateReadLinkObjectEndQualifierAction_validateMultiplicityOfObject(
 			ReadLinkObjectEndQualifierAction readLinkObjectEndQualifierAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return readLinkObjectEndQualifierAction.validateMultiplicityOfObject(
-			diagnostics, context);
+		return readLinkObjectEndQualifierAction
+			.validateMultiplicityOfObject(diagnostics, context);
 	}
 
 	/**
@@ -22583,8 +22626,8 @@
 	public boolean validateReadLinkObjectEndQualifierAction_validateMultiplicityOfResult(
 			ReadLinkObjectEndQualifierAction readLinkObjectEndQualifierAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return readLinkObjectEndQualifierAction.validateMultiplicityOfResult(
-			diagnostics, context);
+		return readLinkObjectEndQualifierAction
+			.validateMultiplicityOfResult(diagnostics, context);
 	}
 
 	/**
@@ -22595,8 +22638,8 @@
 	public boolean validateCreateLinkObjectAction(
 			CreateLinkObjectAction createLinkObjectAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(createLinkObjectAction,
-			diagnostics, context))
+		if (!validate_NoCircularContainment(createLinkObjectAction, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(
 			createLinkObjectAction, diagnostics, context);
@@ -22604,8 +22647,8 @@
 			result &= validate_EveryDataValueConforms(createLinkObjectAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(
-				createLinkObjectAction, diagnostics, context);
+			result &= validate_EveryReferenceIsContained(createLinkObjectAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				createLinkObjectAction, diagnostics, context);
@@ -22625,8 +22668,8 @@
 			result &= validateElement_validateHasOwner(createLinkObjectAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(
-				createLinkObjectAction, diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(createLinkObjectAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				createLinkObjectAction, diagnostics, context);
@@ -22694,8 +22737,8 @@
 	public boolean validateCreateLinkObjectAction_validateTypeOfResult(
 			CreateLinkObjectAction createLinkObjectAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return createLinkObjectAction
-			.validateTypeOfResult(diagnostics, context);
+		return createLinkObjectAction.validateTypeOfResult(diagnostics,
+			context);
 	}
 
 	/**
@@ -22707,8 +22750,8 @@
 	public boolean validateCreateLinkObjectAction_validateMultiplicity(
 			CreateLinkObjectAction createLinkObjectAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return createLinkObjectAction
-			.validateMultiplicity(diagnostics, context);
+		return createLinkObjectAction.validateMultiplicity(diagnostics,
+			context);
 	}
 
 	/**
@@ -22737,7 +22780,8 @@
 			result &= validate_EveryProxyResolves(acceptEventAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_UniqueID(acceptEventAction, diagnostics, context);
+			result &= validate_UniqueID(acceptEventAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(acceptEventAction, diagnostics,
 				context);
@@ -22869,8 +22913,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				acceptCallAction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(acceptCallAction,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(acceptCallAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(acceptCallAction, diagnostics, context);
 		if (result || diagnostics != null)
@@ -22992,13 +23036,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(replyAction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(replyAction, diagnostics, context);
+			result &= validate_EveryKeyUnique(replyAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(replyAction, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(replyAction,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(replyAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(replyAction,
 				diagnostics, context);
@@ -23006,8 +23051,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				replyAction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				replyAction, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(replyAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				replyAction, diagnostics, context);
@@ -23076,8 +23121,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				unmarshallAction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(unmarshallAction,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(unmarshallAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(unmarshallAction, diagnostics, context);
 		if (result || diagnostics != null)
@@ -23174,8 +23219,8 @@
 	public boolean validateUnmarshallAction_validateTypeOrderingAndMultiplicity(
 			UnmarshallAction unmarshallAction, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return unmarshallAction.validateTypeOrderingAndMultiplicity(
-			diagnostics, context);
+		return unmarshallAction.validateTypeOrderingAndMultiplicity(diagnostics,
+			context);
 	}
 
 	/**
@@ -23202,14 +23247,14 @@
 		boolean result = validate_EveryMultiplicityConforms(reduceAction,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(reduceAction,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(reduceAction, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(reduceAction,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				reduceAction, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(reduceAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(reduceAction, diagnostics,
 				context);
@@ -23308,8 +23353,8 @@
 		boolean result = validate_EveryMultiplicityConforms(
 			startObjectBehaviorAction, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(
-				startObjectBehaviorAction, diagnostics, context);
+			result &= validate_EveryDataValueConforms(startObjectBehaviorAction,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(
 				startObjectBehaviorAction, diagnostics, context);
@@ -23407,8 +23452,8 @@
 	public boolean validateStartObjectBehaviorAction_validateMultiplicityOfObject(
 			StartObjectBehaviorAction startObjectBehaviorAction,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return startObjectBehaviorAction.validateMultiplicityOfObject(
-			diagnostics, context);
+		return startObjectBehaviorAction
+			.validateMultiplicityOfObject(diagnostics, context);
 	}
 
 	/**
@@ -23437,13 +23482,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(controlNode, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(controlNode, diagnostics, context);
+			result &= validate_EveryKeyUnique(controlNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(controlNode, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(controlNode,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(controlNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(controlNode,
 				diagnostics, context);
@@ -23451,8 +23497,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				controlNode, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				controlNode, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(controlNode,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				controlNode, diagnostics, context);
@@ -23494,13 +23540,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(controlFlow, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(controlFlow, diagnostics, context);
+			result &= validate_EveryKeyUnique(controlFlow, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(controlFlow, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(controlFlow,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(controlFlow, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(controlFlow,
 				diagnostics, context);
@@ -23508,8 +23555,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				controlFlow, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				controlFlow, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(controlFlow,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				controlFlow, diagnostics, context);
@@ -23569,13 +23616,14 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(initialNode, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(initialNode, diagnostics, context);
+			result &= validate_EveryKeyUnique(initialNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(initialNode, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateHasOwner(initialNode,
-				diagnostics, context);
+			result &= validateElement_validateHasOwner(initialNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateNotOwnSelf(initialNode,
 				diagnostics, context);
@@ -23583,8 +23631,8 @@
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				initialNode, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasQualifiedName(
-				initialNode, diagnostics, context);
+			result &= validateNamedElement_validateHasQualifiedName(initialNode,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateHasNoQualifiedName(
 				initialNode, diagnostics, context);
@@ -23724,8 +23772,8 @@
 	public boolean validateActivityParameterNode_validateHasParameters(
 			ActivityParameterNode activityParameterNode,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return activityParameterNode
-			.validateHasParameters(diagnostics, context);
+		return activityParameterNode.validateHasParameters(diagnostics,
+			context);
 	}
 
 	/**
@@ -23870,7 +23918,8 @@
 	 */
 	public boolean validateFlowFinalNode(FlowFinalNode flowFinalNode,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(flowFinalNode, diagnostics, context))
+		if (!validate_NoCircularContainment(flowFinalNode, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(flowFinalNode,
 			diagnostics, context);
@@ -23939,8 +23988,8 @@
 			result &= validate_EveryDataValueConforms(finalNode, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(finalNode,
-				diagnostics, context);
+			result &= validate_EveryReferenceIsContained(finalNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(finalNode,
 				diagnostics, context);
@@ -23958,8 +24007,8 @@
 			result &= validateElement_validateHasOwner(finalNode, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(finalNode,
-				diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(finalNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				finalNode, diagnostics, context);
@@ -23967,8 +24016,8 @@
 			result &= validateNamedElement_validateHasQualifiedName(finalNode,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasNoQualifiedName(
-				finalNode, diagnostics, context);
+			result &= validateNamedElement_validateHasNoQualifiedName(finalNode,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateRedefinableElement_validateRedefinitionConsistent(
 				finalNode, diagnostics, context);
@@ -24022,7 +24071,8 @@
 			result &= validate_EveryProxyResolves(centralBufferNode,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_UniqueID(centralBufferNode, diagnostics, context);
+			result &= validate_UniqueID(centralBufferNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(centralBufferNode, diagnostics,
 				context);
@@ -24080,8 +24130,8 @@
 			result &= validate_EveryDataValueConforms(mergeNode, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(mergeNode,
-				diagnostics, context);
+			result &= validate_EveryReferenceIsContained(mergeNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(mergeNode,
 				diagnostics, context);
@@ -24099,8 +24149,8 @@
 			result &= validateElement_validateHasOwner(mergeNode, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(mergeNode,
-				diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(mergeNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				mergeNode, diagnostics, context);
@@ -24108,8 +24158,8 @@
 			result &= validateNamedElement_validateHasQualifiedName(mergeNode,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasNoQualifiedName(
-				mergeNode, diagnostics, context);
+			result &= validateNamedElement_validateHasNoQualifiedName(mergeNode,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateRedefinableElement_validateRedefinitionConsistent(
 				mergeNode, diagnostics, context);
@@ -24163,14 +24213,14 @@
 		boolean result = validate_EveryMultiplicityConforms(decisionNode,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(decisionNode,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(decisionNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(decisionNode,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				decisionNode, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(decisionNode,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(decisionNode, diagnostics,
 				context);
@@ -24251,9 +24301,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateDecisionNode_validateEdges(
-			DecisionNode decisionNode, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateDecisionNode_validateEdges(DecisionNode decisionNode,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return decisionNode.validateEdges(diagnostics, context);
 	}
 
@@ -24303,8 +24352,8 @@
 	public boolean validateDecisionNode_validateIncomingObjectOneInputParameter(
 			DecisionNode decisionNode, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return decisionNode.validateIncomingObjectOneInputParameter(
-			diagnostics, context);
+		return decisionNode.validateIncomingObjectOneInputParameter(diagnostics,
+			context);
 	}
 
 	/**
@@ -24316,8 +24365,8 @@
 	public boolean validateDecisionNode_validateIncomingControlOneInputParameter(
 			DecisionNode decisionNode, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return decisionNode.validateIncomingControlOneInputParameter(
-			diagnostics, context);
+		return decisionNode
+			.validateIncomingControlOneInputParameter(diagnostics, context);
 	}
 
 	/**
@@ -24358,7 +24407,8 @@
 			result &= validate_EveryProxyResolves(activityFinalNode,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_UniqueID(activityFinalNode, diagnostics, context);
+			result &= validate_UniqueID(activityFinalNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(activityFinalNode, diagnostics,
 				context);
@@ -24488,7 +24538,8 @@
 	 */
 	public boolean validateDataStoreNode(DataStoreNode dataStoreNode,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(dataStoreNode, diagnostics, context))
+		if (!validate_NoCircularContainment(dataStoreNode, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(dataStoreNode,
 			diagnostics, context);
@@ -24624,8 +24675,8 @@
 			result &= validateObjectFlow_validateSameUpperBounds(objectFlow,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateObjectFlow_validateTarget(objectFlow,
-				diagnostics, context);
+			result &= validateObjectFlow_validateTarget(objectFlow, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateObjectFlow_validateIsMulticastOrIsMultireceive(
 				objectFlow, diagnostics, context);
@@ -24740,14 +24791,14 @@
 		boolean result = validate_EveryMultiplicityConforms(sequenceNode,
 			diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(sequenceNode,
-				diagnostics, context);
+			result &= validate_EveryDataValueConforms(sequenceNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(sequenceNode,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-				sequenceNode, diagnostics, context);
+			result &= validate_EveryBidirectionalReferenceIsPaired(sequenceNode,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(sequenceNode, diagnostics,
 				context);
@@ -24802,8 +24853,8 @@
 			result &= validateStructuredActivityNode_validateOutputPinEdges(
 				sequenceNode, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateStructuredActivityNode_validateEdges(
-				sequenceNode, diagnostics, context);
+			result &= validateStructuredActivityNode_validateEdges(sequenceNode,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateStructuredActivityNode_validateInputPinEdges(
 				sequenceNode, diagnostics, context);
@@ -24840,8 +24891,8 @@
 			result &= validate_EveryKeyUnique(conditionalNode, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(conditionalNode,
-				diagnostics, context);
+			result &= validate_EveryMapEntryUnique(conditionalNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(conditionalNode,
 				diagnostics, context);
@@ -24981,8 +25032,8 @@
 	public boolean validateConditionalNode_validateClauseNoPredecessor(
 			ConditionalNode conditionalNode, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return conditionalNode
-			.validateClauseNoPredecessor(diagnostics, context);
+		return conditionalNode.validateClauseNoPredecessor(diagnostics,
+			context);
 	}
 
 	/**
@@ -24994,8 +25045,8 @@
 			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(clause, diagnostics, context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(clause,
-			diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(clause, diagnostics,
+			context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(clause, diagnostics,
 				context);
@@ -25012,7 +25063,8 @@
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(clause, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(clause, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(clause, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(clause, diagnostics,
 				context);
@@ -25020,8 +25072,8 @@
 			result &= validateElement_validateNotOwnSelf(clause, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateClause_validateBodyOutputPins(clause,
-				diagnostics, context);
+			result &= validateClause_validateBodyOutputPins(clause, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateClause_validateDeciderOutput(clause, diagnostics,
 				context);
@@ -25119,8 +25171,8 @@
 			result &= validateRedefinableElement_validateRedefinitionContextValid(
 				loopNode, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamespace_validateMembersDistinguishable(
-				loopNode, diagnostics, context);
+			result &= validateNamespace_validateMembersDistinguishable(loopNode,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamespace_validateCannotImportSelf(loopNode,
 				diagnostics, context);
@@ -25146,8 +25198,8 @@
 			result &= validateLoopNode_validateResultNoIncoming(loopNode,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateLoopNode_validateInputEdges(loopNode,
-				diagnostics, context);
+			result &= validateLoopNode_validateInputEdges(loopNode, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateLoopNode_validateExecutableNodes(loopNode,
 				diagnostics, context);
@@ -25282,7 +25334,8 @@
 	 */
 	public boolean validateExpansionNode(ExpansionNode expansionNode,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(expansionNode, diagnostics, context))
+		if (!validate_NoCircularContainment(expansionNode, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(expansionNode,
 			diagnostics, context);
@@ -25354,8 +25407,8 @@
 	public boolean validateExpansionNode_validateRegionAsInputOrOutput(
 			ExpansionNode expansionNode, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return expansionNode
-			.validateRegionAsInputOrOutput(diagnostics, context);
+		return expansionNode.validateRegionAsInputOrOutput(diagnostics,
+			context);
 	}
 
 	/**
@@ -25388,8 +25441,8 @@
 			result &= validate_EveryKeyUnique(expansionRegion, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(expansionRegion,
-				diagnostics, context);
+			result &= validate_EveryMapEntryUnique(expansionRegion, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(expansionRegion,
 				diagnostics, context);
@@ -25470,8 +25523,8 @@
 			result &= validate_UniqueID(componentRealization, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(componentRealization,
-				diagnostics, context);
+			result &= validate_EveryKeyUnique(componentRealization, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(componentRealization,
 				diagnostics, context);
@@ -25511,8 +25564,8 @@
 			result &= validate_EveryDataValueConforms(component, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(component,
-				diagnostics, context);
+			result &= validate_EveryReferenceIsContained(component, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(component,
 				diagnostics, context);
@@ -25530,8 +25583,8 @@
 			result &= validateElement_validateHasOwner(component, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(component,
-				diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(component, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				component, diagnostics, context);
@@ -25539,8 +25592,8 @@
 			result &= validateNamedElement_validateHasQualifiedName(component,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasNoQualifiedName(
-				component, diagnostics, context);
+			result &= validateNamedElement_validateHasNoQualifiedName(component,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateNamespace_validateMembersDistinguishable(
 				component, diagnostics, context);
@@ -25578,8 +25631,8 @@
 			result &= validateBehavioredClassifier_validateClassBehavior(
 				component, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateClass_validatePassiveClass(component,
-				diagnostics, context);
+			result &= validateClass_validatePassiveClass(component, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateComponent_validateNoNestedClassifiers(component,
 				diagnostics, context);
@@ -25721,8 +25774,8 @@
 			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(device, diagnostics, context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(device,
-			diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(device, diagnostics,
+			context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(device, diagnostics,
 				context);
@@ -25739,7 +25792,8 @@
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(device, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(device, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(device, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateElement_validateHasOwner(device, diagnostics,
 				context);
@@ -25762,8 +25816,8 @@
 			result &= validateNamespace_validateCannotImportSelf(device,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamespace_validateCannotImportOwnedMembers(
-				device, diagnostics, context);
+			result &= validateNamespace_validateCannotImportOwnedMembers(device,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateRedefinableElement_validateRedefinitionConsistent(
 				device, diagnostics, context);
@@ -25780,8 +25834,8 @@
 			result &= validateClassifier_validateSpecializeType(device,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateClassifier_validateMapsToGeneralizationSet(
-				device, diagnostics, context);
+			result &= validateClassifier_validateMapsToGeneralizationSet(device,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateClassifier_validateNonFinalParents(device,
 				diagnostics, context);
@@ -25789,8 +25843,8 @@
 			result &= validateClassifier_validateNoCyclesInGeneralization(
 				device, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateBehavioredClassifier_validateClassBehavior(
-				device, diagnostics, context);
+			result &= validateBehavioredClassifier_validateClassBehavior(device,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validateClass_validatePassiveClass(device, diagnostics,
 				context);
@@ -25829,8 +25883,8 @@
 			result &= validate_UniqueID(executionEnvironment, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(executionEnvironment,
-				diagnostics, context);
+			result &= validate_EveryKeyUnique(executionEnvironment, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(executionEnvironment,
 				diagnostics, context);
@@ -25920,7 +25974,8 @@
 			result &= validate_EveryProxyResolves(communicationPath,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_UniqueID(communicationPath, diagnostics, context);
+			result &= validate_UniqueID(communicationPath, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(communicationPath, diagnostics,
 				context);
@@ -26069,8 +26124,8 @@
 			result &= validateRedefinableElement_validateRedefinitionContextValid(
 				finalState, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateState_validateEntryOrExit(finalState,
-				diagnostics, context);
+			result &= validateState_validateEntryOrExit(finalState, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateState_validateSubmachineStates(finalState,
 				diagnostics, context);
@@ -26191,8 +26246,8 @@
 			result &= validate_EveryDataValueConforms(timeEvent, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(timeEvent,
-				diagnostics, context);
+			result &= validate_EveryReferenceIsContained(timeEvent, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(timeEvent,
 				diagnostics, context);
@@ -26210,8 +26265,8 @@
 			result &= validateElement_validateHasOwner(timeEvent, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validateElement_validateNotOwnSelf(timeEvent,
-				diagnostics, context);
+			result &= validateElement_validateNotOwnSelf(timeEvent, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateNamedElement_validateVisibilityNeedsOwnership(
 				timeEvent, diagnostics, context);
@@ -26219,8 +26274,8 @@
 			result &= validateNamedElement_validateHasQualifiedName(timeEvent,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validateNamedElement_validateHasNoQualifiedName(
-				timeEvent, diagnostics, context);
+			result &= validateNamedElement_validateHasNoQualifiedName(timeEvent,
+				diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validatePackageableElement_validateNamespaceNeedsVisibility(
 				timeEvent, diagnostics, context);
@@ -26408,8 +26463,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(
 				associationClass, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(associationClass,
-				diagnostics, context);
+			result &= validate_EveryProxyResolves(associationClass, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(associationClass, diagnostics, context);
 		if (result || diagnostics != null)
@@ -26678,10 +26733,11 @@
 		eClasses.add(eClass);
 		eClasses.addAll(eClass.getEAllSuperTypes());
 		String redefinitionDetail = null;
-		for (Iterator<EClass> eClassesIterator = eClasses.iterator(); redefinitionDetail == null
-			&& eClassesIterator.hasNext();) {
-			EAnnotation eAnnotation = eClassesIterator.next().getEAnnotation(
-				"duplicates"); //$NON-NLS-1$
+		for (Iterator<EClass> eClassesIterator = eClasses
+			.iterator(); redefinitionDetail == null
+				&& eClassesIterator.hasNext();) {
+			EAnnotation eAnnotation = eClassesIterator.next()
+				.getEAnnotation("duplicates"); //$NON-NLS-1$
 			if (eAnnotation != null) {
 				EAnnotation nestedEAnnotation = eAnnotation
 					.getEAnnotation(featureName);
@@ -26775,36 +26831,34 @@
 					if (size < lowerBound) {
 						result = false;
 						if (diagnostics != null) {
-							diagnostics
-								.add(createDiagnostic(
-									Diagnostic.ERROR,
-									EObjectValidator.DIAGNOSTIC_SOURCE,
-									EObjectValidator.EOBJECT__EVERY_MULTIPCITY_CONFORMS,
-									"_UI_FeatureHasTooFewValues_diagnostic", //$NON-NLS-1$
-									new Object[]{
-										getFeatureLabel(eStructuralFeature,
-											context),
-										getObjectLabel(eObject, context), size,
-										lowerBound}, new Object[]{eObject,
-										eStructuralFeature}, context));
+							diagnostics.add(createDiagnostic(Diagnostic.ERROR,
+								EObjectValidator.DIAGNOSTIC_SOURCE,
+								EObjectValidator.EOBJECT__EVERY_MULTIPCITY_CONFORMS,
+								"_UI_FeatureHasTooFewValues_diagnostic", //$NON-NLS-1$
+								new Object[]{
+									getFeatureLabel(eStructuralFeature,
+										context),
+									getObjectLabel(eObject, context), size,
+									lowerBound},
+								new Object[]{eObject, eStructuralFeature},
+								context));
 						}
 					}
 					int upperBound = getUpperBound(eObject, eStructuralFeature);
 					if (upperBound > 0 && size > upperBound) {
 						result = false;
 						if (diagnostics != null) {
-							diagnostics
-								.add(createDiagnostic(
-									Diagnostic.ERROR,
-									EObjectValidator.DIAGNOSTIC_SOURCE,
-									EObjectValidator.EOBJECT__EVERY_MULTIPCITY_CONFORMS,
-									"_UI_FeatureHasTooManyValues_diagnostic", //$NON-NLS-1$
-									new Object[]{
-										getFeatureLabel(eStructuralFeature,
-											context),
-										getObjectLabel(eObject, context), size,
-										upperBound}, new Object[]{eObject,
-										eStructuralFeature}, context));
+							diagnostics.add(createDiagnostic(Diagnostic.ERROR,
+								EObjectValidator.DIAGNOSTIC_SOURCE,
+								EObjectValidator.EOBJECT__EVERY_MULTIPCITY_CONFORMS,
+								"_UI_FeatureHasTooManyValues_diagnostic", //$NON-NLS-1$
+								new Object[]{
+									getFeatureLabel(eStructuralFeature,
+										context),
+									getObjectLabel(eObject, context), size,
+									upperBound},
+								new Object[]{eObject, eStructuralFeature},
+								context));
 						}
 					}
 				} else {
@@ -26815,19 +26869,18 @@
 						if (size > upperBound) {
 							result = false;
 							if (diagnostics != null) {
-								diagnostics
-									.add(createDiagnostic(
-										Diagnostic.ERROR,
-										EObjectValidator.DIAGNOSTIC_SOURCE,
-										EObjectValidator.EOBJECT__EVERY_MULTIPCITY_CONFORMS,
-										"_UI_FeatureHasTooManyValues_diagnostic", //$NON-NLS-1$
-										new Object[]{
-											getFeatureLabel(eStructuralFeature,
-												context),
-											getObjectLabel(eObject, context),
-											size, upperBound}, new Object[]{
-											eObject, eStructuralFeature},
-										context));
+								diagnostics.add(createDiagnostic(
+									Diagnostic.ERROR,
+									EObjectValidator.DIAGNOSTIC_SOURCE,
+									EObjectValidator.EOBJECT__EVERY_MULTIPCITY_CONFORMS,
+									"_UI_FeatureHasTooManyValues_diagnostic", //$NON-NLS-1$
+									new Object[]{
+										getFeatureLabel(eStructuralFeature,
+											context),
+										getObjectLabel(eObject, context), size,
+										upperBound},
+									new Object[]{eObject, eStructuralFeature},
+									context));
 							}
 						}
 					}
@@ -26839,15 +26892,14 @@
 				: eObject.eGet(eStructuralFeature, false) == null) {
 				result = false;
 				if (diagnostics != null) {
-					diagnostics.add(createDiagnostic(
-						Diagnostic.ERROR,
+					diagnostics.add(createDiagnostic(Diagnostic.ERROR,
 						EObjectValidator.DIAGNOSTIC_SOURCE,
 						EObjectValidator.EOBJECT__EVERY_MULTIPCITY_CONFORMS,
 						"_UI_RequiredFeatureMustBeSet_diagnostic", //$NON-NLS-1$
 						new Object[]{
 							getFeatureLabel(eStructuralFeature, context),
-							getObjectLabel(eObject, context)}, new Object[]{
-							eObject, eStructuralFeature}, context));
+							getObjectLabel(eObject, context)},
+						new Object[]{eObject, eStructuralFeature}, context));
 				}
 			}
 		}
diff --git a/plugins/org.eclipse.uml2/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2/META-INF/MANIFEST.MF
index 030a8be..9d0c2e1 100644
--- a/plugins/org.eclipse.uml2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2
-Bundle-Version: 5.0.0.qualifier
+Bundle-Version: 5.2.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.uml2/about.properties b/plugins/org.eclipse.uml2/about.properties
index 54084d8..3184df6 100644
--- a/plugins/org.eclipse.uml2/about.properties
+++ b/plugins/org.eclipse.uml2/about.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2014 IBM Corporation, Embarcadero Technologies, and others.
+# Copyright (c) 2006, 2016 IBM Corporation, Embarcadero Technologies, 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
@@ -8,7 +8,7 @@
 #   IBM - initial API and implementation
 #   Kenn Hussey (Embarcadero Technologies) - 219804, 204200
 #   Kenn Hussey - 323181
-#   Kenn Hussey (CEA) - 286404
+#   Kenn Hussey (CEA) - 286404, 485756
 #
 
 # NLS_MESSAGEFORMAT_VAR
@@ -24,5 +24,5 @@
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others 2003, 2014.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2003, 2016.  All rights reserved.\n\
 Visit http://www.eclipse.org/uml2
diff --git a/tests/org.eclipse.uml2.tests-feature/feature.xml b/tests/org.eclipse.uml2.tests-feature/feature.xml
index b7f0f5c..716a5d2 100644
--- a/tests/org.eclipse.uml2.tests-feature/feature.xml
+++ b/tests/org.eclipse.uml2.tests-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.uml2.tests"
       label="%feature.label"
-      version="5.1.0.qualifier"
+      version="5.2.0.qualifier"
       provider-name="%feature.provider-name"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.uml2.license"
@@ -13,7 +13,7 @@
    </description>
 
    <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2003, 2014 IBM Corporation, Embarcadero Technologies, CEA, and others.
+      Copyright (c) 2003, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
diff --git a/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF
index 5b68e9a..07bf860 100644
--- a/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.tests
-Bundle-Version: 5.0.100.qualifier
+Bundle-Version: 5.2.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.uml2.tests/about.properties b/tests/org.eclipse.uml2.tests/about.properties
index c6b2776..8ab1bb4 100644
--- a/tests/org.eclipse.uml2.tests/about.properties
+++ b/tests/org.eclipse.uml2.tests/about.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2014 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# Copyright (c) 2006, 2016 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -7,7 +7,7 @@
 # Contributors: 
 #   IBM - initial API and implementation
 #   Kenn Hussey (Embarcadero Technologies) - 219804, 204200
-#   Kenn Hussey (CEA) - 327039, 388240, 297216, 286404
+#   Kenn Hussey (CEA) - 327039, 388240, 297216, 286404, 485756
 #
 
 # NLS_MESSAGEFORMAT_VAR
@@ -23,5 +23,5 @@
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others 2003, 2014.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2003, 2016.  All rights reserved.\n\
 Visit http://www.eclipse.org/uml2
diff --git a/tests/org.eclipse.uml2.uml.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.uml.tests/META-INF/MANIFEST.MF
index 39a77b5..044e0d5 100644
--- a/tests/org.eclipse.uml2.uml.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.uml2.uml.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.uml.tests;singleton:=true
-Bundle-Version: 5.1.0.qualifier
+Bundle-Version: 5.2.0.qualifier
 Bundle-ClassPath: uml2.uml.tests.jar
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/AddStructuralFeatureValueActionTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/AddStructuralFeatureValueActionTest.java
index c3fc128..05de7c8 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/AddStructuralFeatureValueActionTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/AddStructuralFeatureValueActionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 485756
  *
  */
 package org.eclipse.uml2.uml.tests;
@@ -72,7 +72,8 @@
 	@Override
 	protected void setUp()
 			throws Exception {
-		setFixture(UMLFactory.eINSTANCE.createAddStructuralFeatureValueAction());
+		setFixture(
+			UMLFactory.eINSTANCE.createAddStructuralFeatureValueAction());
 	}
 
 	/**
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ConnectableElementTemplateParameterTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ConnectableElementTemplateParameterTest.java
index d882212..55cb309 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ConnectableElementTemplateParameterTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ConnectableElementTemplateParameterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 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
@@ -7,8 +7,8 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
+ *   Kenn Hussey (CEA) - 485756
  *
- * $Id: ConnectableElementTemplateParameterTest.java,v 1.3 2007/02/14 20:06:12 khussey Exp $
  */
 package org.eclipse.uml2.uml.tests;
 
@@ -65,8 +65,8 @@
 	@Override
 	protected void setUp()
 			throws Exception {
-		setFixture(UMLFactory.eINSTANCE
-			.createConnectableElementTemplateParameter());
+		setFixture(
+			UMLFactory.eINSTANCE.createConnectableElementTemplateParameter());
 	}
 
 	/**
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/DestructionOccurrenceSpecificationTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/DestructionOccurrenceSpecificationTest.java
index f2a2a9a..9ecef1f 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/DestructionOccurrenceSpecificationTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/DestructionOccurrenceSpecificationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 CEA and others.
+ * Copyright (c) 2011, 2016 CEA 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
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *   Kenn Hussey (CEA) - initial API and implementation
+ *   Kenn Hussey (CEA) - 485756
  *
  */
 package org.eclipse.uml2.uml.tests;
@@ -70,8 +71,8 @@
 	@Override
 	protected void setUp()
 			throws Exception {
-		setFixture(UMLFactory.eINSTANCE
-			.createDestructionOccurrenceSpecification());
+		setFixture(
+			UMLFactory.eINSTANCE.createDestructionOccurrenceSpecification());
 	}
 
 	/**
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ElementTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ElementTest.java
index 1b230c4..bc98361 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ElementTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ElementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 323181
- *   Kenn Hussey (CEA) - 327039, 399544
+ *   Kenn Hussey (CEA) - 327039, 399544, 485756
  *
  */
 package org.eclipse.uml2.uml.tests;
@@ -232,9 +232,11 @@
 					.appendFileExtension(UMLResource.FILE_EXTENSION))
 			.getContents().add(comment2);
 
-		EList<EObject> contents = resourceSet.createResource(
-			URI.createFileURI(String.valueOf(new Date().getTime()))
-				.appendFileExtension(UMLResource.FILE_EXTENSION)).getContents();
+		EList<EObject> contents = resourceSet
+			.createResource(
+				URI.createFileURI(String.valueOf(new Date().getTime()))
+					.appendFileExtension(UMLResource.FILE_EXTENSION))
+			.getContents();
 
 		Model model = UMLFactory.eINSTANCE.createModel();
 		contents.add(model);
@@ -303,8 +305,8 @@
 
 		UML2Util
 			.createEAnnotation(getFixture(),
-				UMLUtil.UML2_UML_PACKAGE_2_0_NS_URI).getDetails()
-			.put(getName(), null);
+				UMLUtil.UML2_UML_PACKAGE_2_0_NS_URI)
+			.getDetails().put(getName(), null);
 
 		assertTrue(getFixture().hasKeyword(getName()));
 	}
@@ -321,8 +323,8 @@
 
 		UML2Util
 			.createEAnnotation(getFixture(),
-				UMLUtil.UML2_UML_PACKAGE_2_0_NS_URI).getDetails()
-			.put(getName(), null);
+				UMLUtil.UML2_UML_PACKAGE_2_0_NS_URI)
+			.getDetails().put(getName(), null);
 
 		assertTrue(getFixture().getKeywords().contains(getName()));
 	}
@@ -335,13 +337,13 @@
 	 * @generated NOT
 	 */
 	public void testAddKeyword__String() {
-		assertNull(getFixture().getEAnnotation(
-			UMLUtil.UML2_UML_PACKAGE_2_0_NS_URI));
+		assertNull(
+			getFixture().getEAnnotation(UMLUtil.UML2_UML_PACKAGE_2_0_NS_URI));
 
 		assertTrue(getFixture().addKeyword(getName()));
 
-		EAnnotation eAnnotation = getFixture().getEAnnotation(
-			UMLUtil.UML2_UML_PACKAGE_2_0_NS_URI);
+		EAnnotation eAnnotation = getFixture()
+			.getEAnnotation(UMLUtil.UML2_UML_PACKAGE_2_0_NS_URI);
 		assertNotNull(eAnnotation);
 		assertTrue(eAnnotation.getDetails().containsKey(getName()));
 
@@ -777,12 +779,12 @@
 	public void testAllOwnedElements() {
 		EList<Element> allOwnedElements = getFixture().allOwnedElements();
 
-		assertTrue(allOwnedElements
-			.containsAll(getFixture().getOwnedElements()));
+		assertTrue(
+			allOwnedElements.containsAll(getFixture().getOwnedElements()));
 
 		for (Element ownedElement : allOwnedElements) {
-			assertTrue(allOwnedElements.containsAll(ownedElement
-				.allOwnedElements()));
+			assertTrue(
+				allOwnedElements.containsAll(ownedElement.allOwnedElements()));
 		}
 	}
 
@@ -805,7 +807,8 @@
 			if (eClassifier instanceof EClass) {
 				EClass umlEClass = (EClass) eClassifier;
 
-				if (eClass.isSuperTypeOf(umlEClass) && !umlEClass.isAbstract()) {
+				if (eClass.isSuperTypeOf(umlEClass)
+					&& !umlEClass.isAbstract()) {
 					eAllSubClasses.add(umlEClass);
 				}
 			}
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ExecutionOccurrenceSpecificationTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ExecutionOccurrenceSpecificationTest.java
index 227e4c8..53fcfff 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ExecutionOccurrenceSpecificationTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ExecutionOccurrenceSpecificationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2016 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
@@ -7,8 +7,8 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
+ *   Kenn Hussey (CEA) - 485756
  *
- * $Id: ExecutionOccurrenceSpecificationTest.java,v 1.3 2007/02/14 20:06:12 khussey Exp $
  */
 package org.eclipse.uml2.uml.tests;
 
@@ -65,8 +65,8 @@
 	@Override
 	protected void setUp()
 			throws Exception {
-		setFixture(UMLFactory.eINSTANCE
-			.createExecutionOccurrenceSpecification());
+		setFixture(
+			UMLFactory.eINSTANCE.createExecutionOccurrenceSpecification());
 	}
 
 	/**
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/NamespaceTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/NamespaceTest.java
index c7fd818..c0962be 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/NamespaceTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/NamespaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 323181
- *   Kenn Hussey (CEA) - 327039, 418466
+ *   Kenn Hussey (CEA) - 327039, 418466, 485756
  *
  */
 package org.eclipse.uml2.uml.tests;
@@ -140,7 +140,8 @@
 			// pass
 		}
 
-		EList<EClass> packageableElementSubClasses = getEAllSubClasses(UMLPackage.Literals.PACKAGEABLE_ELEMENT);
+		EList<EClass> packageableElementSubClasses = getEAllSubClasses(
+			UMLPackage.Literals.PACKAGEABLE_ELEMENT);
 
 		for (int i = 0; i < packageableElementSubClasses.size(); i++) {
 			PackageableElement packageableElement = (PackageableElement) UMLFactory.eINSTANCE
@@ -162,8 +163,8 @@
 
 			assertEquals(i + 1, getFixture().getElementImports().size());
 
-			ElementImport elementImport = getFixture().getElementImports().get(
-				i);
+			ElementImport elementImport = getFixture().getElementImports()
+				.get(i);
 
 			assertSame(packageableElement, elementImport.getImportedElement());
 			assertSame(VisibilityKind.PRIVATE_LITERAL,
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PackageTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PackageTest.java
index 81dea99..3085a38 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PackageTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PackageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 418466
+ *   Kenn Hussey (CEA) - 327039, 418466, 485756
  *
  */
 package org.eclipse.uml2.uml.tests;
@@ -54,6 +54,7 @@
  *   <li>{@link org.eclipse.uml2.uml.Package#isModelLibrary() <em>Is Model Library</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.Package#isProfileApplied(org.eclipse.uml2.uml.Profile) <em>Is Profile Applied</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.Package#unapplyProfile(org.eclipse.uml2.uml.Profile) <em>Unapply Profile</em>}</li>
+ *   <li>{@link org.eclipse.uml2.uml.Package#applyProfiles(org.eclipse.emf.common.util.EList) <em>Apply Profiles</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.Package#allApplicableStereotypes() <em>All Applicable Stereotypes</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.Package#containingProfile() <em>Containing Profile</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.Package#makesVisible(org.eclipse.uml2.uml.NamedElement) <em>Makes Visible</em>}</li>
@@ -340,6 +341,18 @@
 	}
 
 	/**
+	 * Tests the '{@link org.eclipse.uml2.uml.Package#applyProfiles(org.eclipse.emf.common.util.EList) <em>Apply Profiles</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.uml2.uml.Package#applyProfiles(org.eclipse.emf.common.util.EList)
+	 * @generated
+	 */
+	public void testApplyProfiles__EList() {
+		// TODO: implement this feature getter test method
+		// Ensure that you remove @generated or mark it @generated NOT
+	}
+
+	/**
 	 * Tests the '{@link org.eclipse.uml2.uml.Package#allApplicableStereotypes() <em>All Applicable Stereotypes</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ParameterTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ParameterTest.java
index 51522d4..dbf971e 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ParameterTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ParameterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 418466
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 485756
  *
  */
 package org.eclipse.uml2.uml.tests;
@@ -530,8 +530,8 @@
 	public void testSetUnlimitedNaturalDefaultValue__int() {
 		assertNull(getFixture().getDefaultValue());
 
-		getFixture().setUnlimitedNaturalDefaultValue(
-			LiteralUnlimitedNatural.UNLIMITED);
+		getFixture()
+			.setUnlimitedNaturalDefaultValue(LiteralUnlimitedNatural.UNLIMITED);
 
 		ValueSpecification defaultValue = getFixture().getDefaultValue();
 
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PropertyTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PropertyTest.java
index 53c463f..f056a40 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PropertyTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PropertyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *   Kenn Hussey - 323181
- *   Kenn Hussey (CEA) - 327039, 351774, 212765, 407028, 418466
+ *   Kenn Hussey (CEA) - 327039, 351774, 212765, 407028, 418466, 485756
  *
  */
 package org.eclipse.uml2.uml.tests;
@@ -529,8 +529,8 @@
 	public void testSetUnlimitedNaturalDefaultValue__int() {
 		assertNull(getFixture().getDefaultValue());
 
-		getFixture().setUnlimitedNaturalDefaultValue(
-			LiteralUnlimitedNatural.UNLIMITED);
+		getFixture()
+			.setUnlimitedNaturalDefaultValue(LiteralUnlimitedNatural.UNLIMITED);
 
 		ValueSpecification defaultValue = getFixture().getDefaultValue();
 
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ReadLinkObjectEndQualifierActionTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ReadLinkObjectEndQualifierActionTest.java
index b20f217..af8f7d7 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ReadLinkObjectEndQualifierActionTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ReadLinkObjectEndQualifierActionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 327039, 351774, 418466
+ *   Kenn Hussey (CEA) - 327039, 351774, 418466, 485756
  *
  */
 package org.eclipse.uml2.uml.tests;
@@ -78,8 +78,8 @@
 	@Override
 	protected void setUp()
 			throws Exception {
-		setFixture(UMLFactory.eINSTANCE
-			.createReadLinkObjectEndQualifierAction());
+		setFixture(
+			UMLFactory.eINSTANCE.createReadLinkObjectEndQualifierAction());
 	}
 
 	/**
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/RemoveStructuralFeatureValueActionTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/RemoveStructuralFeatureValueActionTest.java
index 3992763..939c045 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/RemoveStructuralFeatureValueActionTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/RemoveStructuralFeatureValueActionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2016 IBM Corporation, CEA, 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
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *   IBM - initial API and implementation
- *   Kenn Hussey (CEA) - 418466
+ *   Kenn Hussey (CEA) - 418466, 485756
  *
  */
 package org.eclipse.uml2.uml.tests;
@@ -71,8 +71,8 @@
 	@Override
 	protected void setUp()
 			throws Exception {
-		setFixture(UMLFactory.eINSTANCE
-			.createRemoveStructuralFeatureValueAction());
+		setFixture(
+			UMLFactory.eINSTANCE.createRemoveStructuralFeatureValueAction());
 	}
 
 	/**