[540786] Tweaking formatting and versions.
diff --git a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
index ba1a4dd..39b99fb 100644
--- a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.uml; singleton:=true
-Bundle-Version: 5.4.0.qualifier
+Bundle-Version: 5.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.uml2.uml.UMLPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityImpl.java
index 8a373bd..97bd06f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ActivityImpl.java
@@ -255,7 +255,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.ACTIVITY__GROUP) {
 			return createGroupsList();
 		}
@@ -267,19 +268,19 @@
 		if (eStructuralFeature == UMLPackage.Literals.ACTIVITY__STRUCTURED_NODE) {
 			return createStructuredNodesList();
 		}
-		
+
 		if (eStructuralFeature == UMLPackage.Literals.ACTIVITY__PARTITION) {
 			return createPartitionsList();
 		}
-		
+
 		if (eStructuralFeature == UMLPackage.Literals.ACTIVITY__OWNED_GROUP) {
 			return createOwnedGroupsList();
 		}
-		
+
 		if (eStructuralFeature == UMLPackage.Literals.ACTIVITY__OWNED_NODE) {
 			return createOwnedNodesList();
 		}
-		
+
 		return null;
 	}
 
@@ -468,8 +469,8 @@
 	private EList<StructuredActivityNode> createStructuredNodesList() {
 		return new SubsetSupersetEObjectContainmentEList.Resolving<StructuredActivityNode>(
 			StructuredActivityNode.class, this,
-			UMLPackage.ACTIVITY__STRUCTURED_NODE,
-			STRUCTURED_NODE_ESUPERSETS, null);
+			UMLPackage.ACTIVITY__STRUCTURED_NODE, STRUCTURED_NODE_ESUPERSETS,
+			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 06761d0..ee5845d 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
@@ -177,7 +177,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.ASSOCIATION__MEMBER_END) {
 			return createMemberEndsList();
 		}
@@ -189,7 +190,7 @@
 		if (eStructuralFeature == UMLPackage.Literals.ASSOCIATION__OWNED_END) {
 			return createOwnedEndsList();
 		}
-		
+
 		return null;
 	}
 
@@ -425,9 +426,8 @@
 	}
 
 	private EList<Property> createNavigableOwnedEndsList() {
-		return new SubsetSupersetEObjectResolvingEList<Property>(
-			Property.class, this,
-			UMLPackage.ASSOCIATION_CLASS__NAVIGABLE_OWNED_END,
+		return new SubsetSupersetEObjectResolvingEList<Property>(Property.class,
+			this, UMLPackage.ASSOCIATION_CLASS__NAVIGABLE_OWNED_END,
 			NAVIGABLE_OWNED_END_ESUPERSETS, null);
 	}
 
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 a188046..6291873 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
@@ -170,7 +170,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.ASSOCIATION__MEMBER_END) {
 			return createMemberEndsList();
 		}
@@ -178,11 +179,11 @@
 		if (eStructuralFeature == UMLPackage.Literals.ASSOCIATION__OWNED_END) {
 			return createOwnedEndsList();
 		}
-		
+
 		if (eStructuralFeature == UMLPackage.Literals.ASSOCIATION__NAVIGABLE_OWNED_END) {
 			return createNavigableOwnedEndsList();
 		}
-		
+
 		return null;
 	}
 
@@ -415,9 +416,8 @@
 	}
 
 	private EList<Property> createNavigableOwnedEndsList() {
-		return new SubsetSupersetEObjectResolvingEList<Property>(
-			Property.class, this,
-			UMLPackage.ASSOCIATION__NAVIGABLE_OWNED_END,
+		return new SubsetSupersetEObjectResolvingEList<Property>(Property.class,
+			this, UMLPackage.ASSOCIATION__NAVIGABLE_OWNED_END,
 			NAVIGABLE_OWNED_END_ESUPERSETS, null);
 	}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorImpl.java
index ca2f632..392b3a0 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/BehaviorImpl.java
@@ -218,11 +218,12 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.BEHAVIOR__REDEFINED_BEHAVIOR) {
 			return createRedefinedBehaviorsList();
 		}
-		
+
 		if (eStructuralFeature == UMLPackage.Literals.BEHAVIOR__PRECONDITION) {
 			return createPreconditionsList();
 		}
@@ -234,14 +235,14 @@
 		if (eStructuralFeature == UMLPackage.Literals.NAMESPACE__OWNED_RULE) {
 			return createOwnedRulesList();
 		}
-		
+
 		if (eStructuralFeature == UMLPackage.Literals.CLASSIFIER__REDEFINED_CLASSIFIER) {
 			return createRedefinedClassifiersList();
 		}
-		
+
 		return null;
 	}
-	
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -367,8 +368,8 @@
 	}
 
 	private EList<Behavior> createRedefinedBehaviorsList() {
-		return new SubsetSupersetEObjectResolvingEList<Behavior>(
-			Behavior.class, this, UMLPackage.BEHAVIOR__REDEFINED_BEHAVIOR,
+		return new SubsetSupersetEObjectResolvingEList<Behavior>(Behavior.class,
+			this, UMLPackage.BEHAVIOR__REDEFINED_BEHAVIOR,
 			REDEFINED_BEHAVIOR_ESUPERSETS, null);
 	}
 
@@ -1943,9 +1944,8 @@
 
 	private EList<Classifier> createRedefinedClassifiersList() {
 		return new SubsetSupersetEObjectResolvingEList<Classifier>(
-			Classifier.class, this,
-			UMLPackage.BEHAVIOR__REDEFINED_CLASSIFIER, null,
-			REDEFINED_CLASSIFIER_ESUBSETS);
+			Classifier.class, this, UMLPackage.BEHAVIOR__REDEFINED_CLASSIFIER,
+			null, REDEFINED_CLASSIFIER_ESUBSETS);
 	}
 
 	/**
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 9b40430..0a3cb6c 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
@@ -144,7 +144,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.BEHAVIORED_CLASSIFIER__OWNED_BEHAVIOR) {
 			return createOwnedBehaviorsList();
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassImpl.java
index f53c599..18d1ce1 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ClassImpl.java
@@ -218,7 +218,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.BEHAVIORED_CLASSIFIER__OWNED_BEHAVIOR) {
 			return createOwnedBehaviorsList();
 		}
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 7669c87..00f9a1a 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
@@ -324,7 +324,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.CLASSIFIER__COLLABORATION_USE) {
 			return createCollaborationUsesList();
 		}
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 8b07a2f..d8a8cb0 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
@@ -161,7 +161,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.BEHAVIORED_CLASSIFIER__OWNED_BEHAVIOR) {
 			return createOwnedBehaviorsList();
 		}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java
index 817a8ca..9e9dc09 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ComponentRealizationImpl.java
@@ -97,7 +97,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.DEPENDENCY__CLIENT) {
 			return createClientsList();
 		}
@@ -105,11 +106,11 @@
 		if (eStructuralFeature == UMLPackage.Literals.COMPONENT_REALIZATION__REALIZING_CLASSIFIER) {
 			return createRealizingClassifiersList();
 		}
-		
+
 		if (eStructuralFeature == UMLPackage.Literals.DEPENDENCY__SUPPLIER) {
 			return createSuppliersList();
 		}
-		
+
 		return null;
 	}
 
@@ -141,9 +142,8 @@
 
 	private EList<NamedElement> createClientsList() {
 		return new SubsetSupersetEObjectResolvingEList<NamedElement>(
-			NamedElement.class, this,
-			UMLPackage.COMPONENT_REALIZATION__CLIENT, null,
-			CLIENT_ESUBSETS);
+			NamedElement.class, this, UMLPackage.COMPONENT_REALIZATION__CLIENT,
+			null, CLIENT_ESUBSETS);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentImpl.java
index 2c44c58..6d13c64 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/DeploymentImpl.java
@@ -112,7 +112,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.DEPENDENCY__CLIENT) {
 			return createClientsList();
 		}
@@ -120,11 +121,11 @@
 		if (eStructuralFeature == UMLPackage.Literals.DEPLOYMENT__DEPLOYED_ARTIFACT) {
 			return createDeployedArtifactsList();
 		}
-		
+
 		if (eStructuralFeature == UMLPackage.Literals.DEPENDENCY__SUPPLIER) {
 			return createSuppliersList();
 		}
-		
+
 		return null;
 	}
 
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 07ee836..6e8287c 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
@@ -110,9 +110,10 @@
 	protected EClass eStaticClass() {
 		return UMLPackage.Literals.EXTENSION;
 	}
-	
+
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.ASSOCIATION__OWNED_END) {
 			return createOwnedEndsList();
 		}
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 7462839..52167f7 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
@@ -182,7 +182,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.CLASSIFIER__REDEFINED_CLASSIFIER) {
 			return createRedefinedClassifiersList();
 		}
@@ -190,7 +191,7 @@
 		if (eStructuralFeature == UMLPackage.Literals.INTERFACE__REDEFINED_INTERFACE) {
 			return createRedefinedInterfacesList();
 		}
-		
+
 		return null;
 	}
 
@@ -415,8 +416,7 @@
 
 	private EList<Interface> createRedefinedInterfacesList() {
 		return new SubsetSupersetEObjectResolvingEList<Interface>(
-			Interface.class, this,
-			UMLPackage.INTERFACE__REDEFINED_INTERFACE,
+			Interface.class, this, UMLPackage.INTERFACE__REDEFINED_INTERFACE,
 			REDEFINED_INTERFACE_ESUPERSETS, null);
 	}
 
@@ -1737,9 +1737,8 @@
 
 	private EList<Classifier> createRedefinedClassifiersList() {
 		return new SubsetSupersetEObjectResolvingEList<Classifier>(
-			Classifier.class, this,
-			UMLPackage.INTERFACE__REDEFINED_CLASSIFIER, null,
-			REDEFINED_CLASSIFIER_ESUBSETS);
+			Classifier.class, this, UMLPackage.INTERFACE__REDEFINED_CLASSIFIER,
+			null, REDEFINED_CLASSIFIER_ESUBSETS);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceRealizationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceRealizationImpl.java
index d301b00..73ec007 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceRealizationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/InterfaceRealizationImpl.java
@@ -97,7 +97,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.DEPENDENCY__CLIENT) {
 			return createClientsList();
 		}
@@ -105,7 +106,7 @@
 		if (eStructuralFeature == UMLPackage.Literals.DEPENDENCY__SUPPLIER) {
 			return createSuppliersList();
 		}
-		
+
 		return null;
 	}
 
@@ -182,9 +183,8 @@
 
 	private EList<NamedElement> createClientsList() {
 		return new SubsetSupersetEObjectResolvingEList<NamedElement>(
-			NamedElement.class, this,
-			UMLPackage.INTERFACE_REALIZATION__CLIENT, null,
-			CLIENT_ESUBSETS);
+			NamedElement.class, this, UMLPackage.INTERFACE_REALIZATION__CLIENT,
+			null, CLIENT_ESUBSETS);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ManifestationImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ManifestationImpl.java
index 14ce4cf..c81fa30 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ManifestationImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ManifestationImpl.java
@@ -88,7 +88,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.DEPENDENCY__SUPPLIER) {
 			return createSuppliersList();
 		}
@@ -111,8 +112,8 @@
 
 	private EList<NamedElement> createSuppliersList() {
 		return new SubsetSupersetEObjectResolvingEList<NamedElement>(
-			NamedElement.class, this, UMLPackage.MANIFESTATION__SUPPLIER,
-			null, SUPPLIER_ESUBSETS);
+			NamedElement.class, this, UMLPackage.MANIFESTATION__SUPPLIER, null,
+			SUPPLIER_ESUBSETS);
 	}
 
 	/**
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 78b2161..20ed478 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
@@ -271,7 +271,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.NAMESPACE__OWNED_RULE) {
 			return createOwnedRulesList();
 		}
@@ -283,7 +284,7 @@
 		if (eStructuralFeature == UMLPackage.Literals.OPERATION__PRECONDITION) {
 			return createPreconditionsList();
 		}
-		
+
 		return null;
 	}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PortImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PortImpl.java
index e60bc1e..e62326f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PortImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/PortImpl.java
@@ -184,7 +184,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.PORT__REDEFINED_PORT) {
 			return createRedefinedPortsList();
 		}
@@ -192,7 +193,7 @@
 		if (eStructuralFeature == UMLPackage.Literals.PROPERTY__REDEFINED_PROPERTY) {
 			return createRedefinedPropertiesList();
 		}
-		
+
 		return null;
 	}
 
@@ -210,8 +211,8 @@
 	}
 
 	private EList<Property> createRedefinedPropertiesList() {
-		return new SubsetSupersetEObjectResolvingEList<Property>(
-			Property.class, this, UMLPackage.PORT__REDEFINED_PROPERTY, null,
+		return new SubsetSupersetEObjectResolvingEList<Property>(Property.class,
+			this, UMLPackage.PORT__REDEFINED_PROPERTY, null,
 			REDEFINED_PROPERTY_ESUBSETS);
 	}
 
@@ -360,9 +361,8 @@
 	}
 
 	private EList<Port> createRedefinedPortsList() {
-		return new SubsetSupersetEObjectResolvingEList<Port>(
-			Port.class, this, UMLPackage.PORT__REDEFINED_PORT,
-			REDEFINED_PORT_ESUPERSETS, null);
+		return new SubsetSupersetEObjectResolvingEList<Port>(Port.class, this,
+			UMLPackage.PORT__REDEFINED_PORT, REDEFINED_PORT_ESUPERSETS, null);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileImpl.java
index 7b68a68..da585a8 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProfileImpl.java
@@ -123,7 +123,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.NAMESPACE__ELEMENT_IMPORT) {
 			return createElementImportsList();
 		}
@@ -131,15 +132,15 @@
 		if (eStructuralFeature == UMLPackage.Literals.PROFILE__METACLASS_REFERENCE) {
 			return createMetaclassReferencesList();
 		}
-		
+
 		if (eStructuralFeature == UMLPackage.Literals.PROFILE__METAMODEL_REFERENCE) {
 			return createMetamodelReferencesList();
 		}
-		
+
 		if (eStructuralFeature == UMLPackage.Literals.NAMESPACE__PACKAGE_IMPORT) {
 			return createPackageImportsList();
 		}
-		
+
 		return null;
 	}
 
@@ -158,8 +159,8 @@
 
 	private EList<ElementImport> createElementImportsList() {
 		return new SubsetSupersetEObjectContainmentWithInverseEList.Resolving<ElementImport>(
-			ElementImport.class, this, UMLPackage.PROFILE__ELEMENT_IMPORT,
-			null, ELEMENT_IMPORT_ESUBSETS,
+			ElementImport.class, this, UMLPackage.PROFILE__ELEMENT_IMPORT, null,
+			ELEMENT_IMPORT_ESUBSETS,
 			UMLPackage.ELEMENT_IMPORT__IMPORTING_NAMESPACE);
 	}
 
@@ -189,8 +190,8 @@
 
 	private EList<PackageImport> createPackageImportsList() {
 		return new SubsetSupersetEObjectContainmentWithInverseEList.Resolving<PackageImport>(
-			PackageImport.class, this, UMLPackage.PROFILE__PACKAGE_IMPORT,
-			null, PACKAGE_IMPORT_ESUBSETS,
+			PackageImport.class, this, UMLPackage.PROFILE__PACKAGE_IMPORT, null,
+			PACKAGE_IMPORT_ESUBSETS,
 			UMLPackage.PACKAGE_IMPORT__IMPORTING_NAMESPACE);
 	}
 
@@ -241,8 +242,7 @@
 
 	private EList<ElementImport> createMetaclassReferencesList() {
 		return new SubsetSupersetEObjectResolvingEList<ElementImport>(
-			ElementImport.class, this,
-			UMLPackage.PROFILE__METACLASS_REFERENCE,
+			ElementImport.class, this, UMLPackage.PROFILE__METACLASS_REFERENCE,
 			METACLASS_REFERENCE_ESUPERSETS, null);
 	}
 
@@ -303,8 +303,7 @@
 
 	private EList<PackageImport> createMetamodelReferencesList() {
 		return new SubsetSupersetEObjectResolvingEList<PackageImport>(
-			PackageImport.class, this,
-			UMLPackage.PROFILE__METAMODEL_REFERENCE,
+			PackageImport.class, this, UMLPackage.PROFILE__METAMODEL_REFERENCE,
 			METAMODEL_REFERENCE_ESUPERSETS, null);
 	}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java
index 83c9a11..1e853fa 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/ProtocolTransitionImpl.java
@@ -131,7 +131,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.NAMESPACE__OWNED_RULE) {
 			return createOwnedRulesList();
 		}
@@ -154,9 +155,8 @@
 
 	private EList<Constraint> createOwnedRulesList() {
 		return new SubsetSupersetEObjectContainmentWithInverseEList.Resolving<Constraint>(
-			Constraint.class, this,
-			UMLPackage.PROTOCOL_TRANSITION__OWNED_RULE, null,
-			OWNED_RULE_ESUBSETS, UMLPackage.CONSTRAINT__CONTEXT);
+			Constraint.class, this, UMLPackage.PROTOCOL_TRANSITION__OWNED_RULE,
+			null, OWNED_RULE_ESUBSETS, UMLPackage.CONSTRAINT__CONTEXT);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableTemplateSignatureImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableTemplateSignatureImpl.java
index d140676..eeb1f79 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableTemplateSignatureImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/RedefinableTemplateSignatureImpl.java
@@ -137,15 +137,16 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.TEMPLATE_SIGNATURE__PARAMETER) {
 			return createParametersList();
 		}
-		
+
 		if (eStructuralFeature == UMLPackage.Literals.TEMPLATE_SIGNATURE__OWNED_PARAMETER) {
 			return createOwnedParametersList();
 		}
-		
+
 		return null;
 	}
 
@@ -287,7 +288,11 @@
 	 */
 	public EList<TemplateParameter> getOwnedParameters() {
 		if (ownedParameters == null) {
-			ownedParameters = createOwnedParametersList();
+			ownedParameters = new SubsetSupersetEObjectContainmentWithInverseEList.Resolving<TemplateParameter>(
+				TemplateParameter.class, this,
+				UMLPackage.REDEFINABLE_TEMPLATE_SIGNATURE__OWNED_PARAMETER,
+				OWNED_PARAMETER_ESUPERSETS, null,
+				UMLPackage.TEMPLATE_PARAMETER__SIGNATURE);
 		}
 		return ownedParameters;
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateImpl.java
index 6f3ec94..f422f51 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/StateImpl.java
@@ -295,7 +295,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.NAMESPACE__OWNED_RULE) {
 			return createOwnedRulesList();
 		}
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 3de883b..b938dea 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
@@ -162,7 +162,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.STATE_MACHINE__EXTENDED_STATE_MACHINE) {
 			return createExtendedStateMachinesList();
 		}
@@ -170,7 +171,7 @@
 		if (eStructuralFeature == UMLPackage.Literals.CLASSIFIER__REDEFINED_CLASSIFIER) {
 			return createRedefinedClassifiersList();
 		}
-		
+
 		return null;
 	}
 
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SubstitutionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SubstitutionImpl.java
index dd63112..05ae36d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SubstitutionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/SubstitutionImpl.java
@@ -96,7 +96,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.DEPENDENCY__CLIENT) {
 			return createClientsList();
 		}
@@ -104,7 +105,7 @@
 		if (eStructuralFeature == UMLPackage.Literals.DEPENDENCY__SUPPLIER) {
 			return createSuppliersList();
 		}
-		
+
 		return null;
 	}
 
@@ -150,8 +151,8 @@
 
 	private EList<NamedElement> createSuppliersList() {
 		return new SubsetSupersetEObjectResolvingEList<NamedElement>(
-			NamedElement.class, this, UMLPackage.SUBSTITUTION__SUPPLIER,
-			null, SUPPLIER_ESUBSETS);
+			NamedElement.class, this, UMLPackage.SUBSTITUTION__SUPPLIER, null,
+			SUPPLIER_ESUBSETS);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateSignatureImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateSignatureImpl.java
index 788ba12..44e9bea 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateSignatureImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TemplateSignatureImpl.java
@@ -113,15 +113,16 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.TEMPLATE_SIGNATURE__PARAMETER) {
 			return createParametersList();
 		}
-		
+
 		if (eStructuralFeature == UMLPackage.Literals.TEMPLATE_SIGNATURE__OWNED_PARAMETER) {
 			return createOwnedParametersList();
 		}
-		
+
 		return null;
 	}
 
@@ -168,8 +169,7 @@
 	private EList<TemplateParameter> createParametersList() {
 		return new SubsetSupersetEObjectResolvingEList<TemplateParameter>(
 			TemplateParameter.class, this,
-			UMLPackage.TEMPLATE_SIGNATURE__PARAMETER, null,
-			PARAMETER_ESUBSETS);
+			UMLPackage.TEMPLATE_SIGNATURE__PARAMETER, null, PARAMETER_ESUBSETS);
 	}
 
 	/**
@@ -241,7 +241,11 @@
 	 */
 	public EList<TemplateParameter> getOwnedParameters() {
 		if (ownedParameters == null) {
-			ownedParameters = createOwnedParametersList();
+			ownedParameters = new SubsetSupersetEObjectContainmentWithInverseEList.Resolving<TemplateParameter>(
+				TemplateParameter.class, this,
+				UMLPackage.TEMPLATE_SIGNATURE__OWNED_PARAMETER,
+				OWNED_PARAMETER_ESUPERSETS, null,
+				UMLPackage.TEMPLATE_PARAMETER__SIGNATURE);
 		}
 		return ownedParameters;
 	}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java
index fc657b3..ffa413d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/impl/TransitionImpl.java
@@ -251,7 +251,8 @@
 	}
 
 	@SuppressWarnings("unused")
-	private EList<?> createSubsetSupersetList(EStructuralFeature eStructuralFeature) {
+	private EList<?> createSubsetSupersetList(
+			EStructuralFeature eStructuralFeature) {
 		if (eStructuralFeature == UMLPackage.Literals.NAMESPACE__OWNED_RULE) {
 			return createOwnedRulesList();
 		}