[531027] Regenerating based on latest EMF.
diff --git a/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLActionBarContributor.java b/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLActionBarContributor.java
index febe570..7ea0554 100644
--- a/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLActionBarContributor.java
+++ b/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLActionBarContributor.java
@@ -114,8 +114,8 @@
 	 * @generated
 	 */
 	protected IAction showPropertiesViewAction = new Action(
-		UMLEditorPlugin.INSTANCE
-			.getString("_UI_ShowPropertiesView_menu_item")) { //$NON-NLS-1$
+		UMLEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+	{
 
 		@Override
 		public void run() {
@@ -135,7 +135,8 @@
 	 * @generated
 	 */
 	protected IAction refreshViewerAction = new Action(
-		UMLEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) { //$NON-NLS-1$
+		UMLEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+	{
 
 		@Override
 		public boolean isEnabled() {
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Create.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Create.java
index 96d4640..51e777f 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Create.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Create.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -107,7 +107,7 @@
 	 * @model
 	 * @generated
 	 */
-	boolean validateClientAndSupplierAreClassifiers(
-			DiagnosticChain diagnostics, Map<Object, Object> context);
+	boolean validateClientAndSupplierAreClassifiers(DiagnosticChain diagnostics,
+			Map<Object, Object> context);
 
 } // Create
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Instantiate.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Instantiate.java
index d712b86..46e84b3 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Instantiate.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/Instantiate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -80,7 +80,7 @@
 	 * @model
 	 * @generated
 	 */
-	boolean validateClientAndSupplierAreClassifiers(
-			DiagnosticChain diagnostics, Map<Object, Object> context);
+	boolean validateClientAndSupplierAreClassifiers(DiagnosticChain diagnostics,
+			Map<Object, Object> context);
 
 } // Instantiate
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/AuxiliaryImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/AuxiliaryImpl.java
index 697e695..24ac6cd 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/AuxiliaryImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/AuxiliaryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,7 +77,8 @@
 	public org.eclipse.uml2.uml.Class getBase_Class() {
 		if (base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject) base_Class;
-			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(oldBase_Class);
+			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(
+				oldBase_Class);
 			if (base_Class != oldBase_Class) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/CreateImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/CreateImpl.java
index e47e26a..4fbafbc 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/CreateImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/CreateImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -94,9 +94,11 @@
 	 * @generated
 	 */
 	public BehavioralFeature getBase_BehavioralFeature() {
-		if (base_BehavioralFeature != null && base_BehavioralFeature.eIsProxy()) {
+		if (base_BehavioralFeature != null
+			&& base_BehavioralFeature.eIsProxy()) {
 			InternalEObject oldBase_BehavioralFeature = (InternalEObject) base_BehavioralFeature;
-			base_BehavioralFeature = (BehavioralFeature) eResolveProxy(oldBase_BehavioralFeature);
+			base_BehavioralFeature = (BehavioralFeature) eResolveProxy(
+				oldBase_BehavioralFeature);
 			if (base_BehavioralFeature != oldBase_BehavioralFeature) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DeriveImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DeriveImpl.java
index 2e536fc..a828130 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DeriveImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DeriveImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -97,11 +97,14 @@
 				InternalEObject newComputation = (InternalEObject) computation;
 				NotificationChain msgs = oldComputation.eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- StandardPackage.DERIVE__COMPUTATION, null, null);
+						- StandardPackage.DERIVE__COMPUTATION,
+					null, null);
 				if (newComputation.eInternalContainer() == null) {
-					msgs = newComputation.eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-							- StandardPackage.DERIVE__COMPUTATION, null, msgs);
+					msgs = newComputation
+						.eInverseAdd(this,
+							EOPPOSITE_FEATURE_BASE
+								- StandardPackage.DERIVE__COMPUTATION,
+							null, msgs);
 				}
 				if (msgs != null)
 					msgs.dispatch();
@@ -155,11 +158,13 @@
 			if (computation != null)
 				msgs = ((InternalEObject) computation).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE
-						- StandardPackage.DERIVE__COMPUTATION, null, msgs);
+						- StandardPackage.DERIVE__COMPUTATION,
+					null, msgs);
 			if (newComputation != null)
 				msgs = ((InternalEObject) newComputation).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE
-						- StandardPackage.DERIVE__COMPUTATION, null, msgs);
+						- StandardPackage.DERIVE__COMPUTATION,
+					null, msgs);
 			msgs = basicSetComputation(newComputation, msgs);
 			if (msgs != null)
 				msgs.dispatch();
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DestroyImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DestroyImpl.java
index c5dcb72..09b11f4 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DestroyImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/DestroyImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,9 +77,11 @@
 	 * @generated
 	 */
 	public BehavioralFeature getBase_BehavioralFeature() {
-		if (base_BehavioralFeature != null && base_BehavioralFeature.eIsProxy()) {
+		if (base_BehavioralFeature != null
+			&& base_BehavioralFeature.eIsProxy()) {
 			InternalEObject oldBase_BehavioralFeature = (InternalEObject) base_BehavioralFeature;
-			base_BehavioralFeature = (BehavioralFeature) eResolveProxy(oldBase_BehavioralFeature);
+			base_BehavioralFeature = (BehavioralFeature) eResolveProxy(
+				oldBase_BehavioralFeature);
 			if (base_BehavioralFeature != oldBase_BehavioralFeature) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FocusImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FocusImpl.java
index 756901f..5d41110 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FocusImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FocusImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,7 +77,8 @@
 	public org.eclipse.uml2.uml.Class getBase_Class() {
 		if (base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject) base_Class;
-			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(oldBase_Class);
+			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(
+				oldBase_Class);
 			if (base_Class != oldBase_Class) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FrameworkImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FrameworkImpl.java
index 38ee02e..cd9ca8a 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FrameworkImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/FrameworkImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,7 +77,8 @@
 	public org.eclipse.uml2.uml.Package getBase_Package() {
 		if (base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject) base_Package;
-			base_Package = (org.eclipse.uml2.uml.Package) eResolveProxy(oldBase_Package);
+			base_Package = (org.eclipse.uml2.uml.Package) eResolveProxy(
+				oldBase_Package);
 			if (base_Package != oldBase_Package) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ImplementationClassImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ImplementationClassImpl.java
index 56aac1f..c55726f 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ImplementationClassImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ImplementationClassImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -82,7 +82,8 @@
 	public org.eclipse.uml2.uml.Class getBase_Class() {
 		if (base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject) base_Class;
-			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(oldBase_Class);
+			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(
+				oldBase_Class);
 			if (base_Class != oldBase_Class) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -112,8 +113,8 @@
 		base_Class = newBase_Class;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				StandardPackage.IMPLEMENTATION_CLASS__BASE_CLASS,
-				oldBase_Class, base_Class));
+				StandardPackage.IMPLEMENTATION_CLASS__BASE_CLASS, oldBase_Class,
+				base_Class));
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/MetaclassImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/MetaclassImpl.java
index d2d2247..dbc39a4 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/MetaclassImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/MetaclassImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,7 +77,8 @@
 	public org.eclipse.uml2.uml.Class getBase_Class() {
 		if (base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject) base_Class;
-			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(oldBase_Class);
+			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(
+				oldBase_Class);
 			if (base_Class != oldBase_Class) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ModelLibraryImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ModelLibraryImpl.java
index 64b8940..265eabd 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ModelLibraryImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ModelLibraryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,7 +77,8 @@
 	public org.eclipse.uml2.uml.Package getBase_Package() {
 		if (base_Package != null && base_Package.eIsProxy()) {
 			InternalEObject oldBase_Package = (InternalEObject) base_Package;
-			base_Package = (org.eclipse.uml2.uml.Package) eResolveProxy(oldBase_Package);
+			base_Package = (org.eclipse.uml2.uml.Package) eResolveProxy(
+				oldBase_Package);
 			if (base_Package != oldBase_Package) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ScriptImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ScriptImpl.java
index d42b88a..decc785 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ScriptImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/ScriptImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -73,8 +73,8 @@
 			if (base_Artifact != oldBase_Artifact) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						StandardPackage.SCRIPT__BASE_ARTIFACT,
-						oldBase_Artifact, base_Artifact));
+						StandardPackage.SCRIPT__BASE_ARTIFACT, oldBase_Artifact,
+						base_Artifact));
 			}
 		}
 		return base_Artifact;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SourceImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SourceImpl.java
index e10502f..33f94ad 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SourceImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SourceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -73,8 +73,8 @@
 			if (base_Artifact != oldBase_Artifact) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						StandardPackage.SOURCE__BASE_ARTIFACT,
-						oldBase_Artifact, base_Artifact));
+						StandardPackage.SOURCE__BASE_ARTIFACT, oldBase_Artifact,
+						base_Artifact));
 			}
 		}
 		return base_Artifact;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardFactoryImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardFactoryImpl.java
index d740ca0..14abda1 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardFactoryImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -165,8 +165,8 @@
 			case StandardPackage.SYSTEM_MODEL :
 				return createSystemModel();
 			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$
 		}
 	}
 
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardPackageImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardPackageImpl.java
index dc681fd..3d2676e 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardPackageImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/StandardPackageImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -19,8 +19,10 @@
 import org.eclipse.emf.ecore.EReference;
 
 import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
+import org.eclipse.uml2.types.TypesPackage;
 import org.eclipse.uml2.uml.UMLPackage;
 
 import org.eclipse.uml2.uml.profile.standard.Auxiliary;
@@ -328,7 +330,7 @@
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link StandardPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
@@ -344,15 +346,18 @@
 				.getEPackage(StandardPackage.eNS_URI);
 
 		// Obtain or create and register package
-		StandardPackageImpl theStandardPackage = (StandardPackageImpl) (EPackage.Registry.INSTANCE
-			.get(eNS_URI) instanceof StandardPackageImpl
-			? EPackage.Registry.INSTANCE.get(eNS_URI)
-			: new StandardPackageImpl());
+		Object registeredStandardPackage = EPackage.Registry.INSTANCE
+			.get(eNS_URI);
+		StandardPackageImpl theStandardPackage = registeredStandardPackage instanceof StandardPackageImpl
+			? (StandardPackageImpl) registeredStandardPackage
+			: new StandardPackageImpl();
 
 		isInited = true;
 
 		// Initialize simple dependencies
 		UMLPackage.eINSTANCE.eClass();
+		EcorePackage.eINSTANCE.eClass();
+		TypesPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theStandardPackage.createPackageContents();
@@ -1225,30 +1230,27 @@
 		sourceEClass.getESuperTypes().add(this.getFile());
 
 		// Initialize classes, features, and operations; add parameters
-		initEClass(
-			auxiliaryEClass,
-			Auxiliary.class,
-			"Auxiliary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getAuxiliary_Base_Class(),
-			theUMLPackage.getClass_(),
-			null,
-			"base_Class", null, 1, 1, Auxiliary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(auxiliaryEClass, Auxiliary.class, "Auxiliary", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getAuxiliary_Base_Class(), theUMLPackage.getClass_(),
+			null, "base_Class", null, 1, 1, Auxiliary.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
-		initEClass(callEClass, Call.class,
-			"Call", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getCall_Base_Usage(),
-			theUMLPackage.getUsage(),
-			null,
-			"base_Usage", null, 1, 1, Call.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(callEClass, Call.class, "Call", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCall_Base_Usage(), theUMLPackage.getUsage(), null,
+			"base_Usage", null, 1, 1, Call.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+			IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+			IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		EOperation op = initEOperation(
 			getCall__ValidateClientAndSupplierAreOperations__DiagnosticChain_Map(),
 			ecorePackage.getEBoolean(),
-			"validateClientAndSupplierAreOperations", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-		addEParameter(op, ecorePackage.getEDiagnosticChain(),
-			"diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+			"validateClientAndSupplierAreOperations", 0, 1, IS_UNIQUE, //$NON-NLS-1$
+			IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, //$NON-NLS-1$
+			1, IS_UNIQUE, IS_ORDERED);
 		EGenericType g1 = createEGenericType(ecorePackage.getEMap());
 		EGenericType g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -1256,25 +1258,25 @@
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(createEClass, Create.class,
-			"Create", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getCreate_Base_BehavioralFeature(),
-			theUMLPackage.getBehavioralFeature(),
-			null,
-			"base_BehavioralFeature", null, 0, 1, Create.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getCreate_Base_Usage(),
-			theUMLPackage.getUsage(),
-			null,
-			"base_Usage", null, 0, 1, Create.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(createEClass, Create.class, "Create", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCreate_Base_BehavioralFeature(),
+			theUMLPackage.getBehavioralFeature(), null,
+			"base_BehavioralFeature", null, 0, 1, Create.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getCreate_Base_Usage(), theUMLPackage.getUsage(), null,
+			"base_Usage", null, 0, 1, Create.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+			IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+			IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		op = initEOperation(
 			getCreate__ValidateClientAndSupplierAreClassifiers__DiagnosticChain_Map(),
 			ecorePackage.getEBoolean(),
-			"validateClientAndSupplierAreClassifiers", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-		addEParameter(op, ecorePackage.getEDiagnosticChain(),
-			"diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+			"validateClientAndSupplierAreClassifiers", 0, 1, IS_UNIQUE, //$NON-NLS-1$
+			IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, //$NON-NLS-1$
+			1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -1282,87 +1284,75 @@
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(deriveEClass, Derive.class,
-			"Derive", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getDerive_Computation(),
-			theUMLPackage.getValueSpecification(),
-			null,
-			"computation", null, 1, 1, Derive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getDerive_Base_Abstraction(),
-			theUMLPackage.getAbstraction(),
-			null,
-			"base_Abstraction", null, 1, 1, Derive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(deriveEClass, Derive.class, "Derive", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getDerive_Computation(),
+			theUMLPackage.getValueSpecification(), null, "computation", null, 1, //$NON-NLS-1$
+			1, Derive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+			IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, !IS_ORDERED);
+		initEReference(getDerive_Base_Abstraction(),
+			theUMLPackage.getAbstraction(), null, "base_Abstraction", null, 1, //$NON-NLS-1$
+			1, Derive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+			!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, !IS_ORDERED);
 
-		initEClass(destroyEClass, Destroy.class,
-			"Destroy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getDestroy_Base_BehavioralFeature(),
-			theUMLPackage.getBehavioralFeature(),
-			null,
-			"base_BehavioralFeature", null, 1, 1, Destroy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(destroyEClass, Destroy.class, "Destroy", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getDestroy_Base_BehavioralFeature(),
+			theUMLPackage.getBehavioralFeature(), null,
+			"base_BehavioralFeature", null, 1, 1, Destroy.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
-		initEClass(
-			documentEClass,
-			Document.class,
-			"Document", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(documentEClass, Document.class, "Document", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(fileEClass, File.class,
-			"File", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getFile_Base_Artifact(),
-			theUMLPackage.getArtifact(),
-			null,
-			"base_Artifact", null, 1, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(fileEClass, File.class, "File", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getFile_Base_Artifact(), theUMLPackage.getArtifact(),
+			null, "base_Artifact", null, 1, 1, File.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
-		initEClass(entityEClass, Entity.class,
-			"Entity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getEntity_Base_Component(),
-			theUMLPackage.getComponent(),
-			null,
-			"base_Component", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(entityEClass, Entity.class, "Entity", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getEntity_Base_Component(), theUMLPackage.getComponent(),
+			null, "base_Component", null, 1, 1, Entity.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
-		initEClass(
-			executableEClass,
-			Executable.class,
-			"Executable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(executableEClass, Executable.class, "Executable", //$NON-NLS-1$
+			!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(focusEClass, Focus.class,
-			"Focus", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getFocus_Base_Class(),
-			theUMLPackage.getClass_(),
-			null,
-			"base_Class", null, 1, 1, Focus.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(focusEClass, Focus.class, "Focus", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getFocus_Base_Class(), theUMLPackage.getClass_(), null,
+			"base_Class", null, 1, 1, Focus.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+			IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+			IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
-		initEClass(
-			frameworkEClass,
-			Framework.class,
-			"Framework", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getFramework_Base_Package(),
-			theUMLPackage.getPackage(),
-			null,
-			"base_Package", null, 1, 1, Framework.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(frameworkEClass, Framework.class, "Framework", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getFramework_Base_Package(), theUMLPackage.getPackage(),
+			null, "base_Package", null, 1, 1, Framework.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
-		initEClass(
-			implementEClass,
-			Implement.class,
-			"Implement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getImplement_Base_Component(),
-			theUMLPackage.getComponent(),
-			null,
-			"base_Component", null, 1, 1, Implement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(implementEClass, Implement.class, "Implement", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getImplement_Base_Component(),
+			theUMLPackage.getComponent(), null, "base_Component", null, 1, 1, //$NON-NLS-1$
+			Implement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+			!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, !IS_ORDERED);
 
 		op = initEOperation(
 			getImplement__ValidateImplementsSpecification__DiagnosticChain_Map(),
-			ecorePackage.getEBoolean(),
-			"validateImplementsSpecification", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-		addEParameter(op, ecorePackage.getEDiagnosticChain(),
-			"diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+			ecorePackage.getEBoolean(), "validateImplementsSpecification", 0, 1, //$NON-NLS-1$
+			IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, //$NON-NLS-1$
+			1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -1370,22 +1360,21 @@
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(
-			implementationClassEClass,
-			ImplementationClass.class,
-			"ImplementationClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getImplementationClass_Base_Class(),
-			theUMLPackage.getClass_(),
-			null,
-			"base_Class", null, 1, 1, ImplementationClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(implementationClassEClass, ImplementationClass.class,
+			"ImplementationClass", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getImplementationClass_Base_Class(),
+			theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, //$NON-NLS-1$
+			ImplementationClass.class, !IS_TRANSIENT, !IS_VOLATILE,
+			IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+			IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		op = initEOperation(
 			getImplementationClass__ValidateCannotBeRealization__DiagnosticChain_Map(),
-			ecorePackage.getEBoolean(),
-			"validateCannotBeRealization", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-		addEParameter(op, ecorePackage.getEDiagnosticChain(),
-			"diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+			ecorePackage.getEBoolean(), "validateCannotBeRealization", 0, 1, //$NON-NLS-1$
+			IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, //$NON-NLS-1$
+			1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -1393,22 +1382,20 @@
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(
-			instantiateEClass,
-			Instantiate.class,
-			"Instantiate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getInstantiate_Base_Usage(),
-			theUMLPackage.getUsage(),
-			null,
-			"base_Usage", null, 1, 1, Instantiate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(instantiateEClass, Instantiate.class, "Instantiate", //$NON-NLS-1$
+			!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getInstantiate_Base_Usage(), theUMLPackage.getUsage(),
+			null, "base_Usage", null, 1, 1, Instantiate.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		op = initEOperation(
 			getInstantiate__ValidateClientAndSupplierAreClassifiers__DiagnosticChain_Map(),
 			ecorePackage.getEBoolean(),
-			"validateClientAndSupplierAreClassifiers", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-		addEParameter(op, ecorePackage.getEDiagnosticChain(),
-			"diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+			"validateClientAndSupplierAreClassifiers", 0, 1, IS_UNIQUE, //$NON-NLS-1$
+			IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, //$NON-NLS-1$
+			1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -1416,54 +1403,47 @@
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(libraryEClass, Library.class,
-			"Library", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(libraryEClass, Library.class, "Library", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(
-			metaclassEClass,
-			Metaclass.class,
-			"Metaclass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getMetaclass_Base_Class(),
-			theUMLPackage.getClass_(),
-			null,
-			"base_Class", null, 1, 1, Metaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(metaclassEClass, Metaclass.class, "Metaclass", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getMetaclass_Base_Class(), theUMLPackage.getClass_(),
+			null, "base_Class", null, 1, 1, Metaclass.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
-		initEClass(
-			modelLibraryEClass,
-			ModelLibrary.class,
-			"ModelLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getModelLibrary_Base_Package(),
-			theUMLPackage.getPackage(),
-			null,
-			"base_Package", null, 1, 1, ModelLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(modelLibraryEClass, ModelLibrary.class, "ModelLibrary", //$NON-NLS-1$
+			!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getModelLibrary_Base_Package(),
+			theUMLPackage.getPackage(), null, "base_Package", null, 1, 1, //$NON-NLS-1$
+			ModelLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+			!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, !IS_ORDERED);
 
 		initEClass(processEClass,
-			org.eclipse.uml2.uml.profile.standard.Process.class,
-			"Process", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getProcess_Base_Component(),
-			theUMLPackage.getComponent(),
-			null,
-			"base_Component", null, 1, 1, org.eclipse.uml2.uml.profile.standard.Process.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+			org.eclipse.uml2.uml.profile.standard.Process.class, "Process", //$NON-NLS-1$
+			!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getProcess_Base_Component(),
+			theUMLPackage.getComponent(), null, "base_Component", null, 1, 1, //$NON-NLS-1$
+			org.eclipse.uml2.uml.profile.standard.Process.class, !IS_TRANSIENT,
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
-		initEClass(
-			realizationEClass,
-			Realization.class,
-			"Realization", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getRealization_Base_Classifier(),
-			theUMLPackage.getClassifier(),
-			null,
-			"base_Classifier", null, 1, 1, Realization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(realizationEClass, Realization.class, "Realization", //$NON-NLS-1$
+			!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getRealization_Base_Classifier(),
+			theUMLPackage.getClassifier(), null, "base_Classifier", null, 1, 1, //$NON-NLS-1$
+			Realization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+			!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, !IS_ORDERED);
 
 		op = initEOperation(
 			getRealization__ValidateCannotBeImplementationClass__DiagnosticChain_Map(),
-			ecorePackage.getEBoolean(),
-			"validateCannotBeImplementationClass", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-		addEParameter(op, ecorePackage.getEDiagnosticChain(),
-			"diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+			ecorePackage.getEBoolean(), "validateCannotBeImplementationClass", //$NON-NLS-1$
+			0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, //$NON-NLS-1$
+			1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -1471,41 +1451,38 @@
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(refineEClass, Refine.class,
-			"Refine", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getRefine_Base_Abstraction(),
-			theUMLPackage.getAbstraction(),
-			null,
-			"base_Abstraction", null, 1, 1, Refine.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(refineEClass, Refine.class, "Refine", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getRefine_Base_Abstraction(),
+			theUMLPackage.getAbstraction(), null, "base_Abstraction", null, 1, //$NON-NLS-1$
+			1, Refine.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+			!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, !IS_ORDERED);
 
-		initEClass(
-			responsibilityEClass,
-			Responsibility.class,
-			"Responsibility", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getResponsibility_Base_Usage(),
-			theUMLPackage.getUsage(),
-			null,
-			"base_Usage", null, 1, 1, Responsibility.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(responsibilityEClass, Responsibility.class, "Responsibility", //$NON-NLS-1$
+			!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getResponsibility_Base_Usage(), theUMLPackage.getUsage(),
+			null, "base_Usage", null, 1, 1, Responsibility.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
-		initEClass(scriptEClass, Script.class,
-			"Script", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(scriptEClass, Script.class, "Script", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(sendEClass, Send.class,
-			"Send", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getSend_Base_Usage(),
-			theUMLPackage.getUsage(),
-			null,
-			"base_Usage", null, 1, 1, Send.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(sendEClass, Send.class, "Send", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSend_Base_Usage(), theUMLPackage.getUsage(), null,
+			"base_Usage", null, 1, 1, Send.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+			IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+			IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		op = initEOperation(
 			getSend__ValidateClientOperationSendsSupplierSignal__DiagnosticChain_Map(),
 			ecorePackage.getEBoolean(),
-			"validateClientOperationSendsSupplierSignal", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-		addEParameter(op, ecorePackage.getEDiagnosticChain(),
-			"diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+			"validateClientOperationSendsSupplierSignal", 0, 1, IS_UNIQUE, //$NON-NLS-1$
+			IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, //$NON-NLS-1$
+			1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -1513,33 +1490,31 @@
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(serviceEClass, Service.class,
-			"Service", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getService_Base_Component(),
-			theUMLPackage.getComponent(),
-			null,
-			"base_Component", null, 1, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(serviceEClass, Service.class, "Service", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getService_Base_Component(),
+			theUMLPackage.getComponent(), null, "base_Component", null, 1, 1, //$NON-NLS-1$
+			Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+			!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, !IS_ORDERED);
 
-		initEClass(sourceEClass, Source.class,
-			"Source", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEClass(sourceEClass, Source.class, "Source", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(
-			specificationEClass,
-			Specification.class,
-			"Specification", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getSpecification_Base_Classifier(),
-			theUMLPackage.getClassifier(),
-			null,
-			"base_Classifier", null, 1, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(specificationEClass, Specification.class, "Specification", //$NON-NLS-1$
+			!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSpecification_Base_Classifier(),
+			theUMLPackage.getClassifier(), null, "base_Classifier", null, 1, 1, //$NON-NLS-1$
+			Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+			!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, !IS_ORDERED);
 
 		op = initEOperation(
 			getSpecification__ValidateCannotBeType__DiagnosticChain_Map(),
-			ecorePackage.getEBoolean(),
-			"validateCannotBeType", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-		addEParameter(op, ecorePackage.getEDiagnosticChain(),
-			"diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+			ecorePackage.getEBoolean(), "validateCannotBeType", 0, 1, IS_UNIQUE, //$NON-NLS-1$
+			IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, //$NON-NLS-1$
+			1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -1547,38 +1522,35 @@
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(
-			subsystemEClass,
-			Subsystem.class,
-			"Subsystem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getSubsystem_Base_Component(),
-			theUMLPackage.getComponent(),
-			null,
-			"base_Component", null, 1, 1, Subsystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(subsystemEClass, Subsystem.class, "Subsystem", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSubsystem_Base_Component(),
+			theUMLPackage.getComponent(), null, "base_Component", null, 1, 1, //$NON-NLS-1$
+			Subsystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+			!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, !IS_ORDERED);
 
-		initEClass(traceEClass, Trace.class,
-			"Trace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getTrace_Base_Abstraction(),
-			theUMLPackage.getAbstraction(),
-			null,
-			"base_Abstraction", null, 1, 1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(traceEClass, Trace.class, "Trace", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getTrace_Base_Abstraction(),
+			theUMLPackage.getAbstraction(), null, "base_Abstraction", null, 1, //$NON-NLS-1$
+			1, Trace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+			!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, !IS_ORDERED);
 
-		initEClass(typeEClass, Type.class,
-			"Type", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getType_Base_Class(),
-			theUMLPackage.getClass_(),
-			null,
-			"base_Class", null, 1, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(typeEClass, Type.class, "Type", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getType_Base_Class(), theUMLPackage.getClass_(), null,
+			"base_Class", null, 1, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+			IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+			IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		op = initEOperation(
 			getType__ValidateCannotBeSpecification__DiagnosticChain_Map(),
-			ecorePackage.getEBoolean(),
-			"validateCannotBeSpecification", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-		addEParameter(op, ecorePackage.getEDiagnosticChain(),
-			"diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+			ecorePackage.getEBoolean(), "validateCannotBeSpecification", 0, 1, //$NON-NLS-1$
+			IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, //$NON-NLS-1$
+			1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -1586,20 +1558,19 @@
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(utilityEClass, Utility.class,
-			"Utility", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getUtility_Base_Class(),
-			theUMLPackage.getClass_(),
-			null,
-			"base_Class", null, 1, 1, Utility.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(utilityEClass, Utility.class, "Utility", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getUtility_Base_Class(), theUMLPackage.getClass_(), null,
+			"base_Class", null, 1, 1, Utility.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		op = initEOperation(
 			getUtility__ValidateIsUtility__DiagnosticChain_Map(),
-			ecorePackage.getEBoolean(),
-			"validateIsUtility", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-		addEParameter(op, ecorePackage.getEDiagnosticChain(),
-			"diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+			ecorePackage.getEBoolean(), "validateIsUtility", 0, 1, IS_UNIQUE, //$NON-NLS-1$
+			IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, //$NON-NLS-1$
+			1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -1607,35 +1578,27 @@
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(
-			buildComponentEClass,
-			BuildComponent.class,
-			"BuildComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getBuildComponent_Base_Component(),
-			theUMLPackage.getComponent(),
-			null,
-			"base_Component", null, 1, 1, BuildComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(buildComponentEClass, BuildComponent.class, "BuildComponent", //$NON-NLS-1$
+			!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getBuildComponent_Base_Component(),
+			theUMLPackage.getComponent(), null, "base_Component", null, 1, 1, //$NON-NLS-1$
+			BuildComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+			!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, !IS_ORDERED);
 
-		initEClass(
-			metamodelEClass,
-			Metamodel.class,
-			"Metamodel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getMetamodel_Base_Model(),
-			theUMLPackage.getModel(),
-			null,
-			"base_Model", null, 1, 1, Metamodel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(metamodelEClass, Metamodel.class, "Metamodel", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getMetamodel_Base_Model(), theUMLPackage.getModel(),
+			null, "base_Model", null, 1, 1, Metamodel.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
-		initEClass(
-			systemModelEClass,
-			SystemModel.class,
-			"SystemModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getSystemModel_Base_Model(),
-			theUMLPackage.getModel(),
-			null,
-			"base_Model", null, 1, 1, SystemModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(systemModelEClass, SystemModel.class, "SystemModel", //$NON-NLS-1$
+			!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSystemModel_Base_Model(), theUMLPackage.getModel(),
+			null, "base_Model", null, 1, 1, SystemModel.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);
@@ -1654,7 +1617,7 @@
 	 * @generated
 	 */
 	protected void createUMLAnnotations() {
-		String source = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$	
+		String source = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$
 		addAnnotation(this, source, new String[]{"originalName", "Standard" //$NON-NLS-1$ //$NON-NLS-2$
 		});
 	}
@@ -1666,7 +1629,7 @@
 	 * @generated
 	 */
 	protected void createDuplicatesAnnotations() {
-		String source = "duplicates"; //$NON-NLS-1$	
+		String source = "duplicates"; //$NON-NLS-1$
 		addAnnotation(documentEClass, source, new String[]{});
 		addAnnotation(executableEClass, source, new String[]{});
 		addAnnotation(libraryEClass, source, new String[]{});
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SystemModelImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SystemModelImpl.java
index 6143457..36b742b 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SystemModelImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/SystemModelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -83,8 +83,8 @@
 			if (base_Model != oldBase_Model) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						StandardPackage.SYSTEM_MODEL__BASE_MODEL,
-						oldBase_Model, base_Model));
+						StandardPackage.SYSTEM_MODEL__BASE_MODEL, oldBase_Model,
+						base_Model));
 			}
 		}
 		return base_Model;
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/TypeImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/TypeImpl.java
index 396ff18..d80ab56 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/TypeImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/TypeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -82,7 +82,8 @@
 	public org.eclipse.uml2.uml.Class getBase_Class() {
 		if (base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject) base_Class;
-			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(oldBase_Class);
+			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(
+				oldBase_Class);
 			if (base_Class != oldBase_Class) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/UtilityImpl.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/UtilityImpl.java
index 5a57bd0..ed138e0 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/UtilityImpl.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/impl/UtilityImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -82,7 +82,8 @@
 	public org.eclipse.uml2.uml.Class getBase_Class() {
 		if (base_Class != null && base_Class.eIsProxy()) {
 			InternalEObject oldBase_Class = (InternalEObject) base_Class;
-			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(oldBase_Class);
+			base_Class = (org.eclipse.uml2.uml.Class) eResolveProxy(
+				oldBase_Class);
 			if (base_Class != oldBase_Class) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -112,7 +113,8 @@
 		base_Class = newBase_Class;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				StandardPackage.UTILITY__BASE_CLASS, oldBase_Class, base_Class));
+				StandardPackage.UTILITY__BASE_CLASS, oldBase_Class,
+				base_Class));
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/CreateOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/CreateOperations.java
index 903547c..f296227 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/CreateOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/CreateOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014 CEA and others.
+ * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -64,9 +64,8 @@
 	 * <!-- end-model-doc -->
 	 * @generated NOT
 	 */
-	public static boolean validateClientAndSupplierAreClassifiers(
-			Create create, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public static boolean validateClientAndSupplierAreClassifiers(Create create,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		boolean result = true;
 
 		Usage base_Usage = create.getBase_Usage();
@@ -93,16 +92,13 @@
 			}
 
 			if (!result && diagnostics != null) {
-				diagnostics
-					.add(new BasicDiagnostic(
-						Diagnostic.WARNING,
-						StandardValidator.DIAGNOSTIC_SOURCE,
-						StandardValidator.CREATE__CLIENT_AND_SUPPLIER_ARE_CLASSIFIERS,
-						StandardPlugin.INSTANCE
-							.getString(
-								"_UI_Create_ClientAndSupplierAreClassifiers_diagnostic", //$NON-NLS-1$
-								getMessageSubstitutions(context, base_Usage)),
-						new Object[]{base_Usage}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+					StandardValidator.DIAGNOSTIC_SOURCE,
+					StandardValidator.CREATE__CLIENT_AND_SUPPLIER_ARE_CLASSIFIERS,
+					StandardPlugin.INSTANCE.getString(
+						"_UI_Create_ClientAndSupplierAreClassifiers_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, base_Usage)),
+					new Object[]{base_Usage}));
 			}
 		}
 
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementOperations.java
index 73aaca2..d4cca5d 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014 CEA and others.
+ * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -79,7 +79,8 @@
 
 				for (NamedElement supplier : dependency.getSuppliers()) {
 
-					if (getStereotypeApplication(supplier, Specification.class) != null) {
+					if (getStereotypeApplication(supplier,
+						Specification.class) != null) {
 						result = true;
 						break LOOP;
 					}
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementationClassOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementationClassOperations.java
index 47135db..24a03f2 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementationClassOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/ImplementationClassOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014 CEA and others.
+ * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -70,22 +70,19 @@
 		org.eclipse.uml2.uml.Class base_Class = implementationClass
 			.getBase_Class();
 
-		if (base_Class != null
-			&& getStereotypeApplication(base_Class, Realization.class) != null) {
+		if (base_Class != null && getStereotypeApplication(base_Class,
+			Realization.class) != null) {
 
 			result = false;
 
 			if (diagnostics != null) {
-				diagnostics
-					.add(new BasicDiagnostic(
-						Diagnostic.WARNING,
-						StandardValidator.DIAGNOSTIC_SOURCE,
-						StandardValidator.IMPLEMENTATION_CLASS__CANNOT_BE_REALIZATION,
-						StandardPlugin.INSTANCE
-							.getString(
-								"_UI_ImplementationClass_CannotBeRealization_diagnostic", //$NON-NLS-1$
-								getMessageSubstitutions(context, base_Class)),
-						new Object[]{base_Class}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+					StandardValidator.DIAGNOSTIC_SOURCE,
+					StandardValidator.IMPLEMENTATION_CLASS__CANNOT_BE_REALIZATION,
+					StandardPlugin.INSTANCE.getString(
+						"_UI_ImplementationClass_CannotBeRealization_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, base_Class)),
+					new Object[]{base_Class}));
 			}
 		}
 
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/InstantiateOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/InstantiateOperations.java
index cc0502b..8e03749 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/InstantiateOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/InstantiateOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014 CEA and others.
+ * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -93,16 +93,13 @@
 			}
 
 			if (!result && diagnostics != null) {
-				diagnostics
-					.add(new BasicDiagnostic(
-						Diagnostic.WARNING,
-						StandardValidator.DIAGNOSTIC_SOURCE,
-						StandardValidator.INSTANTIATE__CLIENT_AND_SUPPLIER_ARE_CLASSIFIERS,
-						StandardPlugin.INSTANCE
-							.getString(
-								"_UI_Instantiate_ClientAndSupplierAreClassifiers_diagnostic", //$NON-NLS-1$
-								getMessageSubstitutions(context, base_Usage)),
-						new Object[]{base_Usage}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+					StandardValidator.DIAGNOSTIC_SOURCE,
+					StandardValidator.INSTANTIATE__CLIENT_AND_SUPPLIER_ARE_CLASSIFIERS,
+					StandardPlugin.INSTANCE.getString(
+						"_UI_Instantiate_ClientAndSupplierAreClassifiers_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, base_Usage)),
+					new Object[]{base_Usage}));
 			}
 		}
 
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/RealizationOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/RealizationOperations.java
index 1441692..d6dd061 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/RealizationOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/RealizationOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014 CEA and others.
+ * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -70,24 +70,19 @@
 
 		Classifier base_Classifier = realization.getBase_Classifier();
 
-		if (base_Classifier != null
-			&& getStereotypeApplication(base_Classifier,
-				ImplementationClass.class) != null) {
+		if (base_Classifier != null && getStereotypeApplication(base_Classifier,
+			ImplementationClass.class) != null) {
 
 			result = false;
 
 			if (diagnostics != null) {
-				diagnostics
-					.add(new BasicDiagnostic(
-						Diagnostic.WARNING,
-						StandardValidator.DIAGNOSTIC_SOURCE,
-						StandardValidator.REALIZATION__CANNOT_BE_IMPLEMENTATION_CLASS,
-						StandardPlugin.INSTANCE
-							.getString(
-								"_UI_Realization_CannotBeImplementationClass_diagnostic", //$NON-NLS-1$
-								getMessageSubstitutions(context,
-									base_Classifier)),
-						new Object[]{base_Classifier}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+					StandardValidator.DIAGNOSTIC_SOURCE,
+					StandardValidator.REALIZATION__CANNOT_BE_IMPLEMENTATION_CLASS,
+					StandardPlugin.INSTANCE.getString(
+						"_UI_Realization_CannotBeImplementationClass_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, base_Classifier)),
+					new Object[]{base_Classifier}));
 			}
 		}
 
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/SendOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/SendOperations.java
index 92b4d1d..d3f59fa 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/SendOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/SendOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014 CEA and others.
+ * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -93,16 +93,13 @@
 			}
 
 			if (!result && diagnostics != null) {
-				diagnostics
-					.add(new BasicDiagnostic(
-						Diagnostic.WARNING,
-						StandardValidator.DIAGNOSTIC_SOURCE,
-						StandardValidator.SEND__CLIENT_OPERATION_SENDS_SUPPLIER_SIGNAL,
-						StandardPlugin.INSTANCE
-							.getString(
-								"_UI_Send_ClientOperationSendsSupplierSignal_diagnostic", //$NON-NLS-1$
-								getMessageSubstitutions(context, base_Usage)),
-						new Object[]{base_Usage}));
+				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+					StandardValidator.DIAGNOSTIC_SOURCE,
+					StandardValidator.SEND__CLIENT_OPERATION_SENDS_SUPPLIER_SIGNAL,
+					StandardPlugin.INSTANCE.getString(
+						"_UI_Send_ClientOperationSendsSupplierSignal_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, base_Usage)),
+					new Object[]{base_Usage}));
 			}
 		}
 
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/TypeOperations.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/TypeOperations.java
index 51861ae..9b68dbc 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/TypeOperations.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/internal/operations/TypeOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014 CEA and others.
+ * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -68,8 +68,8 @@
 
 		org.eclipse.uml2.uml.Class base_Class = type.getBase_Class();
 
-		if (base_Class != null
-			&& getStereotypeApplication(base_Class, Specification.class) != null) {
+		if (base_Class != null && getStereotypeApplication(base_Class,
+			Specification.class) != null) {
 
 			result = false;
 
diff --git a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardValidator.java b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardValidator.java
index 811cf13..061ef1c 100644
--- a/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardValidator.java
+++ b/plugins/org.eclipse.uml2.uml.profile.standard/src/org/eclipse/uml2/uml/profile/standard/util/StandardValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -273,8 +273,8 @@
 			case StandardPackage.SOURCE :
 				return validateSource((Source) value, diagnostics, context);
 			case StandardPackage.SPECIFICATION :
-				return validateSpecification((Specification) value,
-					diagnostics, context);
+				return validateSpecification((Specification) value, diagnostics,
+					context);
 			case StandardPackage.SUBSYSTEM :
 				return validateSubsystem((Subsystem) value, diagnostics,
 					context);
@@ -349,9 +349,10 @@
 	 * @generated
 	 */
 	public boolean validateCall_validateClientAndSupplierAreOperations(
-			Call call, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return call
-			.validateClientAndSupplierAreOperations(diagnostics, context);
+			Call call, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+		return call.validateClientAndSupplierAreOperations(diagnostics,
+			context);
 	}
 
 	/**
@@ -363,8 +364,8 @@
 			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(create, diagnostics, context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(create,
-			diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(create, diagnostics,
+			context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(create, diagnostics,
 				context);
@@ -381,7 +382,8 @@
 		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(create, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(create, diagnostics, context);
+			result &= validate_EveryMapEntryUnique(create, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validateCreate_validateClientAndSupplierAreClassifiers(
 				create, diagnostics, context);
@@ -416,8 +418,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateDestroy(Destroy destroy,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateDestroy(Destroy destroy, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(destroy, diagnostics, context);
 	}
 
@@ -458,7 +460,8 @@
 	 */
 	public boolean validateExecutable(Executable executable,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(executable, diagnostics, context);
+		return validate_EveryDefaultConstraint(executable, diagnostics,
+			context);
 	}
 
 	/**
@@ -496,8 +499,8 @@
 			result &= validate_EveryDataValueConforms(implement, diagnostics,
 				context);
 		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(implement,
-				diagnostics, context);
+			result &= validate_EveryReferenceIsContained(implement, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryBidirectionalReferenceIsPaired(implement,
 				diagnostics, context);
@@ -540,8 +543,8 @@
 		if (!validate_NoCircularContainment(implementationClass, diagnostics,
 			context))
 			return false;
-		boolean result = validate_EveryMultiplicityConforms(
-			implementationClass, diagnostics, context);
+		boolean result = validate_EveryMultiplicityConforms(implementationClass,
+			diagnostics, context);
 		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(implementationClass,
 				diagnostics, context);
@@ -608,7 +611,8 @@
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(instantiate, diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(instantiate, diagnostics, context);
+			result &= validate_EveryKeyUnique(instantiate, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(instantiate, diagnostics,
 				context);
@@ -636,8 +640,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateLibrary(Library library,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateLibrary(Library library, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(library, diagnostics, context);
 	}
 
@@ -699,7 +703,8 @@
 		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);
@@ -794,7 +799,8 @@
 	 * @generated
 	 */
 	public boolean validateSend_validateClientOperationSendsSupplierSignal(
-			Send send, DiagnosticChain diagnostics, Map<Object, Object> context) {
+			Send send, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return send.validateClientOperationSendsSupplierSignal(diagnostics,
 			context);
 	}
@@ -804,8 +810,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateService(Service service,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateService(Service service, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(service, diagnostics, context);
 	}
 
@@ -826,7 +832,8 @@
 	 */
 	public boolean validateSpecification(Specification specification,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(specification, diagnostics, context))
+		if (!validate_NoCircularContainment(specification, diagnostics,
+			context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(specification,
 			diagnostics, context);
@@ -938,8 +945,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean validateUtility(Utility utility,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateUtility(Utility utility, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
 		if (!validate_NoCircularContainment(utility, diagnostics, context))
 			return false;
 		boolean result = validate_EveryMultiplicityConforms(utility,
@@ -954,7 +961,8 @@
 			result &= validate_EveryBidirectionalReferenceIsPaired(utility,
 				diagnostics, context);
 		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(utility, diagnostics, context);
+			result &= validate_EveryProxyResolves(utility, diagnostics,
+				context);
 		if (result || diagnostics != null)
 			result &= validate_UniqueID(utility, diagnostics, context);
 		if (result || diagnostics != null)
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 82c268f..9a0ab9e 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, 2017 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2018 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
@@ -221,9 +221,8 @@
 						- 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,
+					msgs = newInsertAt.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- UMLPackage.ADD_STRUCTURAL_FEATURE_VALUE_ACTION__INSERT_AT,
 						null, msgs);
 				}
 				if (msgs != null)
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 e4b5357..72c6ce7 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, 2017 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2018 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
@@ -527,9 +527,8 @@
 			case UMLPackage.ASSOCIATION_CLASS__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.ASSOCIATION_CLASS__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+							- UMLPackage.ASSOCIATION_CLASS__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
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 72939c4..9762b79 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, 2017 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2018 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
@@ -495,9 +495,8 @@
 			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);
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 ca67221..5d40584 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -388,9 +388,8 @@
 			case UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+							- UMLPackage.BEHAVIORED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
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 fc40d80..44bf995 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, 2017 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2018 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
@@ -2221,9 +2221,8 @@
 			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);
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 fabf2b5..171d3b7 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, 2017 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -396,9 +396,8 @@
 			case UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT :
 				if (ownedParameteredElement != null)
 					msgs = ((InternalEObject) ownedParameteredElement)
-						.eInverseRemove(this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
+						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+							- UMLPackage.CLASSIFIER_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 							null, msgs);
 				return basicSetOwnedParameteredElement(
 					(ParameterableElement) otherEnd, msgs);
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 0f58b24..cef27a5 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -153,9 +153,8 @@
 						- 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)
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 a0877d7..daa0bf5 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -433,9 +433,8 @@
 			case UMLPackage.COLLABORATION__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.COLLABORATION__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+							- UMLPackage.COLLABORATION__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
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 a8aa614..719f8a8 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, 2017 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2018 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
@@ -548,9 +548,8 @@
 			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);
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 0d8f5e2..8c3b66d 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -215,9 +215,8 @@
 			case UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT :
 				if (ownedParameteredElement != null)
 					msgs = ((InternalEObject) ownedParameteredElement)
-						.eInverseRemove(this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
+						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+							- UMLPackage.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 							null, msgs);
 				return basicSetOwnedParameteredElement(
 					(ParameterableElement) otherEnd, msgs);
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 10be873..3e28f8a 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -441,9 +441,8 @@
 			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);
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 57c5a6d..1d11b01 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, 2017 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2018 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
@@ -424,9 +424,8 @@
 			case UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+							- UMLPackage.DEPLOYMENT_SPECIFICATION__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
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 bc7e10d..450f7cf 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -245,9 +245,8 @@
 			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);
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 2eb4cd0..d4f339b 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -308,9 +308,8 @@
 			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);
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 49c65b3..9eb310b 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -802,9 +802,8 @@
 			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);
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 be36078..b01905b 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -776,9 +776,8 @@
 			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);
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 85e006a..efd1726 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, 2017 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2018 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
@@ -1519,9 +1519,8 @@
 			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);
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 39a1b90..71cd2a6 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -232,9 +232,8 @@
 			case UMLPackage.OPERATION_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT :
 				if (ownedParameteredElement != null)
 					msgs = ((InternalEObject) ownedParameteredElement)
-						.eInverseRemove(this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.OPERATION_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
+						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+							- UMLPackage.OPERATION_TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 							null, msgs);
 				return basicSetOwnedParameteredElement(
 					(ParameterableElement) otherEnd, msgs);
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 ecbe2cf..6ffb973 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -298,9 +298,8 @@
 			case UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+							- UMLPackage.PROTOCOL_STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
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 e7fedb8..7d1a621 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, 2017 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2018 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
@@ -290,9 +290,8 @@
 						- 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)
@@ -396,9 +395,8 @@
 						- 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)
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 c63864c..9cb91ed 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -150,11 +150,8 @@
 						- 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();
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 b31cb00..e68f5e3 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -201,9 +201,8 @@
 						- 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,
+					msgs = newObject.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__OBJECT,
 						null, msgs);
 				}
 				if (msgs != null)
@@ -315,9 +314,8 @@
 						- 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,
+					msgs = newResult.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- UMLPackage.READ_LINK_OBJECT_END_QUALIFIER_ACTION__RESULT,
 						null, msgs);
 				}
 				if (msgs != null)
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 e9b006b..9256a21 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -147,11 +147,8 @@
 						- 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();
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 b74bdca..a4a698b 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, 2017 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2018 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
@@ -200,9 +200,8 @@
 						- 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,
+					msgs = newRemoveAt.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+						- UMLPackage.REMOVE_STRUCTURAL_FEATURE_VALUE_ACTION__REMOVE_AT,
 						null, msgs);
 				}
 				if (msgs != null)
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 939c9d6..cf644a5 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, 2017 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2018 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
@@ -198,9 +198,8 @@
 						- 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)
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 7a3f145..9852fff 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -148,9 +148,8 @@
 						- 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)
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 856309e..46f9966 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, 2017 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -517,9 +517,8 @@
 			case UMLPackage.STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+							- UMLPackage.STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
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 8444b97..eb511ca 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -560,9 +560,8 @@
 			case UMLPackage.STRING_EXPRESSION__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.STRING_EXPRESSION__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+							- UMLPackage.STRING_EXPRESSION__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
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 7196067..be26283 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -628,9 +628,8 @@
 			case UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT :
 				if (ownedParameteredElement != null)
 					msgs = ((InternalEObject) ownedParameteredElement)
-						.eInverseRemove(this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
+						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEMPLATE_PARAMETER__OWNED_PARAMETERED_ELEMENT,
 							null, msgs);
 				return basicSetOwnedParameteredElement(
 					(ParameterableElement) otherEnd, msgs);
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 1e75432..3d9dce8 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -355,9 +355,8 @@
 			case UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE :
 				if (ownedTemplateSignature != null)
 					msgs = ((InternalEObject) ownedTemplateSignature)
-						.eInverseRemove(this,
-							EOPPOSITE_FEATURE_BASE
-								- UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE,
+						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+							- UMLPackage.TEMPLATEABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE,
 							null, msgs);
 				return basicSetOwnedTemplateSignature(
 					(TemplateSignature) otherEnd, msgs);
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 30d72a8..9ed34f6 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -308,11 +308,8 @@
 						- 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();
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 feada96..d50aa60 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -276,9 +276,8 @@
 						- 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)
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 0a2b019..6a35681 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -86,8 +86,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateResultPins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(acceptCallAction, context)}),
-					new Object[]{acceptCallAction}));
+								.getObjectLabel(acceptCallAction, context)}), new Object[]{acceptCallAction}));
 			}
 			return false;
 		}
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 3bb964f..c3bdc12 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -81,8 +81,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOneOutputPin", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(acceptEventAction, context)}),
-					new Object[]{acceptEventAction}));
+								.getObjectLabel(acceptEventAction, context)}), new Object[]{acceptEventAction}));
 			}
 			return false;
 		}
@@ -117,8 +116,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoInputPins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(acceptEventAction, context)}),
-					new Object[]{acceptEventAction}));
+								.getObjectLabel(acceptEventAction, context)}), new Object[]{acceptEventAction}));
 			}
 			return false;
 		}
@@ -156,8 +154,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoOutputPins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(acceptEventAction, context)}),
-					new Object[]{acceptEventAction}));
+								.getObjectLabel(acceptEventAction, context)}), new Object[]{acceptEventAction}));
 			}
 			return false;
 		}
@@ -200,8 +197,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateUnmarshallSignalEvents", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(acceptEventAction, context)}),
-					new Object[]{acceptEventAction}));
+								.getObjectLabel(acceptEventAction, context)}), new Object[]{acceptEventAction}));
 			}
 			return false;
 		}
@@ -241,8 +237,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateConformingType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(acceptEventAction, context)}),
-					new Object[]{acceptEventAction}));
+								.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 cb81a2a..6c983b8 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -81,8 +81,7 @@
 						new Object[]{"validateActionReferenced", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(actionExecutionSpecification,
-									context)}),
-					new Object[]{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 8480974..b86cbc5 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,8 +77,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOneOutputPin", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(actionInputPin, context)}),
-					new Object[]{actionInputPin}));
+								.getObjectLabel(actionInputPin, context)}), new Object[]{actionInputPin}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoControlOrObjectFlow", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(actionInputPin, context)}),
-					new Object[]{actionInputPin}));
+								.getObjectLabel(actionInputPin, context)}), new Object[]{actionInputPin}));
 			}
 			return false;
 		}
@@ -150,8 +148,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInputPin", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(actionInputPin, context)}),
-					new Object[]{actionInputPin}));
+								.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 f2daf55..c3c8448 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
@@ -77,8 +77,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSourceAndTarget", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(activityEdge, context)}),
-					new Object[]{activityEdge}));
+								.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 3e43a88..5c84c74 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -100,8 +100,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNodesAndEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(activityGroup, context)}),
-					new Object[]{activityGroup}));
+								.getObjectLabel(activityGroup, context)}), new Object[]{activityGroup}));
 			}
 			return false;
 		}
@@ -138,8 +137,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNotContained", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(activityGroup, context)}),
-					new Object[]{activityGroup}));
+								.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 13bf17f..3f64e4a 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMaximumOneParameterNode", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(activity, context)}),
-					new Object[]{activity}));
+								.getObjectLabel(activity, context)}), new Object[]{activity}));
 			}
 			return false;
 		}
@@ -120,8 +119,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMaximumTwoParameterNodes", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(activity, context)}),
-					new Object[]{activity}));
+								.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 a65819c..351559e 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -81,8 +81,7 @@
 						new Object[]{"validateHasParameters", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(activityParameterNode,
-									context)}),
-					new Object[]{activityParameterNode}));
+									context)}), new Object[]{activityParameterNode}));
 			}
 			return false;
 		}
@@ -118,8 +117,7 @@
 						new Object[]{"validateSameType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(activityParameterNode,
-									context)}),
-					new Object[]{activityParameterNode}));
+									context)}), new Object[]{activityParameterNode}));
 			}
 			return false;
 		}
@@ -155,8 +153,7 @@
 						new Object[]{"validateNoEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(activityParameterNode,
-									context)}),
-					new Object[]{activityParameterNode}));
+									context)}), new Object[]{activityParameterNode}));
 			}
 			return false;
 		}
@@ -194,8 +191,7 @@
 						new Object[]{"validateNoIncomingEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(activityParameterNode,
-									context)}),
-					new Object[]{activityParameterNode}));
+									context)}), new Object[]{activityParameterNode}));
 			}
 			return false;
 		}
@@ -234,8 +230,7 @@
 						new Object[]{"validateNoOutgoingEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(activityParameterNode,
-									context)}),
-					new Object[]{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 3737952..0694216 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -79,8 +79,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateDimensionNotContained", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(activityPartition, context)}),
-					new Object[]{activityPartition}));
+								.getObjectLabel(activityPartition, context)}), new Object[]{activityPartition}));
 			}
 			return false;
 		}
@@ -127,8 +126,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateRepresentsClassifier", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(activityPartition, context)}),
-					new Object[]{activityPartition}));
+								.getObjectLabel(activityPartition, context)}), new Object[]{activityPartition}));
 			}
 			return false;
 		}
@@ -167,8 +165,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateRepresentsPropertyAndIsContained", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(activityPartition, context)}),
-					new Object[]{activityPartition}));
+								.getObjectLabel(activityPartition, context)}), new Object[]{activityPartition}));
 			}
 			return false;
 		}
@@ -209,8 +206,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateRepresentsProperty", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(activityPartition, context)}),
-					new Object[]{activityPartition}));
+								.getObjectLabel(activityPartition, context)}), new Object[]{activityPartition}));
 			}
 			return false;
 		}
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 5a7ba32..d7ed1d3 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -115,8 +115,7 @@
 						new Object[]{"validateInsertAtPin", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(addStructuralFeatureValueAction,
-									context)}),
-					new Object[]{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 9a78b93..9283834 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -68,14 +68,12 @@
 		boolean result = addVariableValueAction.getValue() != null;
 
 		if (!result && diagnostics != null) {
-			diagnostics
-				.add(new BasicDiagnostic(Diagnostic.WARNING,
-					UMLValidator.DIAGNOSTIC_SOURCE,
-					UMLValidator.ADD_VARIABLE_VALUE_ACTION__REQUIRED_VALUE,
-					UMLPlugin.INSTANCE.getString(
-						"_UI_AddVariableValueAction_RequiredValue_diagnostic", //$NON-NLS-1$
-						getMessageSubstitutions(context,
-							addVariableValueAction)),
+			diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+				UMLValidator.DIAGNOSTIC_SOURCE,
+				UMLValidator.ADD_VARIABLE_VALUE_ACTION__REQUIRED_VALUE,
+				UMLPlugin.INSTANCE.getString(
+					"_UI_AddVariableValueAction_RequiredValue_diagnostic", //$NON-NLS-1$
+					getMessageSubstitutions(context, addVariableValueAction)),
 				new Object[]{addVariableValueAction}));
 		}
 
@@ -116,8 +114,7 @@
 						new Object[]{"validateInsertAtPin", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(addVariableValueAction,
-									context)}),
-					new Object[]{addVariableValueAction}));
+									context)}), new Object[]{addVariableValueAction}));
 			}
 			return false;
 		}
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 a29bcdd..435e75e 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -190,8 +190,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateBinaryAssociations", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(association, context)}),
-					new Object[]{association}));
+								.getObjectLabel(association, context)}), new Object[]{association}));
 			}
 			return false;
 		}
@@ -225,8 +224,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateAssociationEnds", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(association, context)}),
-					new Object[]{association}));
+								.getObjectLabel(association, context)}), new Object[]{association}));
 			}
 			return false;
 		}
@@ -259,8 +257,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateEndsMustBeTyped", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(association, context)}),
-					new Object[]{association}));
+								.getObjectLabel(association, context)}), new Object[]{association}));
 			}
 			return false;
 		}
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 86c9287..0400b09 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -94,8 +94,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMostOneBehavior", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(behavior, context)}),
-					new Object[]{behavior}));
+								.getObjectLabel(behavior, context)}), new Object[]{behavior}));
 			}
 			return false;
 		}
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 7a6de31..a49c366 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -87,8 +87,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateAbstractNoMethod", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(behavioralFeature, context)}),
-					new Object[]{behavioralFeature}));
+								.getObjectLabel(behavioralFeature, context)}), new Object[]{behavioralFeature}));
 			}
 			return false;
 		}
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 086d208..7f8267c 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -85,8 +85,7 @@
 						new Object[]{"validateClassBehavior", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(behavioredClassifier,
-									context)}),
-					new Object[]{behavioredClassifier}));
+									context)}), new Object[]{behavioredClassifier}));
 			}
 			return false;
 		}
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 af7effb..1663f28 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -79,8 +79,7 @@
 						new Object[]{"validateNumberOfArguments", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(broadcastSignalAction,
-									context)}),
-					new Object[]{broadcastSignalAction}));
+									context)}), new Object[]{broadcastSignalAction}));
 			}
 			return false;
 		}
@@ -120,8 +119,7 @@
 						new Object[]{"validateTypeOrderingMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(broadcastSignalAction,
-									context)}),
-					new Object[]{broadcastSignalAction}));
+									context)}), new Object[]{broadcastSignalAction}));
 			}
 			return false;
 		}
@@ -157,8 +155,7 @@
 						new Object[]{"validateNoOnport", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(broadcastSignalAction,
-									context)}),
-					new Object[]{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 6c23942..4141109 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -87,8 +87,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateArgumentPins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(callAction, context)}),
-					new Object[]{callAction}));
+								.getObjectLabel(callAction, context)}), new Object[]{callAction}));
 			}
 			return false;
 		}
@@ -127,8 +126,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateResultPins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(callAction, context)}),
-					new Object[]{callAction}));
+								.getObjectLabel(callAction, context)}), new Object[]{callAction}));
 			}
 			return false;
 		}
@@ -162,8 +160,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSynchronousCall", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(callAction, context)}),
-					new Object[]{callAction}));
+								.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 7fd23dd..7568722 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -82,8 +82,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoOnport", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(callBehaviorAction, context)}),
-					new Object[]{callBehaviorAction}));
+								.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 b3073c8..d69111f 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -84,8 +84,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTypeTargetPin", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(callOperationAction, context)}),
-					new Object[]{callOperationAction}));
+								.getObjectLabel(callOperationAction, context)}), new Object[]{callOperationAction}));
 			}
 			return false;
 		}
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 8992d3e..88bb6b9 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -195,7 +195,7 @@
 								"_UI_Classifier_SpecializeType_diagnostic", //$NON-NLS-1$
 								getMessageSubstitutions(context, classifier,
 									parent)),
-						new Object[]{classifier, parent}));
+							new Object[]{classifier, parent}));
 				}
 			}
 		}
@@ -233,8 +233,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMapsToGeneralizationSet", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(classifier, context)}),
-					new Object[]{classifier}));
+								.getObjectLabel(classifier, context)}), new Object[]{classifier}));
 			}
 			return false;
 		}
@@ -268,8 +267,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNonFinalParents", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(classifier, context)}),
-					new Object[]{classifier}));
+								.getObjectLabel(classifier, context)}), new Object[]{classifier}));
 			}
 			return false;
 		}
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 387c60b..b5b0c8c 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -82,8 +82,7 @@
 						new Object[]{"validateHasConstrainingClassifier", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(classifierTemplateParameter,
-									context)}),
-					new Object[]{classifierTemplateParameter}));
+									context)}), new Object[]{classifierTemplateParameter}));
 			}
 			return false;
 		}
@@ -119,8 +118,7 @@
 						new Object[]{"validateParameteredElementNoFeatures", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(classifierTemplateParameter,
-									context)}),
-					new Object[]{classifierTemplateParameter}));
+									context)}), new Object[]{classifierTemplateParameter}));
 			}
 			return false;
 		}
@@ -156,8 +154,7 @@
 						new Object[]{"validateMatchingAbstract", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(classifierTemplateParameter,
-									context)}),
-					new Object[]{classifierTemplateParameter}));
+									context)}), new Object[]{classifierTemplateParameter}));
 			}
 			return false;
 		}
@@ -193,8 +190,7 @@
 						new Object[]{"validateActualIsClassifier", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(classifierTemplateParameter,
-									context)}),
-					new Object[]{classifierTemplateParameter}));
+									context)}), new Object[]{classifierTemplateParameter}));
 			}
 			return false;
 		}
@@ -237,8 +233,7 @@
 							"validateConstrainingClassifiersConstrainArgs", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(classifierTemplateParameter,
-									context)}),
-					new Object[]{classifierTemplateParameter}));
+									context)}), new Object[]{classifierTemplateParameter}));
 			}
 			return false;
 		}
@@ -277,8 +272,7 @@
 							"validateConstrainingClassifiersConstrainParameteredElement", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(classifierTemplateParameter,
-									context)}),
-					new Object[]{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 cf940f3..df95a09 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -79,8 +79,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateDeciderOutput", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(clause, context)}),
-					new Object[]{clause}));
+								.getObjectLabel(clause, context)}), new Object[]{clause}));
 			}
 			return false;
 		}
@@ -114,8 +113,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTestAndBody", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(clause, context)}),
-					new Object[]{clause}));
+								.getObjectLabel(clause, context)}), new Object[]{clause}));
 			}
 			return false;
 		}
@@ -149,8 +147,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateBodyOutputPins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(clause, context)}),
-					new Object[]{clause}));
+								.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 a60952b..b45868c 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						new Object[]{"validateSameType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(clearAssociationAction,
-									context)}),
-					new Object[]{clearAssociationAction}));
+									context)}), new Object[]{clearAssociationAction}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(clearAssociationAction,
-									context)}),
-					new Object[]{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 211327c..b75edfc 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2008, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						new Object[]{"validateTypeOfResult", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(clearStructuralFeatureAction,
-									context)}),
-					new Object[]{clearStructuralFeatureAction}));
+									context)}), new Object[]{clearStructuralFeatureAction}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						new Object[]{"validateMultiplicityOfResult", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(clearStructuralFeatureAction,
-									context)}),
-					new Object[]{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 6d6af7d..ec1bed3 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -86,8 +86,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateClientElements", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(collaborationUse, context)}),
-					new Object[]{collaborationUse}));
+								.getObjectLabel(collaborationUse, context)}), new Object[]{collaborationUse}));
 			}
 			return false;
 		}
@@ -121,8 +120,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateEveryRole", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(collaborationUse, context)}),
-					new Object[]{collaborationUse}));
+								.getObjectLabel(collaborationUse, context)}), new Object[]{collaborationUse}));
 			}
 			return false;
 		}
@@ -164,8 +162,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateConnectors", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(collaborationUse, context)}),
-					new Object[]{collaborationUse}));
+								.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 a661687..cea21d7 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -126,8 +126,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateBreak", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(combinedFragment, context)}),
-					new Object[]{combinedFragment}));
+								.getObjectLabel(combinedFragment, context)}), new Object[]{combinedFragment}));
 			}
 			return false;
 		}
@@ -162,8 +161,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateConsiderAndIgnore", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(combinedFragment, context)}),
-					new Object[]{combinedFragment}));
+								.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 c660cd3..b7bff9f 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateAssociationEnds", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(communicationPath, context)}),
-					new Object[]{communicationPath}));
+								.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 68b1fb8..6567ee3 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -93,8 +93,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoNestedClassifiers", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(component, context)}),
-					new Object[]{component}));
+								.getObjectLabel(component, context)}), new Object[]{component}));
 			}
 			return false;
 		}
@@ -128,8 +127,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoPackagedElements", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(component, context)}),
-					new Object[]{component}));
+								.getObjectLabel(component, context)}), new Object[]{component}));
 			}
 			return false;
 		}
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 9d03fcc..01c5231 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -86,8 +86,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateResultNoIncoming", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(conditionalNode, context)}),
-					new Object[]{conditionalNode}));
+								.getObjectLabel(conditionalNode, context)}), new Object[]{conditionalNode}));
 			}
 			return false;
 		}
@@ -121,8 +120,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoInputPins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(conditionalNode, context)}),
-					new Object[]{conditionalNode}));
+								.getObjectLabel(conditionalNode, context)}), new Object[]{conditionalNode}));
 			}
 			return false;
 		}
@@ -158,8 +156,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOneClauseWithExecutableNode", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(conditionalNode, context)}),
-					new Object[]{conditionalNode}));
+								.getObjectLabel(conditionalNode, context)}), new Object[]{conditionalNode}));
 			}
 			return false;
 		}
@@ -200,8 +197,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMatchingOutputPins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(conditionalNode, context)}),
-					new Object[]{conditionalNode}));
+								.getObjectLabel(conditionalNode, context)}), new Object[]{conditionalNode}));
 			}
 			return false;
 		}
@@ -236,8 +232,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateExecutableNodes", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(conditionalNode, context)}),
-					new Object[]{conditionalNode}));
+								.getObjectLabel(conditionalNode, context)}), new Object[]{conditionalNode}));
 			}
 			return false;
 		}
@@ -272,8 +267,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateClauseNoPredecessor", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(conditionalNode, context)}),
-					new Object[]{conditionalNode}));
+								.getObjectLabel(conditionalNode, context)}), new Object[]{conditionalNode}));
 			}
 			return false;
 		}
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 1af9d7e..76987ae 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						new Object[]{"validateEntryPseudostates", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(connectionPointReference,
-									context)}),
-					new Object[]{connectionPointReference}));
+									context)}), new Object[]{connectionPointReference}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						new Object[]{"validateExitPseudostates", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(connectionPointReference,
-									context)}),
-					new Object[]{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 be6cf4d..1df15f6 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -86,8 +86,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(connectorEnd, context)}),
-					new Object[]{connectorEnd}));
+								.getObjectLabel(connectorEnd, context)}), new Object[]{connectorEnd}));
 			}
 			return false;
 		}
@@ -121,8 +120,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validatePartWithPortEmpty", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(connectorEnd, context)}),
-					new Object[]{connectorEnd}));
+								.getObjectLabel(connectorEnd, context)}), new Object[]{connectorEnd}));
 			}
 			return false;
 		}
@@ -157,8 +155,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateRoleAndPartWithPort", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(connectorEnd, context)}),
-					new Object[]{connectorEnd}));
+								.getObjectLabel(connectorEnd, context)}), new Object[]{connectorEnd}));
 			}
 			return false;
 		}
@@ -192,8 +189,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSelfPartWithPort", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(connectorEnd, context)}),
-					new Object[]{connectorEnd}));
+								.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 6031638..7605140 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -194,7 +194,7 @@
 											"_UI_Connector_Roles_diagnostic", //$NON-NLS-1$
 											getMessageSubstitutions(context,
 												connector)),
-									new Object[]{connector}));
+										new Object[]{connector}));
 							}
 
 							return false;
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 722b0f3..329ac32 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						new Object[]{"validateConsiderOrIgnore", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(considerIgnoreFragment,
-									context)}),
-					new Object[]{considerIgnoreFragment}));
+									context)}), new Object[]{considerIgnoreFragment}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						new Object[]{"validateType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(considerIgnoreFragment,
-									context)}),
-					new Object[]{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 c882eda..1a6f437 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -110,8 +110,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateBooleanValue", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(constraint, context)}),
-					new Object[]{constraint}));
+								.getObjectLabel(constraint, context)}), new Object[]{constraint}));
 			}
 			return false;
 		}
@@ -144,8 +143,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoSideEffects", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(constraint, context)}),
-					new Object[]{constraint}));
+								.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 682f107..d570a88 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -100,8 +100,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSameName", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(continuation, context)}),
-					new Object[]{continuation}));
+								.getObjectLabel(continuation, context)}), new Object[]{continuation}));
 			}
 			return false;
 		}
@@ -138,8 +137,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateGlobal", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(continuation, context)}),
-					new Object[]{continuation}));
+								.getObjectLabel(continuation, context)}), new Object[]{continuation}));
 			}
 			return false;
 		}
@@ -177,8 +175,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateFirstOrLastInteractionFragment", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(continuation, context)}),
-					new Object[]{continuation}));
+								.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 0f610d8..7cbedf5 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateObjectNodes", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(controlFlow, context)}),
-					new Object[]{controlFlow}));
+								.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 0b707cd..3c513f8 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateAssociationNotAbstract", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(createLinkAction, context)}),
-					new Object[]{createLinkAction}));
+								.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 311a683..edbc2cc 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -79,8 +79,7 @@
 						new Object[]{"validateAssociationClass", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(createLinkObjectAction,
-									context)}),
-					new Object[]{createLinkObjectAction}));
+									context)}), new Object[]{createLinkObjectAction}));
 			}
 			return false;
 		}
@@ -116,8 +115,7 @@
 						new Object[]{"validateTypeOfResult", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(createLinkObjectAction,
-									context)}),
-					new Object[]{createLinkObjectAction}));
+									context)}), new Object[]{createLinkObjectAction}));
 			}
 			return false;
 		}
@@ -153,8 +151,7 @@
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(createLinkObjectAction,
-									context)}),
-					new Object[]{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 a7c809a..705a719 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -79,8 +79,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateClassifierNotAbstract", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(createObjectAction, context)}),
-					new Object[]{createObjectAction}));
+								.getObjectLabel(createObjectAction, context)}), new Object[]{createObjectAction}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateClassifierNotAssociationClass", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(createObjectAction, context)}),
-					new Object[]{createObjectAction}));
+								.getObjectLabel(createObjectAction, context)}), new Object[]{createObjectAction}));
 			}
 			return false;
 		}
@@ -151,8 +149,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSameType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(createObjectAction, context)}),
-					new Object[]{createObjectAction}));
+								.getObjectLabel(createObjectAction, context)}), new Object[]{createObjectAction}));
 			}
 			return false;
 		}
@@ -187,8 +184,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(createObjectAction, context)}),
-					new Object[]{createObjectAction}));
+								.getObjectLabel(createObjectAction, context)}), new Object[]{createObjectAction}));
 			}
 			return false;
 		}
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 c8d29d5..885cc21 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -83,8 +83,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateIncomingOutgoingEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(decisionNode, context)}),
-					new Object[]{decisionNode}));
+								.getObjectLabel(decisionNode, context)}), new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -121,8 +120,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(decisionNode, context)}),
-					new Object[]{decisionNode}));
+								.getObjectLabel(decisionNode, context)}), new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -157,8 +155,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateDecisionInputFlowIncoming", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(decisionNode, context)}),
-					new Object[]{decisionNode}));
+								.getObjectLabel(decisionNode, context)}), new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -197,8 +194,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateParameters", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(decisionNode, context)}),
-					new Object[]{decisionNode}));
+								.getObjectLabel(decisionNode, context)}), new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -233,8 +229,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateZeroInputParameters", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(decisionNode, context)}),
-					new Object[]{decisionNode}));
+								.getObjectLabel(decisionNode, context)}), new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -270,8 +265,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateIncomingObjectOneInputParameter", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(decisionNode, context)}),
-					new Object[]{decisionNode}));
+								.getObjectLabel(decisionNode, context)}), new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -307,8 +301,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateIncomingControlOneInputParameter", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(decisionNode, context)}),
-					new Object[]{decisionNode}));
+								.getObjectLabel(decisionNode, context)}), new Object[]{decisionNode}));
 			}
 			return false;
 		}
@@ -343,8 +336,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTwoInputParameters", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(decisionNode, context)}),
-					new Object[]{decisionNode}));
+								.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 f4b21c9..4e6d094 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						new Object[]{"validateDeployedElements", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(deploymentSpecification,
-									context)}),
-					new Object[]{deploymentSpecification}));
+									context)}), new Object[]{deploymentSpecification}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						new Object[]{"validateDeploymentTarget", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(deploymentSpecification,
-									context)}),
-					new Object[]{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 1a0449f..0b44882 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,8 +77,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(destroyObjectAction, context)}),
-					new Object[]{destroyObjectAction}));
+								.getObjectLabel(destroyObjectAction, context)}), new Object[]{destroyObjectAction}));
 			}
 			return false;
 		}
@@ -113,8 +112,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(destroyObjectAction, context)}),
-					new Object[]{destroyObjectAction}));
+								.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 c473b97..02d4cb1 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, 2016 CEA and others.
+ * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -80,8 +80,7 @@
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(
 									destructionOccurrenceSpecification,
-									context)}),
-					new Object[]{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 3d360af..18f0ca6 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -79,8 +79,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateFirstEventMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(durationConstraint, context)}),
-					new Object[]{durationConstraint}));
+								.getObjectLabel(durationConstraint, context)}), new Object[]{durationConstraint}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateHasOneOrTwoConstrainedElements", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(durationConstraint, context)}),
-					new Object[]{durationConstraint}));
+								.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 3c21dc7..9d66928 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateFirstEventMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(durationObservation, context)}),
-					new Object[]{durationObservation}));
+								.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 d398fed..9c9c05f 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -74,8 +74,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoExprRequiresObservation", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(duration, context)}),
-					new Object[]{duration}));
+								.getObjectLabel(duration, context)}), new Object[]{duration}));
 			}
 			return false;
 		}
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 7b2cb9a..7b2463b 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, 2016 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -74,8 +74,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateImmutable", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(enumeration, context)}),
-					new Object[]{enumeration}));
+								.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 3c28f94..8a4b349 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -81,8 +81,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateHandlerBodyEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(exceptionHandler, context)}),
-					new Object[]{exceptionHandler}));
+								.getObjectLabel(exceptionHandler, context)}), new Object[]{exceptionHandler}));
 			}
 			return false;
 		}
@@ -126,8 +125,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOutputPins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(exceptionHandler, context)}),
-					new Object[]{exceptionHandler}));
+								.getObjectLabel(exceptionHandler, context)}), new Object[]{exceptionHandler}));
 			}
 			return false;
 		}
@@ -163,8 +161,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOneInput", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(exceptionHandler, context)}),
-					new Object[]{exceptionHandler}));
+								.getObjectLabel(exceptionHandler, context)}), new Object[]{exceptionHandler}));
 			}
 			return false;
 		}
@@ -201,8 +198,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateEdgeSourceTarget", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(exceptionHandler, context)}),
-					new Object[]{exceptionHandler}));
+								.getObjectLabel(exceptionHandler, context)}), new Object[]{exceptionHandler}));
 			}
 			return false;
 		}
@@ -237,8 +233,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateHandlerBodyOwner", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(exceptionHandler, context)}),
-					new Object[]{exceptionHandler}));
+								.getObjectLabel(exceptionHandler, context)}), new Object[]{exceptionHandler}));
 			}
 			return false;
 		}
@@ -274,8 +269,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateExceptionInputType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(exceptionHandler, context)}),
-					new Object[]{exceptionHandler}));
+								.getObjectLabel(exceptionHandler, context)}), new Object[]{exceptionHandler}));
 			}
 			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 b13e860..3a3240d 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, 2016 CEA and others.
+ * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateRegionAsInputOrOutput", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(expansionNode, context)}),
-					new Object[]{expansionNode}));
+								.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 1054b46..3e6ad46 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -75,8 +75,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateExtensionPoints", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(extend, context)}),
-					new Object[]{extend}));
+								.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 66acb67..aa62b3d 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, 2016 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 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
@@ -80,8 +80,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(extensionEnd, context)}),
-					new Object[]{extensionEnd}));
+								.getObjectLabel(extensionEnd, context)}), new Object[]{extensionEnd}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateAggregation", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(extensionEnd, context)}),
-					new Object[]{extensionEnd}));
+								.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 3fc6f22..e5971ac 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -87,8 +87,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNonOwnedEnd", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(extension, context)}),
-					new Object[]{extension}));
+								.getObjectLabel(extension, context)}), new Object[]{extension}));
 			}
 			return false;
 		}
@@ -122,8 +121,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateIsBinary", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(extension, context)}),
-					new Object[]{extension}));
+								.getObjectLabel(extension, context)}), new Object[]{extension}));
 			}
 			return false;
 		}
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 3806db7..6c02126 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -75,8 +75,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMustHaveName", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(extensionPoint, context)}),
-					new Object[]{extensionPoint}));
+								.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 88b12af..ba58ad9 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, 2016 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 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
@@ -75,8 +75,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoOutgoingEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(finalNode, context)}),
-					new Object[]{finalNode}));
+								.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 881cf34..ee640e7 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -80,8 +80,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoOutgoingTransitions", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(finalState, context)}),
-					new Object[]{finalState}));
+								.getObjectLabel(finalState, context)}), new Object[]{finalState}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoRegions", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(finalState, context)}),
-					new Object[]{finalState}));
+								.getObjectLabel(finalState, context)}), new Object[]{finalState}));
 			}
 			return false;
 		}
@@ -151,8 +149,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateCannotReferenceSubmachine", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(finalState, context)}),
-					new Object[]{finalState}));
+								.getObjectLabel(finalState, context)}), new Object[]{finalState}));
 			}
 			return false;
 		}
@@ -186,8 +183,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoEntryBehavior", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(finalState, context)}),
-					new Object[]{finalState}));
+								.getObjectLabel(finalState, context)}), new Object[]{finalState}));
 			}
 			return false;
 		}
@@ -221,8 +217,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoExitBehavior", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(finalState, context)}),
-					new Object[]{finalState}));
+								.getObjectLabel(finalState, context)}), new Object[]{finalState}));
 			}
 			return false;
 		}
@@ -256,8 +251,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoStateBehavior", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(finalState, context)}),
-					new Object[]{finalState}));
+								.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 8e5a428..a66e7a2 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOneIncomingEdge", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(forkNode, context)}),
-					new Object[]{forkNode}));
+								.getObjectLabel(forkNode, context)}), new Object[]{forkNode}));
 			}
 			return false;
 		}
@@ -112,8 +111,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(forkNode, context)}),
-					new Object[]{forkNode}));
+								.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 436a962..9e5e2a4 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -82,8 +82,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOneOutputParameter", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(functionBehavior, context)}),
-					new Object[]{functionBehavior}));
+								.getObjectLabel(functionBehavior, context)}), new Object[]{functionBehavior}));
 			}
 			return false;
 		}
@@ -119,8 +118,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTypesOfParameters", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(functionBehavior, context)}),
-					new Object[]{functionBehavior}));
+								.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 05ce06a..8dd370e 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -101,8 +101,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateActualGateMatched", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(gate, context)}),
-					new Object[]{gate}));
+								.getObjectLabel(gate, context)}), new Object[]{gate}));
 			}
 			return false;
 		}
@@ -136,8 +135,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInsideCfMatched", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(gate, context)}),
-					new Object[]{gate}));
+								.getObjectLabel(gate, context)}), new Object[]{gate}));
 			}
 			return false;
 		}
@@ -177,8 +175,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOutsideCfMatched", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(gate, context)}),
-					new Object[]{gate}));
+								.getObjectLabel(gate, context)}), new Object[]{gate}));
 			}
 			return false;
 		}
@@ -212,8 +209,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateFormalGateDistinguishable", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(gate, context)}),
-					new Object[]{gate}));
+								.getObjectLabel(gate, context)}), new Object[]{gate}));
 			}
 			return false;
 		}
@@ -247,8 +243,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateActualGateDistinguishable", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(gate, context)}),
-					new Object[]{gate}));
+								.getObjectLabel(gate, context)}), new Object[]{gate}));
 			}
 			return false;
 		}
@@ -282,8 +277,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOutsideCfGateDistinguishable", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(gate, context)}),
-					new Object[]{gate}));
+								.getObjectLabel(gate, context)}), new Object[]{gate}));
 			}
 			return false;
 		}
@@ -319,8 +313,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInsideCfGateDistinguishable", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(gate, context)}),
-					new Object[]{gate}));
+								.getObjectLabel(gate, context)}), new Object[]{gate}));
 			}
 			return false;
 		}
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 508bebc..dbfde7e 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, 2016 CEA and others.
+ * Copyright (c) 2011, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateIrreflexiveTransitiveClosure", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(generalOrdering, context)}),
-					new Object[]{generalOrdering}));
+								.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 769f697..2e2cf6d 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,8 +77,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateGeneralizationSameClassifier", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(generalizationSet, context)}),
-					new Object[]{generalizationSet}));
+								.getObjectLabel(generalizationSet, context)}), new Object[]{generalizationSet}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMapsToGeneralizationSet", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(generalizationSet, context)}),
-					new Object[]{generalizationSet}));
+								.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 072da88..81d3410 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -91,8 +91,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSourcesAndTargetsKind", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(informationFlow, context)}),
-					new Object[]{informationFlow}));
+								.getObjectLabel(informationFlow, context)}), new Object[]{informationFlow}));
 			}
 			return false;
 		}
@@ -125,8 +124,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMustConform", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(informationFlow, context)}),
-					new Object[]{informationFlow}));
+								.getObjectLabel(informationFlow, context)}), new Object[]{informationFlow}));
 			}
 			return false;
 		}
@@ -162,8 +160,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateConveyClassifiers", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(informationFlow, context)}),
-					new Object[]{informationFlow}));
+								.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 b92578a..7948cc7 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -82,8 +82,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSourcesAndTargets", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(informationItem, context)}),
-					new Object[]{informationItem}));
+								.getObjectLabel(informationItem, context)}), new Object[]{informationItem}));
 			}
 			return false;
 		}
@@ -117,8 +116,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateHasNo", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(informationItem, context)}),
-					new Object[]{informationItem}));
+								.getObjectLabel(informationItem, context)}), new Object[]{informationItem}));
 			}
 			return false;
 		}
@@ -153,8 +151,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNotInstantiable", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(informationItem, context)}),
-					new Object[]{informationItem}));
+								.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 10b5037..bdec545 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoIncomingEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(initialNode, context)}),
-					new Object[]{initialNode}));
+								.getObjectLabel(initialNode, context)}), new Object[]{initialNode}));
 			}
 			return false;
 		}
@@ -111,8 +110,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateControlEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(initialNode, context)}),
-					new Object[]{initialNode}));
+								.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 914f164..9610d3c 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOutgoingEdgesStructuredOnly", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(inputPin, context)}),
-					new Object[]{inputPin}));
+								.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 bab6d83..1410994 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -80,8 +80,7 @@
 						new Object[]{"validateDefiningFeature", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(instanceSpecification,
-									context)}),
-					new Object[]{instanceSpecification}));
+									context)}), new Object[]{instanceSpecification}));
 			}
 			return false;
 		}
@@ -117,8 +116,7 @@
 						new Object[]{"validateStructuralFeature", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(instanceSpecification,
-									context)}),
-					new Object[]{instanceSpecification}));
+									context)}), new Object[]{instanceSpecification}));
 			}
 			return false;
 		}
@@ -154,8 +152,7 @@
 						new Object[]{"validateDeploymentTarget", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(instanceSpecification,
-									context)}),
-					new Object[]{instanceSpecification}));
+									context)}), new Object[]{instanceSpecification}));
 			}
 			return false;
 		}
@@ -191,8 +188,7 @@
 						new Object[]{"validateDeploymentArtifact", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(instanceSpecification,
-									context)}),
-					new Object[]{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 39fcc74..9b6ddeb 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -81,8 +81,7 @@
 						new Object[]{"validateDynamicVariables", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(interactionConstraint,
-									context)}),
-					new Object[]{interactionConstraint}));
+									context)}), new Object[]{interactionConstraint}));
 			}
 			return false;
 		}
@@ -117,8 +116,7 @@
 						new Object[]{"validateGlobalData", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(interactionConstraint,
-									context)}),
-					new Object[]{interactionConstraint}));
+									context)}), new Object[]{interactionConstraint}));
 			}
 			return false;
 		}
@@ -156,8 +154,7 @@
 						new Object[]{"validateMinintMaxint", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(interactionConstraint,
-									context)}),
-					new Object[]{interactionConstraint}));
+									context)}), new Object[]{interactionConstraint}));
 			}
 			return false;
 		}
@@ -194,8 +191,7 @@
 						new Object[]{"validateMinintNonNegative", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(interactionConstraint,
-									context)}),
-					new Object[]{interactionConstraint}));
+									context)}), new Object[]{interactionConstraint}));
 			}
 			return false;
 		}
@@ -232,8 +228,7 @@
 						new Object[]{"validateMaxintPositive", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(interactionConstraint,
-									context)}),
-					new Object[]{interactionConstraint}));
+									context)}), new Object[]{interactionConstraint}));
 			}
 			return false;
 		}
@@ -271,8 +266,7 @@
 						new Object[]{"validateMaxintGreaterEqualMinint", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(interactionConstraint,
-									context)}),
-					new Object[]{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 26cf914..3b042e8 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateGuardDirectlyPrior", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(interactionOperand, context)}),
-					new Object[]{interactionOperand}));
+								.getObjectLabel(interactionOperand, context)}), new Object[]{interactionOperand}));
 			}
 			return false;
 		}
@@ -111,8 +110,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateGuardContainReferences", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(interactionOperand, context)}),
-					new Object[]{interactionOperand}));
+								.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 d74dfbe..c6a40f6 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, 2016 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -75,8 +75,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNotContained", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(interaction, context)}),
-					new Object[]{interaction}));
+								.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 2b97974..5590110 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -82,8 +82,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateGatesMatch", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(interactionUse, context)}),
-					new Object[]{interactionUse}));
+								.getObjectLabel(interactionUse, context)}), new Object[]{interactionUse}));
 			}
 			return false;
 		}
@@ -131,8 +130,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateAllLifelines", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(interactionUse, context)}),
-					new Object[]{interactionUse}));
+								.getObjectLabel(interactionUse, context)}), new Object[]{interactionUse}));
 			}
 			return false;
 		}
@@ -166,8 +164,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateArgumentsCorrespondToParameters", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(interactionUse, context)}),
-					new Object[]{interactionUse}));
+								.getObjectLabel(interactionUse, context)}), new Object[]{interactionUse}));
 			}
 			return false;
 		}
@@ -203,8 +200,7 @@
 						new Object[]{
 							"validateReturnValueTypeRecipientCorrespondence", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(interactionUse, context)}),
-					new Object[]{interactionUse}));
+								.getObjectLabel(interactionUse, context)}), new Object[]{interactionUse}));
 			}
 			return false;
 		}
@@ -238,8 +234,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateArgumentsAreConstants", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(interactionUse, context)}),
-					new Object[]{interactionUse}));
+								.getObjectLabel(interactionUse, context)}), new Object[]{interactionUse}));
 			}
 			return false;
 		}
@@ -278,8 +273,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateReturnValueRecipientCoverage", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(interactionUse, context)}),
-					new Object[]{interactionUse}));
+								.getObjectLabel(interactionUse, context)}), new Object[]{interactionUse}));
 			}
 			return false;
 		}
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 eeac277..5cf71a2 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						new Object[]{"validateInterruptingEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(interruptibleActivityRegion,
-									context)}),
-					new Object[]{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 e5e72cf..7dca9f6 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOneOutgoingEdge", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(joinNode, context)}),
-					new Object[]{joinNode}));
+								.getObjectLabel(joinNode, context)}), new Object[]{joinNode}));
 			}
 			return false;
 		}
@@ -113,8 +112,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateIncomingObjectFlow", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(joinNode, context)}),
-					new Object[]{joinNode}));
+								.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 785b0a5..275b273 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -116,8 +116,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInteractionUsesShareLifeline", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(lifeline, context)}),
-					new Object[]{lifeline}));
+								.getObjectLabel(lifeline, context)}), new Object[]{lifeline}));
 			}
 			return false;
 		}
@@ -151,8 +150,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSelectorSpecified", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(lifeline, context)}),
-					new Object[]{lifeline}));
+								.getObjectLabel(lifeline, context)}), new Object[]{lifeline}));
 			}
 			return false;
 		}
@@ -186,8 +184,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSameClassifier", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(lifeline, context)}),
-					new Object[]{lifeline}));
+								.getObjectLabel(lifeline, context)}), new Object[]{lifeline}));
 			}
 			return false;
 		}
@@ -223,8 +220,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSelectorIntOrString", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(lifeline, context)}),
-					new Object[]{lifeline}));
+								.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 ccc07fa..38e28e8 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -82,8 +82,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSameAssociation", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(linkAction, context)}),
-					new Object[]{linkAction}));
+								.getObjectLabel(linkAction, context)}), new Object[]{linkAction}));
 			}
 			return false;
 		}
@@ -117,8 +116,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNotStatic", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(linkAction, context)}),
-					new Object[]{linkAction}));
+								.getObjectLabel(linkAction, context)}), new Object[]{linkAction}));
 			}
 			return false;
 		}
@@ -152,8 +150,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSamePins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(linkAction, context)}),
-					new Object[]{linkAction}));
+								.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 11b3bc9..057f211 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -86,8 +86,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInsertAtPin", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(linkEndCreationData, context)}),
-					new Object[]{linkEndCreationData}));
+								.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 09dc07f..1385694 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -86,8 +86,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validatePropertyIsAssociationEnd", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(linkEndData, context)}),
-					new Object[]{linkEndData}));
+								.getObjectLabel(linkEndData, context)}), new Object[]{linkEndData}));
 			}
 			return false;
 		}
@@ -121,8 +120,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSameType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(linkEndData, context)}),
-					new Object[]{linkEndData}));
+								.getObjectLabel(linkEndData, context)}), new Object[]{linkEndData}));
 			}
 			return false;
 		}
@@ -156,8 +154,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(linkEndData, context)}),
-					new Object[]{linkEndData}));
+								.getObjectLabel(linkEndData, context)}), new Object[]{linkEndData}));
 			}
 			return false;
 		}
@@ -191,8 +188,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateQualifiers", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(linkEndData, context)}),
-					new Object[]{linkEndData}));
+								.getObjectLabel(linkEndData, context)}), new Object[]{linkEndData}));
 			}
 			return false;
 		}
@@ -257,8 +253,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateEndObjectInputPin", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(linkEndData, context)}),
-					new Object[]{linkEndData}));
+								.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 f36d437..05ee0f5 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -87,8 +87,7 @@
 						new Object[]{"validateDestroyAtPin", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(linkEndDestructionData,
-									context)}),
-					new Object[]{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 01b823d..e3d5139 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -90,8 +90,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInputEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(loopNode, context)}),
-					new Object[]{loopNode}));
+								.getObjectLabel(loopNode, context)}), new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -125,8 +124,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateExecutableNodes", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(loopNode, context)}),
-					new Object[]{loopNode}));
+								.getObjectLabel(loopNode, context)}), new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -160,8 +158,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateBodyOutputPins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(loopNode, context)}),
-					new Object[]{loopNode}));
+								.getObjectLabel(loopNode, context)}), new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -197,8 +194,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSetupTestAndBody", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(loopNode, context)}),
-					new Object[]{loopNode}));
+								.getObjectLabel(loopNode, context)}), new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -237,8 +233,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMatchingOutputPins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(loopNode, context)}),
-					new Object[]{loopNode}));
+								.getObjectLabel(loopNode, context)}), new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -276,8 +271,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMatchingLoopVariables", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(loopNode, context)}),
-					new Object[]{loopNode}));
+								.getObjectLabel(loopNode, context)}), new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -315,8 +309,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMatchingResultPins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(loopNode, context)}),
-					new Object[]{loopNode}));
+								.getObjectLabel(loopNode, context)}), new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -350,8 +343,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateLoopVariableOutgoing", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(loopNode, context)}),
-					new Object[]{loopNode}));
+								.getObjectLabel(loopNode, context)}), new Object[]{loopNode}));
 			}
 			return false;
 		}
@@ -424,8 +416,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateResultNoIncoming", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(loopNode, context)}),
-					new Object[]{loopNode}));
+								.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 0438413..eaadcaa 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOneOutgoingEdge", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(mergeNode, context)}),
-					new Object[]{mergeNode}));
+								.getObjectLabel(mergeNode, context)}), new Object[]{mergeNode}));
 			}
 			return false;
 		}
@@ -112,8 +111,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(mergeNode, context)}),
-					new Object[]{mergeNode}));
+								.getObjectLabel(mergeNode, context)}), new Object[]{mergeNode}));
 			}
 			return false;
 		}
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 8e09d65..457c435 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -102,8 +102,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSendingReceivingMessageEvent", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(message, context)}),
-					new Object[]{message}));
+								.getObjectLabel(message, context)}), new Object[]{message}));
 			}
 			return false;
 		}
@@ -141,8 +140,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSignatureReferTo", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(message, context)}),
-					new Object[]{message}));
+								.getObjectLabel(message, context)}), new Object[]{message}));
 			}
 			return false;
 		}
@@ -184,8 +182,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSignatureIsOperationRequest", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(message, context)}),
-					new Object[]{message}));
+								.getObjectLabel(message, context)}), new Object[]{message}));
 			}
 			return false;
 		}
@@ -227,8 +224,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSignatureIsOperationReply", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(message, context)}),
-					new Object[]{message}));
+								.getObjectLabel(message, context)}), new Object[]{message}));
 			}
 			return false;
 		}
@@ -343,8 +339,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateArguments", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(message, context)}),
-					new Object[]{message}));
+								.getObjectLabel(message, context)}), new Object[]{message}));
 			}
 			return false;
 		}
@@ -384,8 +379,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateCannotCrossBoundaries", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(message, context)}),
-					new Object[]{message}));
+								.getObjectLabel(message, context)}), new Object[]{message}));
 			}
 			return false;
 		}
@@ -418,8 +412,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOccurrenceSpecifications", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(message, context)}),
-					new Object[]{message}));
+								.getObjectLabel(message, context)}), new Object[]{message}));
 			}
 			return false;
 		}
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 5a0030e..7a6060b 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -91,14 +91,12 @@
 			result = false;
 
 			if (diagnostics != null) {
-				diagnostics
-					.add(new BasicDiagnostic(Diagnostic.WARNING,
-						UMLValidator.DIAGNOSTIC_SOURCE,
-						UMLValidator.MULTIPLICITY_ELEMENT__LOWER_GE0,
-						UMLPlugin.INSTANCE.getString(
-							"_UI_MultiplicityElement_LowerGE0_diagnostic", //$NON-NLS-1$
-							getMessageSubstitutions(context,
-								multiplicityElement)),
+				diagnostics.add(new BasicDiagnostic(Diagnostic.WARNING,
+					UMLValidator.DIAGNOSTIC_SOURCE,
+					UMLValidator.MULTIPLICITY_ELEMENT__LOWER_GE0,
+					UMLPlugin.INSTANCE.getString(
+						"_UI_MultiplicityElement_LowerGE0_diagnostic", //$NON-NLS-1$
+						getMessageSubstitutions(context, multiplicityElement)),
 					new Object[]{multiplicityElement,
 						new Integer(lowerBound)}));
 			}
@@ -196,8 +194,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateValueSpecificationNoSideEffects", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(multiplicityElement, context)}),
-					new Object[]{multiplicityElement}));
+								.getObjectLabel(multiplicityElement, context)}), new Object[]{multiplicityElement}));
 			}
 			return false;
 		}
@@ -231,8 +228,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateValueSpecificationConstant", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(multiplicityElement, context)}),
-					new Object[]{multiplicityElement}));
+								.getObjectLabel(multiplicityElement, context)}), new Object[]{multiplicityElement}));
 			}
 			return false;
 		}
@@ -267,8 +263,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateLowerIsInteger", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(multiplicityElement, context)}),
-					new Object[]{multiplicityElement}));
+								.getObjectLabel(multiplicityElement, context)}), new Object[]{multiplicityElement}));
 			}
 			return false;
 		}
@@ -303,8 +298,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateUpperIsUnlimitedNatural", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(multiplicityElement, context)}),
-					new Object[]{multiplicityElement}));
+								.getObjectLabel(multiplicityElement, context)}), new Object[]{multiplicityElement}));
 			}
 			return false;
 		}
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 eb9bdc7..1da96c8 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -106,8 +106,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateHasNoQualifiedName", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(namedElement, context)}),
-					new Object[]{namedElement}));
+								.getObjectLabel(namedElement, context)}), new Object[]{namedElement}));
 			}
 			return false;
 		}
@@ -142,8 +141,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateHasQualifiedName", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(namedElement, context)}),
-					new Object[]{namedElement}));
+								.getObjectLabel(namedElement, context)}), new Object[]{namedElement}));
 			}
 			return false;
 		}
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 050de36..ba9dbbd 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -191,8 +191,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateCannotImportSelf", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(namespace, context)}),
-					new Object[]{namespace}));
+								.getObjectLabel(namespace, context)}), new Object[]{namespace}));
 			}
 			return false;
 		}
@@ -226,8 +225,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateCannotImportOwnedMembers", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(namespace, context)}),
-					new Object[]{namespace}));
+								.getObjectLabel(namespace, context)}), new Object[]{namespace}));
 			}
 			return false;
 		}
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 fe4ca12..2919656 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, 2016 IBM Corporation, Embarcadero Technologies, CEA, and others.
+ * Copyright (c) 2005, 2018 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
@@ -88,8 +88,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInternalStructure", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(node, context)}),
-					new Object[]{node}));
+								.getObjectLabel(node, context)}), new Object[]{node}));
 			}
 			return false;
 		}
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 6abddc3..1a72822 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -81,8 +81,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateCompatibleTypes", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(objectFlow, context)}),
-					new Object[]{objectFlow}));
+								.getObjectLabel(objectFlow, context)}), new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSameUpperBounds", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(objectFlow, context)}),
-					new Object[]{objectFlow}));
+								.getObjectLabel(objectFlow, context)}), new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -149,8 +147,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTarget", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(objectFlow, context)}),
-					new Object[]{objectFlow}));
+								.getObjectLabel(objectFlow, context)}), new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -187,8 +184,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInputAndOutputParameter", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(objectFlow, context)}),
-					new Object[]{objectFlow}));
+								.getObjectLabel(objectFlow, context)}), new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -222,8 +218,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoExecutableNodes", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(objectFlow, context)}),
-					new Object[]{objectFlow}));
+								.getObjectLabel(objectFlow, context)}), new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -259,8 +254,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTransformationBehavior", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(objectFlow, context)}),
-					new Object[]{objectFlow}));
+								.getObjectLabel(objectFlow, context)}), new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -294,8 +288,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSelectionBehavior", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(objectFlow, context)}),
-					new Object[]{objectFlow}));
+								.getObjectLabel(objectFlow, context)}), new Object[]{objectFlow}));
 			}
 			return false;
 		}
@@ -330,8 +323,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateIsMulticastOrIsMultireceive", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(objectFlow, context)}),
-					new Object[]{objectFlow}));
+								.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 4dcd108..9e31440 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,8 +77,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateObjectFlowEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(objectNode, context)}),
-					new Object[]{objectNode}));
+								.getObjectLabel(objectNode, context)}), new Object[]{objectNode}));
 			}
 			return false;
 		}
@@ -112,8 +111,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSelectionBehavior", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(objectNode, context)}),
-					new Object[]{objectNode}));
+								.getObjectLabel(objectNode, context)}), new Object[]{objectNode}));
 			}
 			return false;
 		}
@@ -151,8 +149,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInputOutputParameter", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(objectNode, context)}),
-					new Object[]{objectNode}));
+								.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 e9c25c5..9d7f5e5 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, 2016 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -75,8 +75,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateLanguageBodySize", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(opaqueAction, context)}),
-					new Object[]{opaqueAction}));
+								.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 30b5b75..d9d9752 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -89,8 +89,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateLanguageBodySize", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(opaqueExpression, context)}),
-					new Object[]{opaqueExpression}));
+								.getObjectLabel(opaqueExpression, context)}), new Object[]{opaqueExpression}));
 			}
 			return false;
 		}
@@ -125,8 +124,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOnlyReturnResultParameters", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(opaqueExpression, context)}),
-					new Object[]{opaqueExpression}));
+								.getObjectLabel(opaqueExpression, context)}), new Object[]{opaqueExpression}));
 			}
 			return false;
 		}
@@ -162,8 +160,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOneReturnResultParameter", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(opaqueExpression, context)}),
-					new Object[]{opaqueExpression}));
+								.getObjectLabel(opaqueExpression, context)}), new Object[]{opaqueExpression}));
 			}
 			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 9ec8207..b36a513 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, 2016 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -80,8 +80,7 @@
 						new Object[]{"validateMatchDefaultSignature", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(operationTemplateParameter,
-									context)}),
-					new Object[]{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 9e80c4c..d216da0 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -79,8 +79,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateIncomingEdgesStructuredOnly", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(outputPin, context)}),
-					new Object[]{outputPin}));
+								.getObjectLabel(outputPin, context)}), new Object[]{outputPin}));
 			}
 			return false;
 		}
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 2585cc8..1d10be1 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, 2016 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNamespaceNeedsVisibility", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(packageableElement, context)}),
-					new Object[]{packageableElement}));
+								.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 827ca3b..24d49ae 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -99,8 +99,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateConnectorEnd", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(parameter, context)}),
-					new Object[]{parameter}));
+								.getObjectLabel(parameter, context)}), new Object[]{parameter}));
 			}
 			return false;
 		}
@@ -134,8 +133,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateStreamAndException", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(parameter, context)}),
-					new Object[]{parameter}));
+								.getObjectLabel(parameter, context)}), new Object[]{parameter}));
 			}
 			return false;
 		}
@@ -169,8 +167,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateObjectEffect", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(parameter, context)}),
-					new Object[]{parameter}));
+								.getObjectLabel(parameter, context)}), new Object[]{parameter}));
 			}
 			return false;
 		}
@@ -204,8 +201,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNotException", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(parameter, context)}),
-					new Object[]{parameter}));
+								.getObjectLabel(parameter, context)}), new Object[]{parameter}));
 			}
 			return false;
 		}
@@ -239,8 +235,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateReentrantBehaviors", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(parameter, context)}),
-					new Object[]{parameter}));
+								.getObjectLabel(parameter, context)}), new Object[]{parameter}));
 			}
 			return false;
 		}
@@ -276,8 +271,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInAndOut", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(parameter, context)}),
-					new Object[]{parameter}));
+								.getObjectLabel(parameter, context)}), new Object[]{parameter}));
 			}
 			return false;
 		}
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 ff4a8d6..f6fa29e 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSameParameterizedEntity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(parameterSet, context)}),
-					new Object[]{parameterSet}));
+								.getObjectLabel(parameterSet, context)}), new Object[]{parameterSet}));
 			}
 			return false;
 		}
@@ -117,8 +116,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInput", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(parameterSet, context)}),
-					new Object[]{parameterSet}));
+								.getObjectLabel(parameterSet, context)}), new Object[]{parameterSet}));
 			}
 			return false;
 		}
@@ -152,8 +150,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTwoParameterSets", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(parameterSet, context)}),
-					new Object[]{parameterSet}));
+								.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 243d0fe..e769e9f 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,8 +77,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validatePartsOfInternalStructures", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(partDecomposition, context)}),
-					new Object[]{partDecomposition}));
+								.getObjectLabel(partDecomposition, context)}), new Object[]{partDecomposition}));
 			}
 			return false;
 		}
@@ -111,8 +110,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateAssume", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(partDecomposition, context)}),
-					new Object[]{partDecomposition}));
+								.getObjectLabel(partDecomposition, context)}), new Object[]{partDecomposition}));
 			}
 			return false;
 		}
@@ -146,8 +144,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateCommutativityOfDecomposition", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(partDecomposition, context)}),
-					new Object[]{partDecomposition}));
+								.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 86b7aae..ae4bfb3 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateControlPins", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(pin, context)}),
-					new Object[]{pin}));
+								.getObjectLabel(pin, context)}), new Object[]{pin}));
 			}
 			return false;
 		}
@@ -111,8 +110,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNotUnique", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(pin, context)}),
-					new Object[]{pin}));
+								.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 9fd1cdb..809a04a 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -162,8 +162,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateEncapsulatedOwner", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(port, context)}),
-					new Object[]{port}));
+								.getObjectLabel(port, context)}), new Object[]{port}));
 			}
 			return false;
 		}
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 faaa8a9..3a518fa 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -227,8 +227,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateRedefinedPropertyInherited", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(property, context)}),
-					new Object[]{property}));
+								.getObjectLabel(property, context)}), new Object[]{property}));
 			}
 			return false;
 		}
@@ -422,8 +421,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTypeOfOppositeEnd", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(property, context)}),
-					new Object[]{property}));
+								.getObjectLabel(property, context)}), new Object[]{property}));
 			}
 			return false;
 		}
@@ -457,8 +455,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateQualifiedIsAssociationEnd", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(property, context)}),
-					new Object[]{property}));
+								.getObjectLabel(property, context)}), new Object[]{property}));
 			}
 			return false;
 		}
@@ -534,8 +531,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateBindingToAttribute", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(property, context)}),
-					new Object[]{property}));
+								.getObjectLabel(property, context)}), new Object[]{property}));
 			}
 			return false;
 		}
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 e85577f..b313d80 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -80,8 +80,7 @@
 						new Object[]{"validateProtocolTransitions", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(protocolStateMachine,
-									context)}),
-					new Object[]{protocolStateMachine}));
+									context)}), new Object[]{protocolStateMachine}));
 			}
 			return false;
 		}
@@ -118,8 +117,7 @@
 						new Object[]{"validateEntryExitDo", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(protocolStateMachine,
-									context)}),
-					new Object[]{protocolStateMachine}));
+									context)}), new Object[]{protocolStateMachine}));
 			}
 			return false;
 		}
@@ -156,8 +154,7 @@
 						new Object[]{"validateDeepOrShallowHistory", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(protocolStateMachine,
-									context)}),
-					new Object[]{protocolStateMachine}));
+									context)}), new Object[]{protocolStateMachine}));
 			}
 			return false;
 		}
@@ -193,8 +190,7 @@
 						new Object[]{"validateClassifierContext", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(protocolStateMachine,
-									context)}),
-					new Object[]{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 250bc63..b8141d2 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -81,8 +81,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateBelongsToPsm", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(protocolTransition, context)}),
-					new Object[]{protocolTransition}));
+								.getObjectLabel(protocolTransition, context)}), new Object[]{protocolTransition}));
 			}
 			return false;
 		}
@@ -133,8 +132,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateAssociatedActions", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(protocolTransition, context)}),
-					new Object[]{protocolTransition}));
+								.getObjectLabel(protocolTransition, context)}), new Object[]{protocolTransition}));
 			}
 			return false;
 		}
@@ -171,8 +169,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateRefersToOperation", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(protocolTransition, context)}),
-					new Object[]{protocolTransition}));
+								.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 bbbd389..7e2644b 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -83,8 +83,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInitialVertex", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(pseudostate, context)}),
-					new Object[]{pseudostate}));
+								.getObjectLabel(pseudostate, context)}), new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -118,8 +117,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateHistoryVertices", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(pseudostate, context)}),
-					new Object[]{pseudostate}));
+								.getObjectLabel(pseudostate, context)}), new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -153,8 +151,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateJoinVertex", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(pseudostate, context)}),
-					new Object[]{pseudostate}));
+								.getObjectLabel(pseudostate, context)}), new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -195,8 +192,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTransitionsIncoming", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(pseudostate, context)}),
-					new Object[]{pseudostate}));
+								.getObjectLabel(pseudostate, context)}), new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -230,8 +226,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateForkVertex", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(pseudostate, context)}),
-					new Object[]{pseudostate}));
+								.getObjectLabel(pseudostate, context)}), new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -272,8 +267,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTransitionsOutgoing", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(pseudostate, context)}),
-					new Object[]{pseudostate}));
+								.getObjectLabel(pseudostate, context)}), new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -307,8 +301,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateJunctionVertex", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(pseudostate, context)}),
-					new Object[]{pseudostate}));
+								.getObjectLabel(pseudostate, context)}), new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -342,8 +335,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateChoiceVertex", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(pseudostate, context)}),
-					new Object[]{pseudostate}));
+								.getObjectLabel(pseudostate, context)}), new Object[]{pseudostate}));
 			}
 			return false;
 		}
@@ -377,8 +369,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOutgoingFromInitial", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(pseudostate, context)}),
-					new Object[]{pseudostate}));
+								.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 d66e8cf..ae28d46 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, 2016 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 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
@@ -78,8 +78,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateQualifierAttribute", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(qualifierValue, context)}),
-					new Object[]{qualifierValue}));
+								.getObjectLabel(qualifierValue, context)}), new Object[]{qualifierValue}));
 			}
 			return false;
 		}
@@ -113,8 +112,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTypeOfQualifier", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(qualifierValue, context)}),
-					new Object[]{qualifierValue}));
+								.getObjectLabel(qualifierValue, context)}), new Object[]{qualifierValue}));
 			}
 			return false;
 		}
@@ -149,8 +147,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMultiplicityOfQualifier", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(qualifierValue, context)}),
-					new Object[]{qualifierValue}));
+								.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 23e6963..aeddaa9 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,8 +77,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTypeIsClassifier", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(readExtentAction, context)}),
-					new Object[]{readExtentAction}));
+								.getObjectLabel(readExtentAction, context)}), new Object[]{readExtentAction}));
 			}
 			return false;
 		}
@@ -113,8 +112,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMultiplicityOfResult", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(readExtentAction, context)}),
-					new Object[]{readExtentAction}));
+								.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 22a35bf..6e8a1d7 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -80,8 +80,7 @@
 						new Object[]{"validateMultiplicityOfInput", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(readIsClassifiedObjectAction,
-									context)}),
-					new Object[]{readIsClassifiedObjectAction}));
+									context)}), new Object[]{readIsClassifiedObjectAction}));
 			}
 			return false;
 		}
@@ -117,8 +116,7 @@
 						new Object[]{"validateNoType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(readIsClassifiedObjectAction,
-									context)}),
-					new Object[]{readIsClassifiedObjectAction}));
+									context)}), new Object[]{readIsClassifiedObjectAction}));
 			}
 			return false;
 		}
@@ -154,8 +152,7 @@
 						new Object[]{"validateMultiplicityOfOutput", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(readIsClassifiedObjectAction,
-									context)}),
-					new Object[]{readIsClassifiedObjectAction}));
+									context)}), new Object[]{readIsClassifiedObjectAction}));
 			}
 			return false;
 		}
@@ -191,8 +188,7 @@
 						new Object[]{"validateBooleanResult", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(readIsClassifiedObjectAction,
-									context)}),
-					new Object[]{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 a2f99e9..2d8b595 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -85,8 +85,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOneOpenEnd", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(readLinkAction, context)}),
-					new Object[]{readLinkAction}));
+								.getObjectLabel(readLinkAction, context)}), new Object[]{readLinkAction}));
 			}
 			return false;
 		}
@@ -120,8 +119,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTypeAndOrdering", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(readLinkAction, context)}),
-					new Object[]{readLinkAction}));
+								.getObjectLabel(readLinkAction, context)}), new Object[]{readLinkAction}));
 			}
 			return false;
 		}
@@ -156,8 +154,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateCompatibleMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(readLinkAction, context)}),
-					new Object[]{readLinkAction}));
+								.getObjectLabel(readLinkAction, context)}), new Object[]{readLinkAction}));
 			}
 			return false;
 		}
@@ -192,8 +189,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNavigableOpenEnd", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(readLinkAction, context)}),
-					new Object[]{readLinkAction}));
+								.getObjectLabel(readLinkAction, context)}), new Object[]{readLinkAction}));
 			}
 			return false;
 		}
@@ -261,8 +257,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateVisibility", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(readLinkAction, context)}),
-					new Object[]{readLinkAction}));
+								.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 560a66e..8bfd9f4 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -83,8 +83,7 @@
 						new Object[]{"validateProperty", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(readLinkObjectEndAction,
-									context)}),
-					new Object[]{readLinkObjectEndAction}));
+									context)}), new Object[]{readLinkObjectEndAction}));
 			}
 			return false;
 		}
@@ -120,8 +119,7 @@
 						new Object[]{"validateAssociationOfAssociation", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(readLinkObjectEndAction,
-									context)}),
-					new Object[]{readLinkObjectEndAction}));
+									context)}), new Object[]{readLinkObjectEndAction}));
 			}
 			return false;
 		}
@@ -157,8 +155,7 @@
 						new Object[]{"validateEndsOfAssociation", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(readLinkObjectEndAction,
-									context)}),
-					new Object[]{readLinkObjectEndAction}));
+									context)}), new Object[]{readLinkObjectEndAction}));
 			}
 			return false;
 		}
@@ -194,8 +191,7 @@
 						new Object[]{"validateTypeOfObject", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(readLinkObjectEndAction,
-									context)}),
-					new Object[]{readLinkObjectEndAction}));
+									context)}), new Object[]{readLinkObjectEndAction}));
 			}
 			return false;
 		}
@@ -231,8 +227,7 @@
 						new Object[]{"validateMultiplicityOfObject", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(readLinkObjectEndAction,
-									context)}),
-					new Object[]{readLinkObjectEndAction}));
+									context)}), new Object[]{readLinkObjectEndAction}));
 			}
 			return false;
 		}
@@ -268,8 +263,7 @@
 						new Object[]{"validateTypeOfResult", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(readLinkObjectEndAction,
-									context)}),
-					new Object[]{readLinkObjectEndAction}));
+									context)}), new Object[]{readLinkObjectEndAction}));
 			}
 			return false;
 		}
@@ -305,8 +299,7 @@
 						new Object[]{"validateMultiplicityOfResult", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(readLinkObjectEndAction,
-									context)}),
-					new Object[]{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 7fb36b7..1a11f68 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -85,8 +85,7 @@
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(
 									readLinkObjectEndQualifierAction,
-									context)}),
-					new Object[]{readLinkObjectEndQualifierAction}));
+									context)}), new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -123,8 +122,7 @@
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(
 									readLinkObjectEndQualifierAction,
-									context)}),
-					new Object[]{readLinkObjectEndQualifierAction}));
+									context)}), new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -161,8 +159,7 @@
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(
 									readLinkObjectEndQualifierAction,
-									context)}),
-					new Object[]{readLinkObjectEndQualifierAction}));
+									context)}), new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -199,8 +196,7 @@
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(
 									readLinkObjectEndQualifierAction,
-									context)}),
-					new Object[]{readLinkObjectEndQualifierAction}));
+									context)}), new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -237,8 +233,7 @@
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(
 									readLinkObjectEndQualifierAction,
-									context)}),
-					new Object[]{readLinkObjectEndQualifierAction}));
+									context)}), new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -275,8 +270,7 @@
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(
 									readLinkObjectEndQualifierAction,
-									context)}),
-					new Object[]{readLinkObjectEndQualifierAction}));
+									context)}), new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -313,8 +307,7 @@
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(
 									readLinkObjectEndQualifierAction,
-									context)}),
-					new Object[]{readLinkObjectEndQualifierAction}));
+									context)}), new Object[]{readLinkObjectEndQualifierAction}));
 			}
 			return false;
 		}
@@ -351,8 +344,7 @@
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(
 									readLinkObjectEndQualifierAction,
-									context)}),
-					new Object[]{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 549c768..40660bb 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateContained", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(readSelfAction, context)}),
-					new Object[]{readSelfAction}));
+								.getObjectLabel(readSelfAction, context)}), new Object[]{readSelfAction}));
 			}
 			return false;
 		}
@@ -114,8 +113,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNotStatic", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(readSelfAction, context)}),
-					new Object[]{readSelfAction}));
+								.getObjectLabel(readSelfAction, context)}), new Object[]{readSelfAction}));
 			}
 			return false;
 		}
@@ -149,8 +147,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(readSelfAction, context)}),
-					new Object[]{readSelfAction}));
+								.getObjectLabel(readSelfAction, context)}), new Object[]{readSelfAction}));
 			}
 			return false;
 		}
@@ -184,8 +181,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(readSelfAction, context)}),
-					new Object[]{readSelfAction}));
+								.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 1b347ae..8b92baa 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -79,8 +79,7 @@
 						new Object[]{"validateTypeAndOrdering", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(readStructuralFeatureAction,
-									context)}),
-					new Object[]{readStructuralFeatureAction}));
+									context)}), new Object[]{readStructuralFeatureAction}));
 			}
 			return false;
 		}
@@ -116,8 +115,7 @@
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(readStructuralFeatureAction,
-									context)}),
-					new Object[]{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 2437b3c..90b82d4 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTypeAndOrdering", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(readVariableAction, context)}),
-					new Object[]{readVariableAction}));
+								.getObjectLabel(readVariableAction, context)}), new Object[]{readVariableAction}));
 			}
 			return false;
 		}
@@ -114,8 +113,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateCompatibleMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(readVariableAction, context)}),
-					new Object[]{readVariableAction}));
+								.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 11e87b7..6dad1d9 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSameNameAsSignal", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(reception, context)}),
-					new Object[]{reception}));
+								.getObjectLabel(reception, context)}), new Object[]{reception}));
 			}
 			return false;
 		}
@@ -118,8 +117,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSameStructureAsSignal", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(reception, context)}),
-					new Object[]{reception}));
+								.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 d82ece8..614f6c7 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -79,8 +79,7 @@
 						new Object[]{"validateClassifierNotAbstract", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(reclassifyObjectAction,
-									context)}),
-					new Object[]{reclassifyObjectAction}));
+									context)}), new Object[]{reclassifyObjectAction}));
 			}
 			return false;
 		}
@@ -116,8 +115,7 @@
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(reclassifyObjectAction,
-									context)}),
-					new Object[]{reclassifyObjectAction}));
+									context)}), new Object[]{reclassifyObjectAction}));
 			}
 			return false;
 		}
@@ -153,8 +151,7 @@
 						new Object[]{"validateInputPin", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(reclassifyObjectAction,
-									context)}),
-					new Object[]{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 e3e93a1..695eafd 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -170,8 +170,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNonLeafRedefinition", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(redefinableElement, context)}),
-					new Object[]{redefinableElement}));
+								.getObjectLabel(redefinableElement, context)}), new Object[]{redefinableElement}));
 			}
 			return false;
 		}
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 9937229..764a4fe 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -89,8 +89,7 @@
 						new Object[]{"validateRedefinesParents", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(redefinableTemplateSignature,
-									context)}),
-					new Object[]{redefinableTemplateSignature}));
+									context)}), new Object[]{redefinableTemplateSignature}));
 			}
 			return false;
 		}
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 2bb04f1..659c680 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,8 +77,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInputTypeIsCollection", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(reduceAction, context)}),
-					new Object[]{reduceAction}));
+								.getObjectLabel(reduceAction, context)}), new Object[]{reduceAction}));
 			}
 			return false;
 		}
@@ -113,8 +112,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOutputTypesAreCompatible", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(reduceAction, context)}),
-					new Object[]{reduceAction}));
+								.getObjectLabel(reduceAction, context)}), new Object[]{reduceAction}));
 			}
 			return false;
 		}
@@ -154,8 +152,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateReducerInputsOutput", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(reduceAction, context)}),
-					new Object[]{reduceAction}));
+								.getObjectLabel(reduceAction, context)}), new Object[]{reduceAction}));
 			}
 			return false;
 		}
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 c4e1c32..843e5db 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -85,8 +85,7 @@
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(
 									removeStructuralFeatureValueAction,
-									context)}),
-					new Object[]{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 c142ec3..d6ddd58 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -84,8 +84,7 @@
 						new Object[]{"validateRemoveAtAndValue", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(removeVariableValueAction,
-									context)}),
-					new Object[]{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 ee1f1fd..97fc878 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -81,8 +81,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validatePinsMatchParameter", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(replyAction, context)}),
-					new Object[]{replyAction}));
+								.getObjectLabel(replyAction, context)}), new Object[]{replyAction}));
 			}
 			return false;
 		}
@@ -117,8 +116,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateEventOnReplyToCallTrigger", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(replyAction, context)}),
-					new Object[]{replyAction}));
+								.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 bf89642..9593a77 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, 2016 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTypeTargetPin", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(sendObjectAction, context)}),
-					new Object[]{sendObjectAction}));
+								.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 a15f54d..2688aab 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,8 +77,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNumberOrder", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(sendSignalAction, context)}),
-					new Object[]{sendSignalAction}));
+								.getObjectLabel(sendSignalAction, context)}), new Object[]{sendSignalAction}));
 			}
 			return false;
 		}
@@ -113,8 +112,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTypeTargetPin", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(sendSignalAction, context)}),
-					new Object[]{sendSignalAction}));
+								.getObjectLabel(sendSignalAction, context)}), new Object[]{sendSignalAction}));
 			}
 			return false;
 		}
@@ -153,8 +151,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTypeOrderingMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(sendSignalAction, context)}),
-					new Object[]{sendSignalAction}));
+								.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 f7a5317..ca233ff 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(startClassifierBehaviorAction,
-									context)}),
-					new Object[]{startClassifierBehaviorAction}));
+									context)}), new Object[]{startClassifierBehaviorAction}));
 			}
 			return false;
 		}
@@ -116,8 +115,7 @@
 						new Object[]{"validateTypeHasClassifier", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(startClassifierBehaviorAction,
-									context)}),
-					new Object[]{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 f6c9001..09c6d4e 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2008, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -89,8 +89,7 @@
 						new Object[]{"validateTypeOfObject", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(startObjectBehaviorAction,
-									context)}),
-					new Object[]{startObjectBehaviorAction}));
+									context)}), new Object[]{startObjectBehaviorAction}));
 			}
 			return false;
 		}
@@ -126,8 +125,7 @@
 						new Object[]{"validateNoOnport", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(startObjectBehaviorAction,
-									context)}),
-					new Object[]{startObjectBehaviorAction}));
+									context)}), new Object[]{startObjectBehaviorAction}));
 			}
 			return false;
 		}
@@ -241,8 +239,7 @@
 						new Object[]{"validateMultiplicityOfObject", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(startObjectBehaviorAction,
-									context)}),
-					new Object[]{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 96387b9..e2a666b 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, 2017 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -90,8 +90,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateClassifierContext", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(stateMachine, context)}),
-					new Object[]{stateMachine}));
+								.getObjectLabel(stateMachine, context)}), new Object[]{stateMachine}));
 			}
 			return false;
 		}
@@ -125,8 +124,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateContextClassifier", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(stateMachine, context)}),
-					new Object[]{stateMachine}));
+								.getObjectLabel(stateMachine, context)}), new Object[]{stateMachine}));
 			}
 			return false;
 		}
@@ -298,8 +296,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateConnectionPoints", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(stateMachine, context)}),
-					new Object[]{stateMachine}));
+								.getObjectLabel(stateMachine, context)}), new Object[]{stateMachine}));
 			}
 			return false;
 		}
@@ -333,8 +330,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMethod", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(stateMachine, context)}),
-					new Object[]{stateMachine}));
+								.getObjectLabel(stateMachine, context)}), new Object[]{stateMachine}));
 			}
 			return false;
 		}
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 b30869a..47299fc 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -95,8 +95,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSubmachineStates", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(state, context)}),
-					new Object[]{state}));
+								.getObjectLabel(state, context)}), new Object[]{state}));
 			}
 			return false;
 		}
@@ -134,8 +133,7 @@
 						new Object[]{
 							"validateDestinationsOrSourcesOfTransitions", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(state, context)}),
-					new Object[]{state}));
+								.getObjectLabel(state, context)}), new Object[]{state}));
 			}
 			return false;
 		}
@@ -169,8 +167,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSubmachineOrRegions", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(state, context)}),
-					new Object[]{state}));
+								.getObjectLabel(state, context)}), new Object[]{state}));
 			}
 			return false;
 		}
@@ -204,8 +201,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateCompositeStates", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(state, context)}),
-					new Object[]{state}));
+								.getObjectLabel(state, context)}), new Object[]{state}));
 			}
 			return false;
 		}
@@ -239,8 +235,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateEntryOrExit", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(state, context)}),
-					new Object[]{state}));
+								.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 d7c5b06..ed692a4 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -106,8 +106,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateBinaryAssociationsOnly", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(stereotype, context)}),
-					new Object[]{stereotype}));
+								.getObjectLabel(stereotype, context)}), new Object[]{stereotype}));
 			}
 			return false;
 		}
@@ -140,8 +139,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNameNotClash", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(stereotype, context)}),
-					new Object[]{stereotype}));
+								.getObjectLabel(stereotype, context)}), new Object[]{stereotype}));
 			}
 			return false;
 		}
@@ -177,8 +175,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateAssociationEndOwnership", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(stereotype, context)}),
-					new Object[]{stereotype}));
+								.getObjectLabel(stereotype, context)}), new Object[]{stereotype}));
 			}
 			return false;
 		}
@@ -211,8 +208,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateBasePropertyUpperBound", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(stereotype, context)}),
-					new Object[]{stereotype}));
+								.getObjectLabel(stereotype, context)}), new Object[]{stereotype}));
 			}
 			return false;
 		}
@@ -247,8 +243,7 @@
 						new Object[]{
 							"validateBasePropertyMultiplicitySingleExtension", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(stereotype, context)}),
-					new Object[]{stereotype}));
+								.getObjectLabel(stereotype, context)}), new Object[]{stereotype}));
 			}
 			return false;
 		}
@@ -283,8 +278,7 @@
 						new Object[]{
 							"validateBasePropertyMultiplicityMultipleExtension", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(stereotype, context)}),
-					new Object[]{stereotype}));
+								.getObjectLabel(stereotype, context)}), new Object[]{stereotype}));
 			}
 			return false;
 		}
@@ -319,8 +313,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateGeneralize", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(stereotype, context)}),
-					new Object[]{stereotype}));
+								.getObjectLabel(stereotype, context)}), new Object[]{stereotype}));
 			}
 			return false;
 		}
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 35a8d4f..dfb0cc6 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -79,8 +79,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOperands", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(stringExpression, context)}),
-					new Object[]{stringExpression}));
+								.getObjectLabel(stringExpression, context)}), new Object[]{stringExpression}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateSubexpressions", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(stringExpression, context)}),
-					new Object[]{stringExpression}));
+								.getObjectLabel(stringExpression, context)}), new Object[]{stringExpression}));
 			}
 			return false;
 		}
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 d67aa71..b3435fe 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -81,8 +81,7 @@
 						new Object[]{"validateNotStatic", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(structuralFeatureAction,
-									context)}),
-					new Object[]{structuralFeatureAction}));
+									context)}), new Object[]{structuralFeatureAction}));
 			}
 			return false;
 		}
@@ -118,8 +117,7 @@
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(structuralFeatureAction,
-									context)}),
-					new Object[]{structuralFeatureAction}));
+									context)}), new Object[]{structuralFeatureAction}));
 			}
 			return false;
 		}
@@ -156,8 +154,7 @@
 						new Object[]{"validateObjectType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(structuralFeatureAction,
-									context)}),
-					new Object[]{structuralFeatureAction}));
+									context)}), new Object[]{structuralFeatureAction}));
 			}
 			return false;
 		}
@@ -196,8 +193,7 @@
 						new Object[]{"validateVisibility", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(structuralFeatureAction,
-									context)}),
-					new Object[]{structuralFeatureAction}));
+									context)}), new Object[]{structuralFeatureAction}));
 			}
 			return false;
 		}
@@ -233,8 +229,7 @@
 						new Object[]{"validateOneFeaturingClassifier", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(structuralFeatureAction,
-									context)}),
-					new Object[]{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 975d45f..367de70 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -106,8 +106,7 @@
 						new Object[]{"validateOutputPinEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(structuredActivityNode,
-									context)}),
-					new Object[]{structuredActivityNode}));
+									context)}), new Object[]{structuredActivityNode}));
 			}
 			return false;
 		}
@@ -144,8 +143,7 @@
 						new Object[]{"validateEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(structuredActivityNode,
-									context)}),
-					new Object[]{structuredActivityNode}));
+									context)}), new Object[]{structuredActivityNode}));
 			}
 			return false;
 		}
@@ -181,8 +179,7 @@
 						new Object[]{"validateInputPinEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(structuredActivityNode,
-									context)}),
-					new Object[]{structuredActivityNode}));
+									context)}), new Object[]{structuredActivityNode}));
 			}
 			return false;
 		}
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 e20e7f7..2b0ae52 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,8 +77,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateParameterSubstitutionFormal", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(templateBinding, context)}),
-					new Object[]{templateBinding}));
+								.getObjectLabel(templateBinding, context)}), new Object[]{templateBinding}));
 			}
 			return false;
 		}
@@ -113,8 +112,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOneParameterSubstitution", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(templateBinding, context)}),
-					new Object[]{templateBinding}));
+								.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 396d025..cf3c2174 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMustBeCompatible", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(templateParameter, context)}),
-					new Object[]{templateParameter}));
+								.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 b8aacd0..146ed22 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,8 +77,7 @@
 						new Object[]{"validateMustBeCompatible", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(templateParameterSubstitution,
-									context)}),
-					new Object[]{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 1af9f81..ffb28a8 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,8 +77,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOwnElements", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(templateSignature, context)}),
-					new Object[]{templateSignature}));
+								.getObjectLabel(templateSignature, context)}), new Object[]{templateSignature}));
 			}
 			return false;
 		}
@@ -114,8 +113,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateUniqueParameters", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(templateSignature, context)}),
-					new Object[]{templateSignature}));
+								.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 302b0ad..c99a51a 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,8 +77,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(testIdentityAction, context)}),
-					new Object[]{testIdentityAction}));
+								.getObjectLabel(testIdentityAction, context)}), new Object[]{testIdentityAction}));
 			}
 			return false;
 		}
@@ -113,8 +112,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(testIdentityAction, context)}),
-					new Object[]{testIdentityAction}));
+								.getObjectLabel(testIdentityAction, context)}), new Object[]{testIdentityAction}));
 			}
 			return false;
 		}
@@ -149,8 +147,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateResultIsBoolean", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(testIdentityAction, context)}),
-					new Object[]{testIdentityAction}));
+								.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 c482894..0724c49 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, 2016 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateHasOneConstrainedElement", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(timeConstraint, context)}),
-					new Object[]{timeConstraint}));
+								.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 fd38183..58f5fa3 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -75,8 +75,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateWhenNonNegative", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(timeEvent, context)}),
-					new Object[]{timeEvent}));
+								.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 5c8025d..747eb3a 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2006, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -75,8 +75,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoExprRequiresObservation", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(timeExpression, context)}),
-					new Object[]{timeExpression}));
+								.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 f439194..daba88c 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -94,8 +94,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateForkSegmentGuards", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(transition, context)}),
-					new Object[]{transition}));
+								.getObjectLabel(transition, context)}), new Object[]{transition}));
 			}
 			return false;
 		}
@@ -129,8 +128,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateJoinSegmentGuards", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(transition, context)}),
-					new Object[]{transition}));
+								.getObjectLabel(transition, context)}), new Object[]{transition}));
 			}
 			return false;
 		}
@@ -165,8 +163,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateStateIsInternal", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(transition, context)}),
-					new Object[]{transition}));
+								.getObjectLabel(transition, context)}), new Object[]{transition}));
 			}
 			return false;
 		}
@@ -200,8 +197,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateForkSegmentState", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(transition, context)}),
-					new Object[]{transition}));
+								.getObjectLabel(transition, context)}), new Object[]{transition}));
 			}
 			return false;
 		}
@@ -235,8 +231,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateJoinSegmentState", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(transition, context)}),
-					new Object[]{transition}));
+								.getObjectLabel(transition, context)}), new Object[]{transition}));
 			}
 			return false;
 		}
@@ -270,8 +265,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateOutgoingPseudostates", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(transition, context)}),
-					new Object[]{transition}));
+								.getObjectLabel(transition, context)}), new Object[]{transition}));
 			}
 			return false;
 		}
@@ -306,8 +300,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateInitialTransition", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(transition, context)}),
-					new Object[]{transition}));
+								.getObjectLabel(transition, context)}), new Object[]{transition}));
 			}
 			return false;
 		}
@@ -343,8 +336,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateStateIsLocal", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(transition, context)}),
-					new Object[]{transition}));
+								.getObjectLabel(transition, context)}), new Object[]{transition}));
 			}
 			return false;
 		}
@@ -470,8 +462,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateStateIsExternal", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(transition, context)}),
-					new Object[]{transition}));
+								.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 a5f7727..047627d 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, 2016 CEA and others.
+ * Copyright (c) 2014, 2018 CEA and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -75,8 +75,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTriggerWithPorts", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(trigger, context)}),
-					new Object[]{trigger}));
+								.getObjectLabel(trigger, context)}), new Object[]{trigger}));
 			}
 			return false;
 		}
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 180889f..06d1aeb 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -80,8 +80,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMultiplicityOfObject", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(unmarshallAction, context)}),
-					new Object[]{unmarshallAction}));
+								.getObjectLabel(unmarshallAction, context)}), new Object[]{unmarshallAction}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateObjectType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(unmarshallAction, context)}),
-					new Object[]{unmarshallAction}));
+								.getObjectLabel(unmarshallAction, context)}), new Object[]{unmarshallAction}));
 			}
 			return false;
 		}
@@ -151,8 +149,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNumberOfResult", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(unmarshallAction, context)}),
-					new Object[]{unmarshallAction}));
+								.getObjectLabel(unmarshallAction, context)}), new Object[]{unmarshallAction}));
 			}
 			return false;
 		}
@@ -191,8 +188,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateTypeOrderingAndMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(unmarshallAction, context)}),
-					new Object[]{unmarshallAction}));
+								.getObjectLabel(unmarshallAction, context)}), new Object[]{unmarshallAction}));
 			}
 			return false;
 		}
@@ -227,8 +223,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateStructuralFeature", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(unmarshallAction, context)}),
-					new Object[]{unmarshallAction}));
+								.getObjectLabel(unmarshallAction, context)}), new Object[]{unmarshallAction}));
 			}
 			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 fe62ba3..099894e 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,8 +76,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateCompatibleType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(valuePin, context)}),
-					new Object[]{valuePin}));
+								.getObjectLabel(valuePin, context)}), new Object[]{valuePin}));
 			}
 			return false;
 		}
@@ -111,8 +110,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateNoIncomingEdges", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(valuePin, context)}),
-					new Object[]{valuePin}));
+								.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 0b4024b..f17cf53 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,7 @@
 						new Object[]{"validateCompatibleType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(valueSpecificationAction,
-									context)}),
-					new Object[]{valueSpecificationAction}));
+									context)}), new Object[]{valueSpecificationAction}));
 			}
 			return false;
 		}
@@ -115,8 +114,7 @@
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(valueSpecificationAction,
-									context)}),
-					new Object[]{valueSpecificationAction}));
+									context)}), new Object[]{valueSpecificationAction}));
 			}
 			return false;
 		}
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 35511b2..9e80aad 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -75,8 +75,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateScopeOfVariable", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(variableAction, context)}),
-					new Object[]{variableAction}));
+								.getObjectLabel(variableAction, context)}), new Object[]{variableAction}));
 			}
 			return false;
 		}
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 1741b04..e6c570b 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -80,8 +80,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateAllowAccess", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(writeLinkAction, context)}),
-					new Object[]{writeLinkAction}));
+								.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 a2cb192..d6b8f01 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -80,8 +80,7 @@
 						new Object[]{"validateTypeOfResult", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(writeStructuralFeatureAction,
-									context)}),
-					new Object[]{writeStructuralFeatureAction}));
+									context)}), new Object[]{writeStructuralFeatureAction}));
 			}
 			return false;
 		}
@@ -117,8 +116,7 @@
 						new Object[]{"validateMultiplicityOfResult", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(writeStructuralFeatureAction,
-									context)}),
-					new Object[]{writeStructuralFeatureAction}));
+									context)}), new Object[]{writeStructuralFeatureAction}));
 			}
 			return false;
 		}
@@ -154,8 +152,7 @@
 						new Object[]{"validateTypeOfValue", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(writeStructuralFeatureAction,
-									context)}),
-					new Object[]{writeStructuralFeatureAction}));
+									context)}), new Object[]{writeStructuralFeatureAction}));
 			}
 			return false;
 		}
@@ -191,8 +188,7 @@
 						new Object[]{"validateMultiplicityOfValue", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
 								.getObjectLabel(writeStructuralFeatureAction,
-									context)}),
-					new Object[]{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 d908ba2..e0263e4 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, 2016 IBM Corporation, CEA, and others.
+ * Copyright (c) 2005, 2018 IBM Corporation, CEA, and others.
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -77,8 +77,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateValueType", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(writeVariableAction, context)}),
-					new Object[]{writeVariableAction}));
+								.getObjectLabel(writeVariableAction, context)}), new Object[]{writeVariableAction}));
 			}
 			return false;
 		}
@@ -113,8 +112,7 @@
 						"_UI_GenericInvariant_diagnostic", //$NON-NLS-1$
 						new Object[]{"validateMultiplicity", //$NON-NLS-1$
 							org.eclipse.emf.ecore.util.EObjectValidator
-								.getObjectLabel(writeVariableAction, context)}),
-					new Object[]{writeVariableAction}));
+								.getObjectLabel(writeVariableAction, context)}), new Object[]{writeVariableAction}));
 			}
 			return false;
 		}